diff options
Diffstat (limited to 'tests')
38 files changed, 243 insertions, 230 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 8435e1ab57..5fb26ad47e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,7 +56,7 @@ EXTRA_DIST = \ networkschematest \ networkxml2xmlin \ networkxml2xmlout \ - networkxml2argvdata \ + networkxml2confdata \ nodedevschemadata \ nodedevschematest \ nodeinfodata \ @@ -147,7 +147,7 @@ endif test_programs += networkxml2xmltest if WITH_NETWORK -test_programs += networkxml2argvtest +test_programs += networkxml2conftest endif if WITH_STORAGE_SHEEPDOG @@ -431,12 +431,12 @@ networkxml2xmltest_SOURCES = \ networkxml2xmltest_LDADD = $(LDADDS) if WITH_NETWORK -networkxml2argvtest_SOURCES = \ - networkxml2argvtest.c \ +networkxml2conftest_SOURCES = \ + networkxml2conftest.c \ testutils.c testutils.h -networkxml2argvtest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS) +networkxml2conftest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS) else -EXTRA_DIST += networkxml2argvtest.c +EXTRA_DIST += networkxml2conftest.c endif if WITH_STORAGE_SHEEPDOG diff --git a/tests/networkxml2argvdata/dhcp6-nat-network.argv b/tests/networkxml2argvdata/dhcp6-nat-network.argv deleted file mode 100644 index df8c507581..0000000000 --- a/tests/networkxml2argvdata/dhcp6-nat-network.argv +++ /dev/null @@ -1,15 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---local=// \ ---conf-file= \ ---bind-dynamic \ ---interface virbr0 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-no-override \ ---dhcp-range 2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=493 \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts \ ---enable-ra\ diff --git a/tests/networkxml2argvdata/dhcp6-network.argv b/tests/networkxml2argvdata/dhcp6-network.argv deleted file mode 100644 index 059c4188e7..0000000000 --- a/tests/networkxml2argvdata/dhcp6-network.argv +++ /dev/null @@ -1,15 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---domain=mynet \ ---expand-hosts \ ---local=/mynet/ \ ---conf-file= \ ---bind-dynamic \ ---interface virbr0 \ ---dhcp-range 2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=240 \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts \ ---enable-ra\ diff --git a/tests/networkxml2argvdata/dhcp6host-routed-network.argv b/tests/networkxml2argvdata/dhcp6host-routed-network.argv deleted file mode 100644 index 8f6d7d3b2d..0000000000 --- a/tests/networkxml2argvdata/dhcp6host-routed-network.argv +++ /dev/null @@ -1,13 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---local=// \ ---conf-file= \ ---bind-dynamic \ ---interface virbr1 \ ---dhcp-range 192.168.122.1,static \ ---dhcp-no-override \ ---dhcp-range 2001:db8:ac10:fd01::1,static \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/local.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts \ ---enable-ra\ diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv deleted file mode 100644 index 31633859bd..0000000000 --- a/tests/networkxml2argvdata/isolated-network.argv +++ /dev/null @@ -1,16 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---local=// \ ---conf-file= \ ---bind-interfaces \ ---except-interface lo \ ---listen-address 192.168.152.1 \ ---dhcp-option=3 \ ---no-resolv \ ---dhcp-range 192.168.152.2,192.168.152.254 \ ---dhcp-no-override \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases \ ---dhcp-lease-max=253 \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/private.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/private.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv deleted file mode 100644 index fee137f561..0000000000 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ /dev/null @@ -1,10 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---domain=example.com \ ---expand-hosts \ ---local=/example.com/ \ ---conf-file= \ ---bind-dynamic \ ---interface virbr0 \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv deleted file mode 100644 index a86b2d2d20..0000000000 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ /dev/null @@ -1,19 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---local=// \ ---conf-file= \ ---bind-interfaces \ ---except-interface lo \ ---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 \ ---srv-host=name.tcp.,,,, \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-no-override \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv deleted file mode 100644 index e7ecaa502d..0000000000 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ /dev/null @@ -1,14 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---local=// \ ---conf-file= \ ---bind-dynamic \ ---interface virbr0 \ ---srv-host=name.tcp.test-domain-name,.,1024,10,10 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-no-override \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv deleted file mode 100644 index 8ea00044f6..0000000000 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ /dev/null @@ -1,13 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---local=// \ ---conf-file= \ ---bind-dynamic --interface virbr0 \ -'--txt-record=example,example value' \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-no-override \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv deleted file mode 100644 index 578a5ff432..0000000000 --- a/tests/networkxml2argvdata/nat-network.argv +++ /dev/null @@ -1,15 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---local=// \ ---conf-file= \ ---bind-dynamic \ ---interface virbr0 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-no-override \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---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/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv deleted file mode 100644 index 11ed16a245..0000000000 --- a/tests/networkxml2argvdata/netboot-network.argv +++ /dev/null @@ -1,19 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---domain=example.com \ ---expand-hosts \ ---local=/example.com/ \ ---conf-file= \ ---bind-interfaces \ ---except-interface lo \ ---listen-address 192.168.122.1 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-no-override \ ---enable-tftp \ ---tftp-root /var/lib/tftproot \ ---dhcp-boot pxeboot.img \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ ---dhcp-lease-max=253 \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts\ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv deleted file mode 100644 index ea31a325e0..0000000000 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ /dev/null @@ -1,17 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---domain=example.com \ ---expand-hosts \ ---local=/example.com/ \ ---conf-file= \ ---bind-interfaces \ ---except-interface lo \ ---listen-address 192.168.122.1 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-no-override \ ---dhcp-boot pxeboot.img,,10.20.30.40 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ ---dhcp-lease-max=253 \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts\ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv deleted file mode 100644 index b3fbf49ef0..0000000000 --- a/tests/networkxml2argvdata/routed-network.argv +++ /dev/null @@ -1,8 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---local=// \ ---conf-file= \ ---bind-dynamic \ ---interface virbr1 \ ---addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts\ diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network.conf new file mode 100644 index 0000000000..3fa358a75f --- /dev/null +++ b/tests/networkxml2confdata/dhcp6-nat-network.conf @@ -0,0 +1,19 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +local=// +bind-dynamic +interface=virbr0 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-no-override +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +dhcp-lease-max=493 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts +enable-ra diff --git a/tests/networkxml2argvdata/dhcp6-nat-network.xml b/tests/networkxml2confdata/dhcp6-nat-network.xml index 72103f7139..72103f7139 100644 --- a/tests/networkxml2argvdata/dhcp6-nat-network.xml +++ b/tests/networkxml2confdata/dhcp6-nat-network.xml diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network.conf new file mode 100644 index 0000000000..e3b2f8c9bc --- /dev/null +++ b/tests/networkxml2confdata/dhcp6-network.conf @@ -0,0 +1,19 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +domain=mynet +expand-hosts +local=/mynet/ +bind-dynamic +interface=virbr0 +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +dhcp-lease-max=240 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts +enable-ra diff --git a/tests/networkxml2argvdata/dhcp6-network.xml b/tests/networkxml2confdata/dhcp6-network.xml index 311013ad52..311013ad52 100644 --- a/tests/networkxml2argvdata/dhcp6-network.xml +++ b/tests/networkxml2confdata/dhcp6-network.xml diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network.conf new file mode 100644 index 0000000000..4702cea5ed --- /dev/null +++ b/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -0,0 +1,17 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit local +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +local=// +bind-dynamic +interface=virbr1 +dhcp-range=192.168.122.1,static +dhcp-no-override +dhcp-range=2001:db8:ac10:fd01::1,static +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/local.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts +enable-ra diff --git a/tests/networkxml2argvdata/dhcp6host-routed-network.xml b/tests/networkxml2confdata/dhcp6host-routed-network.xml index 38d9ebf892..38d9ebf892 100644 --- a/tests/networkxml2argvdata/dhcp6host-routed-network.xml +++ b/tests/networkxml2confdata/dhcp6host-routed-network.xml diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network.conf new file mode 100644 index 0000000000..6e4b2691a2 --- /dev/null +++ b/tests/networkxml2confdata/isolated-network.conf @@ -0,0 +1,20 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit private +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +local=// +bind-interfaces +except-interface=lo +listen-address=192.168.152.1 +dhcp-option=3 +no-resolv +dhcp-range=192.168.152.2,192.168.152.254 +dhcp-no-override +dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases +dhcp-lease-max=253 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/private.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/private.addnhosts diff --git a/tests/networkxml2argvdata/isolated-network.xml b/tests/networkxml2confdata/isolated-network.xml index cc320a9d22..cc320a9d22 100644 --- a/tests/networkxml2argvdata/isolated-network.xml +++ b/tests/networkxml2confdata/isolated-network.xml diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts.conf new file mode 100644 index 0000000000..c50acd21e4 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-hosts.conf @@ -0,0 +1,14 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +domain=example.com +expand-hosts +local=/example.com/ +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.xml b/tests/networkxml2confdata/nat-network-dns-hosts.xml index 2180a5ddcd..2180a5ddcd 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.xml +++ b/tests/networkxml2confdata/nat-network-dns-hosts.xml diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf new file mode 100644 index 0000000000..25af9c624d --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf @@ -0,0 +1,23 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +local=// +bind-interfaces +except-interface=lo +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 +srv-host=name.tcp.,,,, +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-no-override +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +dhcp-lease-max=253 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml index f6f24e1208..f6f24e1208 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.xml +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record.conf new file mode 100644 index 0000000000..777f03d880 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf @@ -0,0 +1,18 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +local=// +bind-dynamic +interface=virbr0 +srv-host=name.tcp.test-domain-name,.,1024,10,10 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-no-override +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +dhcp-lease-max=253 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.xml b/tests/networkxml2confdata/nat-network-dns-srv-record.xml index 4be85b50a0..4be85b50a0 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.xml +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.xml diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record.conf new file mode 100644 index 0000000000..75ed546ef6 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-txt-record.conf @@ -0,0 +1,18 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +local=// +bind-dynamic +interface=virbr0 +txt-record=example,example value +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-no-override +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +dhcp-lease-max=253 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.xml b/tests/networkxml2confdata/nat-network-dns-txt-record.xml index bd1697608c..bd1697608c 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.xml +++ b/tests/networkxml2confdata/nat-network-dns-txt-record.xml diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network.conf new file mode 100644 index 0000000000..f07456fc34 --- /dev/null +++ b/tests/networkxml2confdata/nat-network.conf @@ -0,0 +1,19 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +local=// +bind-dynamic +interface=virbr0 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-no-override +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +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/networkxml2argvdata/nat-network.xml b/tests/networkxml2confdata/nat-network.xml index eb71d9ea38..eb71d9ea38 100644 --- a/tests/networkxml2argvdata/nat-network.xml +++ b/tests/networkxml2confdata/nat-network.xml diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network.conf new file mode 100644 index 0000000000..bda7e2d5cd --- /dev/null +++ b/tests/networkxml2confdata/netboot-network.conf @@ -0,0 +1,23 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit netboot +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +domain=example.com +expand-hosts +local=/example.com/ +bind-interfaces +except-interface=lo +listen-address=192.168.122.1 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-no-override +enable-tftp +tftp-root=/var/lib/tftproot +dhcp-boot=pxeboot.img +dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases +dhcp-lease-max=253 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts diff --git a/tests/networkxml2argvdata/netboot-network.xml b/tests/networkxml2confdata/netboot-network.xml index b8a4d996fb..b8a4d996fb 100644 --- a/tests/networkxml2argvdata/netboot-network.xml +++ b/tests/networkxml2confdata/netboot-network.xml diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network.conf new file mode 100644 index 0000000000..42b8dfaed9 --- /dev/null +++ b/tests/networkxml2confdata/netboot-proxy-network.conf @@ -0,0 +1,21 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit netboot +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +domain=example.com +expand-hosts +local=/example.com/ +bind-interfaces +except-interface=lo +listen-address=192.168.122.1 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-no-override +dhcp-boot=pxeboot.img,,10.20.30.40 +dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases +dhcp-lease-max=253 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts diff --git a/tests/networkxml2argvdata/netboot-proxy-network.xml b/tests/networkxml2confdata/netboot-proxy-network.xml index e11c50b3ee..e11c50b3ee 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.xml +++ b/tests/networkxml2confdata/netboot-proxy-network.xml diff --git a/tests/networkxml2confdata/routed-network.conf b/tests/networkxml2confdata/routed-network.conf new file mode 100644 index 0000000000..f5f9680027 --- /dev/null +++ b/tests/networkxml2confdata/routed-network.conf @@ -0,0 +1,12 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit local +## of other applications using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +local=// +bind-dynamic +interface=virbr1 +addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts diff --git a/tests/networkxml2argvdata/routed-network.xml b/tests/networkxml2confdata/routed-network.xml index 3aa810929f..3aa810929f 100644 --- a/tests/networkxml2argvdata/routed-network.xml +++ b/tests/networkxml2confdata/routed-network.xml diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2conftest.c index a020db910b..1888465eb1 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2conftest.c @@ -15,42 +15,11 @@ #include "memory.h" #include "network/bridge_driver.h" -/* Replace all occurrences of @token in @buf by @replacement and adjust size of - * @buf accordingly. Returns 0 on success and -1 on out-of-memory errors. */ -static int replaceTokens(char **buf, const char *token, const char *replacement) { - size_t token_start, token_end; - size_t buf_len, rest_len; - const size_t token_len = strlen(token); - const size_t replacement_len = strlen(replacement); - const int diff = replacement_len - token_len; - - buf_len = rest_len = strlen(*buf) + 1; - token_end = 0; - for (;;) { - char *match = strstr(*buf + token_end, token); - if (match == NULL) - break; - token_start = match - *buf; - rest_len -= token_start + token_len - token_end; - token_end = token_start + token_len; - buf_len += diff; - if (diff > 0) - if (VIR_REALLOC_N(*buf, buf_len) < 0) - return -1; - if (diff != 0) - memmove(*buf + token_end + diff, *buf + token_end, rest_len); - memcpy(*buf + token_start, replacement, replacement_len); - token_end += diff; - } - /* if diff < 0, we could shrink the buffer here... */ - return 0; -} - static int -testCompareXMLToArgvFiles(const char *inxml, const char *outargv, dnsmasqCapsPtr caps) +testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr caps) { char *inXmlData = NULL; - char *outArgvData = NULL; + char *outConfData = NULL; char *actual = NULL; int ret = -1; virNetworkDefPtr dev = NULL; @@ -62,10 +31,7 @@ testCompareXMLToArgvFiles(const char *inxml, const char *outargv, dnsmasqCapsPtr if (virtTestLoadFile(inxml, &inXmlData) < 0) goto fail; - if (virtTestLoadFile(outargv, &outArgvData) < 0) - goto fail; - - if (replaceTokens(&outArgvData, "@DNSMASQ@", DNSMASQ)) + if (virtTestLoadFile(outconf, &outConfData) < 0) goto fail; if (!(dev = virNetworkDefParseString(inXmlData))) @@ -80,14 +46,12 @@ testCompareXMLToArgvFiles(const char *inxml, const char *outargv, dnsmasqCapsPtr if (dctx == NULL) goto fail; - if (networkBuildDhcpDaemonCommandLine(obj, &cmd, pidfile, dctx, caps) < 0) - goto fail; - - if (!(actual = virCommandToString(cmd))) + if (networkDnsmasqConfContents(obj, pidfile, &actual, + dctx, caps) < 0) goto fail; - if (STRNEQ(outArgvData, actual)) { - virtTestDifference(stderr, outArgvData, actual); + if (STRNEQ(outConfData, actual)) { + virtTestDifference(stderr, outConfData, actual); goto fail; } @@ -95,7 +59,7 @@ testCompareXMLToArgvFiles(const char *inxml, const char *outargv, dnsmasqCapsPtr fail: VIR_FREE(inXmlData); - VIR_FREE(outArgvData); + VIR_FREE(outConfData); VIR_FREE(actual); VIR_FREE(pidfile); virCommandFree(cmd); @@ -110,21 +74,21 @@ typedef struct { } testInfo; static int -testCompareXMLToArgvHelper(const void *data) +testCompareXMLToConfHelper(const void *data) { int result = -1; const testInfo *info = data; char *inxml = NULL; char *outxml = NULL; - if (virAsprintf(&inxml, "%s/networkxml2argvdata/%s.xml", + if (virAsprintf(&inxml, "%s/networkxml2confdata/%s.xml", abs_srcdir, info->name) < 0 || - virAsprintf(&outxml, "%s/networkxml2argvdata/%s.argv", + virAsprintf(&outxml, "%s/networkxml2confdata/%s.conf", abs_srcdir, info->name) < 0) { goto cleanup; } - result = testCompareXMLToArgvFiles(inxml, outxml, info->caps); + result = testCompareXMLToConfFiles(inxml, outxml, info->caps); cleanup: VIR_FREE(inxml); @@ -163,8 +127,8 @@ mymain(void) \ info.name = xname; \ info.caps = xcaps; \ - if (virtTestRun("Network XML-2-Argv " xname, \ - 1, testCompareXMLToArgvHelper, &info) < 0) { \ + if (virtTestRun("Network XML-2-Conf " xname, \ + 1, testCompareXMLToConfHelper, &info) < 0) { \ ret = -1; \ } \ } while (0) |