tests: do not test dnsmasq older than 2.67

Prepare to retire older versions by droping older tests.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>

diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network.conf
index 693a83d9a0fdb03d95dd12dec4814b2573d6fe15..ea66bb83e65a6bd224133ff25a40bc1d0fc48682 100644 (file)
--- a/tests/networkxml2confdata/isolated-network.conf
+++ b/tests/networkxml2confdata/isolated-network.conf
@@ -6,10 +6,11 @@
 ## dnsmasq conf file created by libvirt
 strict-order
 except-interface=lo
-bind-interfaces
-listen-address=192.168.152.1
+bind-dynamic
+interface=virbr2
 dhcp-option=3
 no-resolv
+ra-param=*,0,0
 dhcp-range=192.168.152.2,192.168.152.254,255.255.255.0
 dhcp-no-override
 dhcp-authoritative

diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
index 0b2ca6f5aab8468fa2a9cff0b02e77ca296d9fce..bd560ba3f4076792e1667c20162305a8b49a3659 100644 (file)
--- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
@@ -6,12 +6,8 @@
 ## dnsmasq conf file created by libvirt
 strict-order
 except-interface=lo
-bind-interfaces
-listen-address=192.168.122.1
-listen-address=192.168.123.1
-listen-address=fc00:db8:ac10:fe01::1
-listen-address=fc00:db8:ac10:fd01::1
-listen-address=10.24.10.1
+bind-dynamic
+interface=virbr0
 srv-host=_name._tcp
 dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0
 dhcp-no-override
@@ -19,3 +15,5 @@ dhcp-authoritative
 dhcp-lease-max=253
 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile
 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts
+dhcp-range=fc00:db8:ac10:fe01::1,ra-only
+dhcp-range=fc00:db8:ac10:fd01::1,ra-only

diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record.conf
index a18c09aaa7a10c0f94ba3fb6b6696781d50bac0e..22bf3b1de92c433efe91c0bc7327ae78300d2521 100644 (file)
--- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf
@@ -21,3 +21,5 @@ dhcp-authoritative
 dhcp-lease-max=253
 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile
 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts
+dhcp-range=2001:db8:ac10:fe01::1,ra-only
+dhcp-range=2001:db8:ac10:fd01::1,ra-only

diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record.conf
index 735c261c013a6839b5792c3af63c3c86256613a1..d9b981a6e5187b4389cf71bfd1dae0df9c2cc191 100644 (file)
--- a/tests/networkxml2confdata/nat-network-dns-txt-record.conf
+++ b/tests/networkxml2confdata/nat-network-dns-txt-record.conf
@@ -15,3 +15,5 @@ dhcp-authoritative
 dhcp-lease-max=253
 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile
 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts
+dhcp-range=2001:db8:ac10:fe01::1,ra-only
+dhcp-range=2001:db8:ac10:fd01::1,ra-only

diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.conf b/tests/networkxml2confdata/nat-network-name-with-quotes.conf
index 1b06de30663cbad39502738c87796e4c0a6840c7..5c5ea7b48ef9e882cd8d4cbc7f07dda1a19394e2 100644 (file)
--- a/tests/networkxml2confdata/nat-network-name-with-quotes.conf
+++ b/tests/networkxml2confdata/nat-network-name-with-quotes.conf
@@ -6,12 +6,8 @@
 ## dnsmasq conf file created by libvirt
 strict-order
 except-interface=lo
-bind-interfaces
-listen-address=192.168.122.1
-listen-address=192.168.123.1
-listen-address=fc00:db8:ac10:fe01::1
-listen-address=fc00:db8:ac10:fd01::1
-listen-address=10.24.10.1
+bind-dynamic
+interface=virbr0
 srv-host=_name._tcp
 dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0
 dhcp-no-override
@@ -19,3 +15,5 @@ dhcp-authoritative
 dhcp-lease-max=253
 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default"with"quotes".hostsfile
 addn-hosts=/var/lib/libvirt/dnsmasq/default"with"quotes".addnhosts
+dhcp-range=fc00:db8:ac10:fe01::1,ra-only
+dhcp-range=fc00:db8:ac10:fd01::1,ra-only

diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network.conf
index 99272b9d68f0cf9ddf22e9d425d981e3efa9fb2c..a13239a54f579077f34d9b17bd5cfe362b52907c 100644 (file)
--- a/tests/networkxml2confdata/netboot-network.conf
+++ b/tests/networkxml2confdata/netboot-network.conf
@@ -8,8 +8,8 @@ strict-order
 domain=example.com
 expand-hosts
 except-interface=lo
-bind-interfaces
-listen-address=192.168.122.1
+bind-dynamic
+interface=virbr1
 dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0
 dhcp-no-override
 dhcp-authoritative

diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network.conf
index fb0a20cff470a4016ac54e5486d3e55e9a9900c4..280da323e2ce58f3ed731d3d16d04e58a2576820 100644 (file)
--- a/tests/networkxml2confdata/netboot-proxy-network.conf
+++ b/tests/networkxml2confdata/netboot-proxy-network.conf
@@ -8,8 +8,8 @@ strict-order
 domain=example.com
 expand-hosts
 except-interface=lo
-bind-interfaces
-listen-address=192.168.122.1
+bind-dynamic
+interface=virbr1
 dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0
 dhcp-no-override
 dhcp-authoritative

diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index 7177505918111f2326d809506ede25338744e935..178c74d9af3ce82b6c5e8162235ddadc25636c15 100644 (file)
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -112,12 +112,8 @@ static int
 mymain(void)
 {
     int ret = 0;
-    dnsmasqCaps *restricted
-        = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48");
     dnsmasqCaps *full
-        = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic");
-    dnsmasqCaps *dhcpv6
-        = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic");
+        = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.67\n--bind-dynamic\n--ra-param");
 
 #define DO_TEST(xname, xcaps) \
     do { \
@@ -131,15 +127,15 @@ mymain(void)
         } \
     } while (0)
 
-    DO_TEST("isolated-network", restricted);
-    DO_TEST("netboot-network", restricted);
-    DO_TEST("netboot-proxy-network", restricted);
-    DO_TEST("nat-network-dns-srv-record-minimal", restricted);
-    DO_TEST("nat-network-name-with-quotes", restricted);
+    DO_TEST("isolated-network", full);
+    DO_TEST("netboot-network", full);
+    DO_TEST("netboot-proxy-network", full);
+    DO_TEST("nat-network-dns-srv-record-minimal", full);
+    DO_TEST("nat-network-name-with-quotes", full);
     DO_TEST("routed-network", full);
     DO_TEST("routed-network-no-dns", full);
     DO_TEST("open-network", full);
-    DO_TEST("nat-network", dhcpv6);
+    DO_TEST("nat-network", full);
     DO_TEST("nat-network-dns-txt-record", full);
     DO_TEST("nat-network-dns-srv-record", full);
     DO_TEST("nat-network-dns-hosts", full);
@@ -147,20 +143,18 @@ mymain(void)
     DO_TEST("nat-network-dns-forwarders", full);
     DO_TEST("nat-network-dns-forwarder-no-resolv", full);
     DO_TEST("nat-network-dns-local-domain", full);
-    DO_TEST("nat-network-mtu", dhcpv6);
-    DO_TEST("dhcp6-network", dhcpv6);
-    DO_TEST("dhcp6-nat-network", dhcpv6);
-    DO_TEST("dhcp6host-routed-network", dhcpv6);
-    DO_TEST("ptr-domains-auto", dhcpv6);
-    DO_TEST("dnsmasq-options", dhcpv6);
+    DO_TEST("nat-network-mtu", full);
+    DO_TEST("dhcp6-network", full);
+    DO_TEST("dhcp6-nat-network", full);
+    DO_TEST("dhcp6host-routed-network", full);
+    DO_TEST("ptr-domains-auto", full);
+    DO_TEST("dnsmasq-options", full);
     DO_TEST("leasetime-seconds", full);
     DO_TEST("leasetime-minutes", full);
     DO_TEST("leasetime-hours", full);
     DO_TEST("leasetime-infinite", full);
 
-    virObjectUnref(dhcpv6);
     virObjectUnref(full);
-    virObjectUnref(restricted);
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }