Network test 100 when run via
sh ./networkApplyTest.sh --tap-test --verbose --wait
currently exhibits some problems. This patch fixes them.
I now only looking for dnsmasq to be running with some of the
parameters from tck-testnet having gone into its command line
arguments.
---
scripts/networks/networkxml2hostout/tck-testnet-1.dat | 10 ++
scripts/networks/networkxml2hostout/tck-testnet-1.post.dat |6 --
scripts/networks/networkxml2hostout/tck-testnet-2.dat | 10 ++
scripts/networks/networkxml2hostout/tck-testnet-2.post.dat |5 +++--
4 files changed, 19 insertions(+), 12 deletions(-)
Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.dat
===
--- libvirt-tck.orig/scripts/networks/networkxml2hostout/tck-testnet-1.dat
+++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.dat
@@ -5,12 +5,14 @@ MASQUERADE all -- 10.1.2.0/24
#iptables -n -L FORWARD | grep ' 10\.1\.2\.'
ACCEPT all -- 0.0.0.0/010.1.2.0/24 state
RELATED,ESTABLISHED
ACCEPT all -- 10.1.2.0/24 0.0.0.0/0
-#ps aux | sed -n '/dnsmasq .*10\.1\.2\./ s|.*\(dnsmasq[[:print:]*]\)|\1|p'
-dnsmasq --strict-order --bind-interfaces
--pid-file=/var/run/libvirt/network/tck-testnet.pid --conf-file=
--listen-address 10.1.2.1 --except-interface lo --dhcp-range
10.1.2.2,10.1.2.254 --dhcp-lease-max=253 --dhcp-no-override
+#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address
10\.1\.2\.1*\).*|\1|p'
+listen-address 10.1.2.1
+#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(dhcp-range
10\.1\.2\.2\,10\.1\.2\.254*\).*|\1|p'
+dhcp-range 10.1.2.2,10.1.2.254
#route -n | grep '10\.1\.2\.'
10.1.2.00.0.0.0 255.255.255.0 U 0 00
tck-testbr
-#brctl show | grep tck-testbr
-tck-testbr 8000. yes
+#brctl show | grep tck-testbr | gawk '{print $1" "$3}'
+tck-testbr yes
#ifconfig tck-testbr | grep ':10\.1\.2\.'
inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0
#virsh net-list | grep tck-testnet
Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat
===
--- libvirt-tck.orig/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat
+++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat
@@ -1,7 +1,9 @@
#iptables -t nat -L -n | grep ' 10\.1\.2\.'
#iptables -n -L FORWARD | grep ' 10\.1\.2\.'
-#ps aux | sed -n '/dnsmasq .*10\.1\.2\./ s|.*\(dnsmasq[[:print:]*]\)|\1|p'
+#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
+#route -n | grep '10\.1\.2\.'
+#brctl show | grep tck-testbr | gawk '{print $1" "$3}'
#ifconfig tck-testbr 2>/dev/null| grep ':10\.1\.2\.'
#virsh net-list | grep tck-testnet
Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.dat
===
--- libvirt-tck.orig/scripts/networks/networkxml2hostout/tck-testnet-2.dat
+++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.dat
@@ -2,12 +2,14 @@
ACCEPT all -- 0.0.0.0/010.1.2.0/24
ACCEPT all -- 10.1.2.0/24 0.0.0.0/0
#iptables -t nat -L -n | grep ' 10\.1\.2\.'
-#ps aux | sed -n '/dnsmasq .*10\.1\.2\./ s|.*\(dnsmasq[[:print:]*]\)|\1|p'
-dnsmasq --strict-order --bind-interfaces
--pid-file=/var/run/libvirt/network/tck-testnet.pid --conf-file=
--listen-address 10.1.2.1 --except-interface lo --dhcp-range
10.1.2.2,10.1.2.254 --dhcp-lease-max=253 --dhcp-no-override
+#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address
10\.1\.2\.1\).*|\1|p'
+listen-address 10.1.2.1
+#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(dhcp-range
10\.1\.2\.2,10\.1\.2\.254\).*|\1|p'
+dhcp-range 10.1.2.2,10.1.2.254
#route -n | grep '10\.1\.2\.'
10.1.2.00.0.0.0 255.255.255.0 U 0 00
tck-testbr
-#brctl show | grep tck-testbr
-tck-testbr 8000. yes
+#brctl show | grep tck-testbr | gawk '{print $1" "$3}'
+tck-testbr yes
#ifconfig tck-testbr | grep ':10\.1\.2\.'
inet addr:10.1.2.1 Bcast:10.1.2.255 Mask:255.255.255.0
#virsh net-list | grep tck-testnet
Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat
===
--- libvirt-tck.orig/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat
+++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat
@@ -1,7 +1,8 @@
#iptables -t nat -L -n | grep ' 10\.1\.2'
#iptables -n -L FORWARD | grep ' 10\.1\.2'
-#ps aux | sed -n '/dnsmasq .*10\.1\.2\./ s|.*\(dnsmasq[[:print:
