This patch adds a couple more test cases (especially for IPv6 configurations) to the network test 100. Again make sure that some of the parameters from tck-testnet's XML have made it into command line parameters of dnsmasq. --- scripts/networks/networkxml2hostout/tck-testnet-3.dat | 49 +++++++++++++ scripts/networks/networkxml2hostout/tck-testnet-3.post.dat | 19 +++++ scripts/networks/networkxml2xmlin/tck-testnet-3.xml | 22 +++++ 3 files changed, 90 insertions(+) Index: libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-3.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-3.xml @@ -0,0 +1,22 @@ +<network> + <name>tck-testnet</name> + <uuid>aadc8920-502a-4774-ac2b-cd382a204d06</uuid> + <bridge name="tck-testbr" /> + <forward mode="nat" /> + <ip address="10.1.2.1" netmask="255.255.255.0"> + <dhcp> + <range start="10.1.2.2" end="10.1.2.254" /> + <host mac="00:16:3e:77:e2:ed" name="a.example.com" ip="10.1.2.10" /> + <host mac="00:16:3e:3e:a9:1a" name="b.example.com" ip="10.1.2.11" /> + </dhcp> + </ip> + <ip family="ipv4" address="192.168.123.1" netmask="255.255.255.0"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fe01::1" prefix="64"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fd01::1" prefix="64"> + </ip> + <ip family="ipv4" address="172.28.255.241" netmask="255.255.255.240"> + </ip> +</network> + Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-3.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-3.dat @@ -0,0 +1,49 @@ +#iptables -t nat -L -n | grep ' 10\.1\.2\.' +MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 +MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 +MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 +#iptables -n -L FORWARD | grep ' 10\.1\.2\.' +ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 state RELATED,ESTABLISHED +ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 +#ip6tables -n -L FORWARD | grep ' 2001:db8:ac10' +ACCEPT all ::/0 2001:db8:ac10:fd01::/64 +ACCEPT all 2001:db8:ac10:fd01::/64 ::/0 +ACCEPT all ::/0 2001:db8:ac10:fe01::/64 +ACCEPT all 2001:db8:ac10:fe01::/64 ::/0 +#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|.*\(listen-address 192\.168\.123\.1\).*|\1|p' +listen-address 192.168.123.1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 172\.28\.255\.241\).*|\1|p' +listen-address 172.28.255.241 +#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 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 2001\:db8\:ac10\:fe01\:\:1\).*|\1|p' +listen-address 2001:db8:ac10:fe01::1 +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 2001\:db8\:ac10\:fd01\:\:1\).*|\1|p' +listen-address 2001:db8:ac10:fd01::1 +#ps aux | sed -n '/radvd --.*tck-testnet-/ s|.*\(\/radvd\/tck-testnet-radvd.conf\).*|\1|p' +/radvd/tck-testnet-radvd.conf +#route -n | grep '10\.1\.2\.' +10.1.2.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr +#route -n | grep '192\.168\.123\.' +192.168.123.0 0.0.0.0 255.255.255.0 U 0 0 0 tck-testbr +#route -n | grep '172\.28\.255\.240' +172.28.255.240 0.0.0.0 255.255.255.240 U 0 0 0 tck-testbr +#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 +#ifconfig tck-testbr | grep 'inet6 addr: 2001' + inet6 addr: 2001:db8:ac10:fd01::1/64 Scope:Global + inet6 addr: 2001:db8:ac10:fe01::1/64 Scope:Global +#ip addr show tck-testbr | grep "inet " + inet 10.1.2.1/24 brd 10.1.2.255 scope global tck-testbr + inet 192.168.123.1/24 brd 192.168.123.255 scope global tck-testbr + inet 172.28.255.241/28 brd 172.28.255.255 scope global tck-testbr +#ip route show dev tck-testbr +172.28.255.240/28 proto kernel scope link src 172.28.255.241 +10.1.2.0/24 proto kernel scope link src 10.1.2.1 +192.168.123.0/24 proto kernel scope link src 192.168.123.1 +#virsh net-list | grep tck-testnet +tck-testnet active no Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat @@ -0,0 +1,19 @@ +#iptables -t nat -L -n | grep ' 10\.1\.2\.' +#iptables -n -L FORWARD | grep ' 10\.1\.2\.' +#ip6tables -n -L FORWARD | grep ' 2001:db8:ac10' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 10\.1\.2\.1\).*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 192\.168\.123\.1\).*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 172\.28\.255\.241\).*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(dhcp-range 10\.1\.2\.2,10\.1\.2\.254\).*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 2001\:db8\:ac10\:fe01\:\:1\).*|\1|p' +#ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 2001\:db8\:ac10\:fd01\:\:1\).*|\1|p' +#ps aux | sed -n '/radvd --.*tck-testnet-/ s|.*\(\/radvd\/tck-testnet-radvd.conf\).*|\1|p' +#route -n | grep '10\.1\.2\.' +#route -n | grep '192\.168\.123\.' +#route -n | grep '172\.28\.255\.240' +#brctl show | grep tck-testbr +#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 " +#ip route show dev tck-testbr 2>/dev/null +#virsh net-list | grep tck-testnet