Commit 78af265d authored by Laine Stump's avatar Laine Stump

eliminate use of deprecated brctl in network tests

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: 's avatarLaine Stump <laine@laine.org>
Reviewed-by: 's avatarJohn Ferlan <jferlan@redhat.com>
parent 3836a38c
Pipeline #30527557 failed with stages
in 8 minutes and 1 second
......@@ -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
......
......@@ -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
......@@ -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
......
......@@ -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
......@@ -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
......
......@@ -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 "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment