[libvirt] [PATCH tck] 220-no-ip-spoofing.t: Don't use a static netmask

For environments not using a /24 netmask, this test can end up in a hung state. This patch reads the netmask from the nic and uses it later when ip addresses are changed and restored. --- scripts/nwfilter/220-no-ip-spoofing.t | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/nwfilter/220-no-ip-spoofing.t b/scripts/nwfilter/220-no-ip-spoofing.t index 5e8e0d7..3a0213d 100644 --- a/scripts/nwfilter/220-no-ip-spoofing.t +++ b/scripts/nwfilter/220-no-ip-spoofing.t @@ -79,19 +79,20 @@ $ssh->login("root", $tck->root_password()); diag "preparing ip spoof"; my $cmdfile = <<EOF; echo "DEV=`ip link | head -3 | tail -1 | awk '{print \\\$2}' | sed -e 's/://'` +MASK=`ip addr show \\\$DEV | grep 'inet ' | awk '{print \\\$2}' | sed -e 's/.*\\///;q'` /sbin/ip addr show \\\$DEV /sbin/ip link set \\\$DEV down /sbin/ip addr flush dev \\\$DEV -/sbin/ip addr add 192.168.122.183/24 dev \\\$DEV +/sbin/ip addr add 192.168.122.183/\\\$MASK dev \\\$DEV /sbin/ip link set \\\$DEV up /sbin/ip addr show \\\$DEV /bin/sleep 1 /bin/ping -c 1 192.168.122.1 /sbin/ip link set \\\$DEV down /sbin/ip addr flush dev \\\$DEV -/sbin/ip addr add ${guestip}/24 dev \\\$DEV +/sbin/ip addr add ${guestip}/\\\$MASK dev \\\$DEV /sbin/ip link set \\\$DEV up -/sbin/ip link \\\$DEV" > /test.sh +/sbin/ip addr show \\\$DEV" > /test.sh EOF diag $cmdfile; my ($stdout, $stderr, $exit) = $ssh->cmd($cmdfile); -- 1.8.4.5