From: Michal Privoznik <mprivozn@redhat.com> Our network driver calls networkValidate() right after a network XML is parsed. This is similar to domain validation step when parsing domain XML. But it's not that convoluted in network driver. Regardless, any network related test should mimic real life scenario as close as possible and thus networkValidateTests() should be called right after domain XML is parsed. Now, networkValidate() might query sysfs wrt to PCI devices and thus tests must start using virpcimock. The function will also generate random MAC addresses, if needed, hence virrandommock. With this change, passthrough-pf and passthrough-address-crash test cases of networkxml2xmltest started failing but looking at corresponding XMLs those test cases were designed to test just XML parsing. They were never designed to showcase a "real" network XML. So mark them as expected fail. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/networkxml2confdata/leasetime-hours.xml | 1 + .../networkxml2confdata/leasetime-infinite.xml | 1 + .../networkxml2confdata/leasetime-minutes.xml | 1 + .../networkxml2confdata/leasetime-seconds.xml | 1 + tests/networkxml2confdata/netboot-tftp.xml | 1 + tests/networkxml2conftest.c | 5 +++++ tests/networkxml2firewalltest.c | 10 +++++++++- tests/networkxml2xmlout/dnsmasq-options.xml | 1 + .../nat-network-dns-forward-plain.xml | 1 + .../nat-network-dns-forwarder-no-resolv.xml | 1 + .../nat-network-dns-forwarders.xml | 1 + .../nat-network-dns-hosts.xml | 1 + .../nat-network-dns-srv-record-minimal.xml | 1 + .../nat-network-dns-srv-record.xml | 1 + .../nat-network-dns-srv-records.xml | 1 + .../nat-network-dns-txt-record.xml | 1 + .../nat-network-explicit-flood.xml | 1 + .../nat-network-forward-nat-address.xml | 1 + .../nat-network-forward-nat-ipv6.xml | 1 + .../nat-network-forward-nat-no-address.xml | 1 + tests/networkxml2xmlout/nat-network-mtu.xml | 1 + tests/networkxml2xmlout/nat-network.xml | 1 + tests/networkxml2xmlout/netboot-network.xml | 1 + .../netboot-proxy-network.xml | 1 + .../passthrough-address-crash.xml | 7 ------- tests/networkxml2xmlout/passthrough-pf.xml | 9 --------- tests/networkxml2xmltest.c | 18 +++++++++++++++--- 27 files changed, 51 insertions(+), 20 deletions(-) delete mode 100644 tests/networkxml2xmlout/passthrough-address-crash.xml delete mode 100644 tests/networkxml2xmlout/passthrough-pf.xml diff --git a/tests/networkxml2confdata/leasetime-hours.xml b/tests/networkxml2confdata/leasetime-hours.xml index 5c8bec8328..3824d42368 100644 --- a/tests/networkxml2confdata/leasetime-hours.xml +++ b/tests/networkxml2confdata/leasetime-hours.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'> diff --git a/tests/networkxml2confdata/leasetime-infinite.xml b/tests/networkxml2confdata/leasetime-infinite.xml index a5a9e6c5ed..24df80d5e3 100644 --- a/tests/networkxml2confdata/leasetime-infinite.xml +++ b/tests/networkxml2confdata/leasetime-infinite.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'> diff --git a/tests/networkxml2confdata/leasetime-minutes.xml b/tests/networkxml2confdata/leasetime-minutes.xml index 1cbc285685..99956edc51 100644 --- a/tests/networkxml2confdata/leasetime-minutes.xml +++ b/tests/networkxml2confdata/leasetime-minutes.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'> diff --git a/tests/networkxml2confdata/leasetime-seconds.xml b/tests/networkxml2confdata/leasetime-seconds.xml index 9d8efc2608..76bd7909b8 100644 --- a/tests/networkxml2confdata/leasetime-seconds.xml +++ b/tests/networkxml2confdata/leasetime-seconds.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'> diff --git a/tests/networkxml2confdata/netboot-tftp.xml b/tests/networkxml2confdata/netboot-tftp.xml index 297f5a7ba1..9d5d57bae4 100644 --- a/tests/networkxml2confdata/netboot-tftp.xml +++ b/tests/networkxml2confdata/netboot-tftp.xml @@ -3,6 +3,7 @@ <uuid>eb486e5c-4df5-42ee-ae4a-ad8557998d00</uuid> <forward mode='nat'/> <bridge name='virbr0' stp='off' delay='1'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <tftp root='/var/lib/tftproot'/> </ip> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 59ab3a402b..67856f2e8c 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -36,6 +36,9 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, if (!(def = virNetworkDefParse(NULL, inxml, xmlopt, false))) goto fail; + if (networkValidateTests(def) < 0) + goto fail; + if (!(obj = virNetworkObjNew())) goto fail; @@ -203,4 +206,6 @@ mymain(void) } VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virpci"), + VIR_TEST_MOCK("virrandom"), VIR_TEST_MOCK("virdnsmasq")) diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index e32f1b281e..0febae9ebc 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -27,6 +27,8 @@ # include <gio/gio.h> +# define LIBVIRT_BRIDGE_DRIVER_PRIV_H_ALLOW +# include "bridge_driver_priv.h" # include "bridge_driver_platform.h" # include "virbuffer.h" # include "virmock.h" @@ -106,6 +108,9 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(def = virNetworkDefParse(NULL, xml, NULL, false))) return -1; + if (networkValidateTests(def) < 0) + return -1; + if (networkAddFirewallRules(def, backend, NULL) < 0) return -1; @@ -213,7 +218,10 @@ mymain(void) * virGDBusIsServiceRegistered(). */ -VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virgdbus"), +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virpci"), + VIR_TEST_MOCK("virrandom"), + VIR_TEST_MOCK("virgdbus"), VIR_TEST_MOCK("virfirewall")) #else /* ! defined (__linux__) */ diff --git a/tests/networkxml2xmlout/dnsmasq-options.xml b/tests/networkxml2xmlout/dnsmasq-options.xml index 856a018f25..97911eb65e 100644 --- a/tests/networkxml2xmlout/dnsmasq-options.xml +++ b/tests/networkxml2xmlout/dnsmasq-options.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'/> diff --git a/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml b/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml index 7522f6ae1c..76e0f926a9 100644 --- a/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml +++ b/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml @@ -5,6 +5,7 @@ <interface dev='eth0'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <dns forwardPlainNames='yes'/> <ip address='192.168.122.1' netmask='255.255.255.0'> </ip> diff --git a/tests/networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xml b/tests/networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xml index 9661ce561e..ab2800331c 100644 --- a/tests/networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xml +++ b/tests/networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xml @@ -3,6 +3,7 @@ <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> <forward mode='nat'/> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <dns> <forwarder domain='example.com' addr='192.168.1.1'/> </dns> diff --git a/tests/networkxml2xmlout/nat-network-dns-forwarders.xml b/tests/networkxml2xmlout/nat-network-dns-forwarders.xml index e03912750c..170b043d09 100644 --- a/tests/networkxml2xmlout/nat-network-dns-forwarders.xml +++ b/tests/networkxml2xmlout/nat-network-dns-forwarders.xml @@ -5,6 +5,7 @@ <interface dev='eth0'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <dns> <forwarder addr='8.8.8.8'/> <forwarder addr='8.8.4.4'/> diff --git a/tests/networkxml2xmlout/nat-network-dns-hosts.xml b/tests/networkxml2xmlout/nat-network-dns-hosts.xml index 86832af518..548282e514 100644 --- a/tests/networkxml2xmlout/nat-network-dns-hosts.xml +++ b/tests/networkxml2xmlout/nat-network-dns-hosts.xml @@ -5,6 +5,7 @@ <interface dev='eth0'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <dns forwardPlainNames='no'> <host ip='192.168.122.122'> <hostname>pudding</hostname> diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml index a18afae2fd..50e968be9d 100644 --- a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml +++ b/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <dns> <srv service='name' protocol='tcp'/> </dns> diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml b/tests/networkxml2xmlout/nat-network-dns-srv-record.xml index 3dd19e6698..1486fc3224 100644 --- a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml +++ b/tests/networkxml2xmlout/nat-network-dns-srv-record.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <dns> <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> </dns> diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-records.xml b/tests/networkxml2xmlout/nat-network-dns-srv-records.xml index eda9e20333..26b802e1eb 100644 --- a/tests/networkxml2xmlout/nat-network-dns-srv-records.xml +++ b/tests/networkxml2xmlout/nat-network-dns-srv-records.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <dns> <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> <srv service='name' protocol='tcp' domain='donkey' target='.' port='404' priority='10' weight='10'/> diff --git a/tests/networkxml2xmlout/nat-network-dns-txt-record.xml b/tests/networkxml2xmlout/nat-network-dns-txt-record.xml index a4590119ef..cba7e9d1f8 100644 --- a/tests/networkxml2xmlout/nat-network-dns-txt-record.xml +++ b/tests/networkxml2xmlout/nat-network-dns-txt-record.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <dns> <txt name='example' value='example value'/> </dns> diff --git a/tests/networkxml2xmlout/nat-network-explicit-flood.xml b/tests/networkxml2xmlout/nat-network-explicit-flood.xml index 305c3b7d98..c039955543 100644 --- a/tests/networkxml2xmlout/nat-network-explicit-flood.xml +++ b/tests/networkxml2xmlout/nat-network-explicit-flood.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0' macTableManager='kernel'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'/> diff --git a/tests/networkxml2xmlout/nat-network-forward-nat-address.xml b/tests/networkxml2xmlout/nat-network-forward-nat-address.xml index faeba24706..e3276ac338 100644 --- a/tests/networkxml2xmlout/nat-network-forward-nat-address.xml +++ b/tests/networkxml2xmlout/nat-network-forward-nat-address.xml @@ -9,6 +9,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'/> diff --git a/tests/networkxml2xmlout/nat-network-forward-nat-ipv6.xml b/tests/networkxml2xmlout/nat-network-forward-nat-ipv6.xml index cfec391ee2..642929cc8d 100644 --- a/tests/networkxml2xmlout/nat-network-forward-nat-ipv6.xml +++ b/tests/networkxml2xmlout/nat-network-forward-nat-ipv6.xml @@ -5,6 +5,7 @@ <nat ipv6='yes'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> </ip> </network> diff --git a/tests/networkxml2xmlout/nat-network-forward-nat-no-address.xml b/tests/networkxml2xmlout/nat-network-forward-nat-no-address.xml index f19e34deec..77fc0b5324 100644 --- a/tests/networkxml2xmlout/nat-network-forward-nat-no-address.xml +++ b/tests/networkxml2xmlout/nat-network-forward-nat-no-address.xml @@ -8,6 +8,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'/> diff --git a/tests/networkxml2xmlout/nat-network-mtu.xml b/tests/networkxml2xmlout/nat-network-mtu.xml index 715bc1b505..97044c70ec 100644 --- a/tests/networkxml2xmlout/nat-network-mtu.xml +++ b/tests/networkxml2xmlout/nat-network-mtu.xml @@ -6,6 +6,7 @@ </forward> <bridge name='virbr0' stp='on' delay='0'/> <mtu size='7000'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'/> diff --git a/tests/networkxml2xmlout/nat-network.xml b/tests/networkxml2xmlout/nat-network.xml index 93bc7db51d..9d3757f0e0 100644 --- a/tests/networkxml2xmlout/nat-network.xml +++ b/tests/networkxml2xmlout/nat-network.xml @@ -5,6 +5,7 @@ <interface dev='eth1'/> </forward> <bridge name='virbr0' stp='on' delay='0'/> + <mac address='52:54:00:00:00:00'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.122.2' end='192.168.122.254'/> diff --git a/tests/networkxml2xmlout/netboot-network.xml b/tests/networkxml2xmlout/netboot-network.xml index 8d5ad31a00..723c6c7a72 100644 --- a/tests/networkxml2xmlout/netboot-network.xml +++ b/tests/networkxml2xmlout/netboot-network.xml @@ -3,6 +3,7 @@ <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> <forward mode='nat'/> <bridge name='virbr1' stp='off' delay='1'/> + <mac address='52:54:00:00:00:00'/> <domain name='example.com'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <tftp root='/var/lib/tftproot'/> diff --git a/tests/networkxml2xmlout/netboot-proxy-network.xml b/tests/networkxml2xmlout/netboot-proxy-network.xml index a5b7c1e4e6..8c9fae874c 100644 --- a/tests/networkxml2xmlout/netboot-proxy-network.xml +++ b/tests/networkxml2xmlout/netboot-proxy-network.xml @@ -3,6 +3,7 @@ <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> <forward mode='nat'/> <bridge name='virbr1' stp='off' delay='1'/> + <mac address='52:54:00:00:00:00'/> <domain name='example.com'/> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> diff --git a/tests/networkxml2xmlout/passthrough-address-crash.xml b/tests/networkxml2xmlout/passthrough-address-crash.xml deleted file mode 100644 index a05dbbf837..0000000000 --- a/tests/networkxml2xmlout/passthrough-address-crash.xml +++ /dev/null @@ -1,7 +0,0 @@ -<network> - <name>passthrough_001</name> - <uuid>50e92386-8dd1-4a95-8a4b-9a888274eb66</uuid> - <forward mode='passthrough'> - <address type='pci' domain='0x0000' bus='0x11' slot='0x10' function='0x1'/> - </forward> -</network> diff --git a/tests/networkxml2xmlout/passthrough-pf.xml b/tests/networkxml2xmlout/passthrough-pf.xml deleted file mode 100644 index 1a7e71ea88..0000000000 --- a/tests/networkxml2xmlout/passthrough-pf.xml +++ /dev/null @@ -1,9 +0,0 @@ -<network> - <name>local</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward mode='passthrough'> - <pf dev='eth0'/> - </forward> - <ip address='192.168.122.1' netmask='255.255.255.0'> - </ip> -</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 840bcaa83f..10eed8173e 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -17,6 +17,7 @@ typedef enum { TEST_COMPARE_NET_XML2XML_RESULT_SUCCESS, TEST_COMPARE_NET_XML2XML_RESULT_FAIL_PARSE, + TEST_COMPARE_NET_XML2XML_RESULT_FAIL_VALIDATE, TEST_COMPARE_NET_XML2XML_RESULT_FAIL_FORMAT, TEST_COMPARE_NET_XML2XML_RESULT_FAIL_COMPARE, } testCompareNetXML2XMLResult; @@ -42,6 +43,13 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, if (expectResult == TEST_COMPARE_NET_XML2XML_RESULT_FAIL_PARSE) goto cleanup; + if (networkValidateTests(dev) < 0) { + result = TEST_COMPARE_NET_XML2XML_RESULT_FAIL_VALIDATE; + goto cleanup; + } + if (expectResult == TEST_COMPARE_NET_XML2XML_RESULT_FAIL_VALIDATE) + goto cleanup; + if (!(actual = virNetworkDefFormat(dev, xmlopt, flags))) { result = TEST_COMPARE_NET_XML2XML_RESULT_FAIL_FORMAT; goto cleanup; @@ -114,6 +122,8 @@ mymain(void) DO_TEST_FULL(name, flags, TEST_COMPARE_NET_XML2XML_RESULT_SUCCESS) #define DO_TEST_PARSE_ERROR(name) \ DO_TEST_FULL(name, 0, TEST_COMPARE_NET_XML2XML_RESULT_FAIL_PARSE) +#define DO_TEST_VALIDATE_ERROR(name) \ + DO_TEST_FULL(name, 0, TEST_COMPARE_NET_XML2XML_RESULT_FAIL_VALIDATE) DO_TEST("dhcp6host-routed-network"); DO_TEST("empty-allow-ipv6"); @@ -145,12 +155,12 @@ mymain(void) DO_TEST("vepa-net"); DO_TEST("bandwidth-network"); DO_TEST("openvswitch-net"); - DO_TEST_FLAGS("passthrough-pf", VIR_NETWORK_XML_INACTIVE); + DO_TEST_VALIDATE_ERROR("passthrough-pf"); DO_TEST("hostdev"); DO_TEST_FLAGS("hostdev-pf", VIR_NETWORK_XML_INACTIVE); DO_TEST_FLAGS("hostdev-pf-driver-model", VIR_NETWORK_XML_INACTIVE); - DO_TEST("passthrough-address-crash"); + DO_TEST_VALIDATE_ERROR("passthrough-address-crash"); DO_TEST("nat-network-explicit-flood"); DO_TEST("host-bridge-no-flood"); DO_TEST_PARSE_ERROR("hostdev-duplicate"); @@ -167,4 +177,6 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN(mymain) +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virpci"), + VIR_TEST_MOCK("virrandom")) -- 2.52.0