External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: do not test dnsmasq older than 2.67

Browse Source 
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>
This commit is contained in:
Ján Tomko 2021-12-14 19:10:29 +01:00
parent b9a4c5f8c8
commit 6b59d6cac1
8 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/networkxml2confdata/isolated-network.conf
View File

@ -6,10 +6,11 @@
## dnsmasq conf file created by libvirt ## dnsmasq conf file created by libvirt
strict-order strict-order
except-interface=lo except-interface=lo
bind-interfaces bind-dynamic
listen-address=192.168.152.1 interface=virbr2
dhcp-option=3 dhcp-option=3
no-resolv no-resolv
ra-param=*,0,0
dhcp-range=192.168.152.2,192.168.152.254,255.255.255.0 dhcp-range=192.168.152.2,192.168.152.254,255.255.255.0
dhcp-no-override dhcp-no-override
dhcp-authoritative dhcp-authoritative

10
tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
View File

@ -6,12 +6,8 @@
## dnsmasq conf file created by libvirt ## dnsmasq conf file created by libvirt
strict-order strict-order
except-interface=lo except-interface=lo
bind-interfaces bind-dynamic
listen-address=192.168.122.1 interface=virbr0
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
srv-host=_name._tcp srv-host=_name._tcp
dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0 dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0
dhcp-no-override dhcp-no-override
@ -19,3 +15,5 @@ dhcp-authoritative
dhcp-lease-max=253 dhcp-lease-max=253
dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile
addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts 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

2
tests/networkxml2confdata/nat-network-dns-srv-record.conf
View File

@ -21,3 +21,5 @@ dhcp-authoritative
dhcp-lease-max=253 dhcp-lease-max=253
dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile
addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts 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

2
tests/networkxml2confdata/nat-network-dns-txt-record.conf
View File

@ -15,3 +15,5 @@ dhcp-authoritative
dhcp-lease-max=253 dhcp-lease-max=253
dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile
addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts 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

10
tests/networkxml2confdata/nat-network-name-with-quotes.conf
View File

@ -6,12 +6,8 @@
## dnsmasq conf file created by libvirt ## dnsmasq conf file created by libvirt
strict-order strict-order
except-interface=lo except-interface=lo
bind-interfaces bind-dynamic
listen-address=192.168.122.1 interface=virbr0
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
srv-host=_name._tcp srv-host=_name._tcp
dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0 dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0
dhcp-no-override dhcp-no-override
@ -19,3 +15,5 @@ dhcp-authoritative
dhcp-lease-max=253 dhcp-lease-max=253
dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default&quot;with&quot;quotes&quot;.hostsfile 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 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

4
tests/networkxml2confdata/netboot-network.conf
View File

@ -8,8 +8,8 @@ strict-order
domain=example.com domain=example.com
expand-hosts expand-hosts
except-interface=lo except-interface=lo
bind-interfaces bind-dynamic
listen-address=192.168.122.1 interface=virbr1
dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0 dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0
dhcp-no-override dhcp-no-override
dhcp-authoritative dhcp-authoritative

4
tests/networkxml2confdata/netboot-proxy-network.conf
View File

@ -8,8 +8,8 @@ strict-order
domain=example.com domain=example.com
expand-hosts expand-hosts
except-interface=lo except-interface=lo
bind-interfaces bind-dynamic
listen-address=192.168.122.1 interface=virbr1
dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0 dhcp-range=192.168.122.2,192.168.122.254,255.255.255.0
dhcp-no-override dhcp-no-override
dhcp-authoritative dhcp-authoritative

32
tests/networkxml2conftest.c
View File

@ -112,12 +112,8 @@ static int
mymain(void) mymain(void)
{ {
int ret = 0; int ret = 0;
dnsmasqCaps *restricted
= dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48");
dnsmasqCaps *full dnsmasqCaps *full
= dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic"); = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.67\n--bind-dynamic\n--ra-param");
dnsmasqCaps *dhcpv6
= dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic");
#define DO_TEST(xname, xcaps) \ #define DO_TEST(xname, xcaps) \
do { \ do { \
@ -131,15 +127,15 @@ mymain(void)
} \ } \
} while (0) } while (0)
DO_TEST("isolated-network", restricted); DO_TEST("isolated-network", full);
DO_TEST("netboot-network", restricted); DO_TEST("netboot-network", full);
DO_TEST("netboot-proxy-network", restricted); DO_TEST("netboot-proxy-network", full);
DO_TEST("nat-network-dns-srv-record-minimal", restricted); DO_TEST("nat-network-dns-srv-record-minimal", full);
DO_TEST("nat-network-name-with-quotes", restricted); DO_TEST("nat-network-name-with-quotes", full);
DO_TEST("routed-network", full); DO_TEST("routed-network", full);
DO_TEST("routed-network-no-dns", full); DO_TEST("routed-network-no-dns", full);
DO_TEST("open-network", 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-txt-record", full);
DO_TEST("nat-network-dns-srv-record", full); DO_TEST("nat-network-dns-srv-record", full);
DO_TEST("nat-network-dns-hosts", 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-forwarders", full);
DO_TEST("nat-network-dns-forwarder-no-resolv", full); DO_TEST("nat-network-dns-forwarder-no-resolv", full);
DO_TEST("nat-network-dns-local-domain", full); DO_TEST("nat-network-dns-local-domain", full);
DO_TEST("nat-network-mtu", dhcpv6); DO_TEST("nat-network-mtu", full);
DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-network", full);
DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6-nat-network", full);
DO_TEST("dhcp6host-routed-network", dhcpv6); DO_TEST("dhcp6host-routed-network", full);
DO_TEST("ptr-domains-auto", dhcpv6); DO_TEST("ptr-domains-auto", full);
DO_TEST("dnsmasq-options", dhcpv6); DO_TEST("dnsmasq-options", full);
DO_TEST("leasetime-seconds", full); DO_TEST("leasetime-seconds", full);
DO_TEST("leasetime-minutes", full); DO_TEST("leasetime-minutes", full);
DO_TEST("leasetime-hours", full); DO_TEST("leasetime-hours", full);
DO_TEST("leasetime-infinite", full); DO_TEST("leasetime-infinite", full);
virObjectUnref(dhcpv6);
virObjectUnref(full); virObjectUnref(full);
virObjectUnref(restricted);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }