brctl is part of the bridge-utils package, which has been deprecated /
replaced by the "ip" and "bridge" commands in the iproute package in
all modern distros. This patch removes the few usages of brctl in
libvirt-tck's network tests, replacing it with a functional equivalent
that uses "ip link show type bridge" instead.

Signed-off-by: Laine Stump <laine@laine.org>
---
 scripts/networks/networkxml2hostout/tck-testnet-1.dat      | 4 ++--
 scripts/networks/networkxml2hostout/tck-testnet-1.post.dat | 2 +-
 scripts/networks/networkxml2hostout/tck-testnet-2.dat      | 4 ++--
 scripts/networks/networkxml2hostout/tck-testnet-2.post.dat | 2 +-
 scripts/networks/networkxml2hostout/tck-testnet-3.dat      | 4 ++--
 scripts/networks/networkxml2hostout/tck-testnet-3.post.dat | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.dat b/scripts/networks/networkxml2hostout/tck-testnet-1.dat
index 59cda2f..3e2ce12 100644
--- a/scripts/networks/networkxml2hostout/tck-testnet-1.dat
+++ b/scripts/networks/networkxml2hostout/tck-testnet-1.dat
@@ -15,8 +15,8 @@ ACCEPT     all  --  10.1.2.0/24          0.0.0.0/0
 bind-dynamic
 #grep dhcp-range `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-file=\(.*tck-testnet.conf\).*|\1|p'`
 dhcp-range=10.1.2.2,10.1.2.254
-#brctl show | grep tck-testbr | gawk '{print $1" "$3}'
-tck-testbr yes
+#ip link show type bridge | grep tck-testbr | gawk '{print $2}'
+tck-testbr:
 #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}'
 10.1.2.1/24 10.1.2.255
 #virsh net-list | grep tck-testnet
diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat b/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat
index 48e1d5a..30f981a 100644
--- a/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat
+++ b/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat
@@ -4,6 +4,6 @@
 #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(dhcp-range 10\.1\.2\.2\,10\.1\.2\.254*\).*|\1|p'
 #route -n | grep '10\.1\.2\.'
 #route -n | grep '10\.1\.2\.'
-#brctl show | grep tck-testbr | gawk '{print $1" "$3}'
+#ip link show type bridge | grep tck-testbr | gawk '{print $2}'
 #ifconfig tck-testbr 2>/dev/null| grep ':10\.1\.2\.'
 #virsh net-list | grep tck-testnet
diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.dat b/scripts/networks/networkxml2hostout/tck-testnet-2.dat
index 4f3d135..48b4b28 100644
--- a/scripts/networks/networkxml2hostout/tck-testnet-2.dat
+++ b/scripts/networks/networkxml2hostout/tck-testnet-2.dat
@@ -10,8 +10,8 @@ ACCEPT     all  --  10.1.2.0/24          0.0.0.0/0
 bind-dynamic
 #grep dhcp-range `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-file=\(.*tck-testnet.conf\).*|\1|p'`
 dhcp-range=10.1.2.2,10.1.2.254
-#brctl show | grep tck-testbr | gawk '{print $1" "$3}'
-tck-testbr yes
+#ip link show type bridge | grep tck-testbr | gawk '{print $2}'
+tck-testbr:
 #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}'
 10.1.2.1/24 10.1.2.255
 #virsh net-list | grep tck-testnet
diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat b/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat
index a8e0f60..a80f663 100644
--- a/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat
+++ b/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat
@@ -3,6 +3,6 @@
 #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 10\.1\.2\.1\).*|\1|p'
 #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(dhcp-range 10\.1\.2\.2,10\.1\.2\.254\).*|\1|p'
 #route -n | grep '10\.1\.2\.'
-#brctl show | grep tck-testbr | gawk '{print $1" "$3}'
+#ip link show type bridge | grep tck-testbr | gawk '{print $2}'
 #ifconfig tck-testbr 2>/dev/null | grep ':10\.1\.2\.'
 #virsh net-list | grep tck-testnet
diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.dat b/scripts/networks/networkxml2hostout/tck-testnet-3.dat
index 5c61690..fca4f81 100644
--- a/scripts/networks/networkxml2hostout/tck-testnet-3.dat
+++ b/scripts/networks/networkxml2hostout/tck-testnet-3.dat
@@ -20,8 +20,8 @@ bind-dynamic
 dhcp-range=10.1.2.2,10.1.2.254
 dhcp-range=2001:db8:ac10:fe01::1,ra-only
 dhcp-range=2001:db8:ac10:fd01::1,ra-only
-#brctl show | grep tck-testbr | gawk '{print $1" "$3}'
-tck-testbr yes
+#ip link show type bridge | grep tck-testbr | gawk '{print $2}'
+tck-testbr:
 #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' | grep -v link
 10.1.2.1/24 10.1.2.255
 192.168.97.1/24 192.168.97.255
diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat b/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat
index e525e72..2bebd61 100644
--- a/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat
+++ b/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat
@@ -11,7 +11,7 @@
 #route -n | grep '10\.1\.2\.'
 #route -n | grep '192\.168\.97\.'
 #route -n | grep '172\.28\.255\.240'
-#brctl show | grep tck-testbr
+#ip link show type bridge | grep tck-testbr | gawk '{print $2}'
 #ifconfig tck-testbr 2>/dev/null | grep ':10\.1\.2\.'
 #ifconfig tck-testbr 2>/dev/null | grep 'inet6 addr: 2001'
 #ip addr show tck-testbr 2>/dev/null | grep "inet "
-- 
2.18.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On 09/13/2018 03:11 PM, Laine Stump wrote:
> brctl is part of the bridge-utils package, which has been deprecated /
> replaced by the "ip" and "bridge" commands in the iproute package in
> all modern distros. This patch removes the few usages of brctl in
> libvirt-tck's network tests, replacing it with a functional equivalent
> that uses "ip link show type bridge" instead.
> 
> Signed-off-by: Laine Stump <laine@laine.org>
> ---
>  scripts/networks/networkxml2hostout/tck-testnet-1.dat      | 4 ++--
>  scripts/networks/networkxml2hostout/tck-testnet-1.post.dat | 2 +-
>  scripts/networks/networkxml2hostout/tck-testnet-2.dat      | 4 ++--
>  scripts/networks/networkxml2hostout/tck-testnet-2.post.dat | 2 +-
>  scripts/networks/networkxml2hostout/tck-testnet-3.dat      | 4 ++--
>  scripts/networks/networkxml2hostout/tck-testnet-3.post.dat | 2 +-
>  6 files changed, 9 insertions(+), 9 deletions(-)
> 

As Colonel Klink would say ... ;-)

But still looks fine to me...  Output at least matches what I see too.

Reviewed-by: John Ferlan <jferlan@redhat.com>

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list