[libvirt PATCH 02/17] 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(a)redhat.com&gt; --- .../networkxml2confdata/isolated-network.conf | 5 +-- .../nat-network-dns-srv-record-minimal.conf | 10 +++--- .../nat-network-dns-srv-record.conf | 2 ++ .../nat-network-dns-txt-record.conf | 2 ++ .../nat-network-name-with-quotes.conf | 10 +++--- .../networkxml2confdata/netboot-network.conf | 4 +-- .../netboot-proxy-network.conf | 4 +-- tests/networkxml2conftest.c | 32 ++++++++----------- 8 files changed, 32 insertions(+), 37 deletions(-) diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network.conf index 693a83d9a0..ea66bb83e6 100644 --- 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 0b2ca6f5aa..bd560ba3f4 100644 --- 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 a18c09aaa7..22bf3b1de9 100644 --- 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 735c261c01..d9b981a6e5 100644 --- 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 1b06de3066..5c5ea7b48e 100644 --- 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&quot;with&quot;quotes&quot;.hostsfile addn-hosts=/var/lib/libvirt/dnsmasq/default&quot;with&quot;quotes&quot;.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 99272b9d68..a13239a54f 100644 --- 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 fb0a20cff4..280da323e2 100644 --- 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 7177505918..178c74d9af 100644 --- 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; } -- 2.31.1