nwfilter: rename ebiptables unit tests and data files

Prepare for introduction of nwfilter nftables driver test files.
Create new nwfilterxml2ebipfirewalldata directory for nwfilter
ebiptables driver specific test files.
This way we split off the xml test data from the argument test
files, which are driver specific.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dion Bosschieter <dionbosschieter@gmail.com>

diff --git a/tests/meson.build b/tests/meson.build
index 1f73d6c029d46eae52142b7a9238aef5f58c5289..b9630477321f78868a6939641a2e09ff897681c0 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -443,7 +443,7 @@ endif
 if conf.has('WITH_NWFILTER')
   tests += [
     { 'name': 'nwfilterebiptablestest', 'link_with': [ nwfilter_driver_impl ] },
-    { 'name': 'nwfilterxml2firewalltest', 'link_with': [ nwfilter_driver_impl ] },
+    { 'name': 'nwfilterxml2ebipfirewalltest', 'link_with': [ nwfilter_driver_impl ] },
   ]
 endif
 

diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2ebipfirewalltest.c
similarity index 99%
rename from tests/nwfilterxml2firewalltest.c
rename to tests/nwfilterxml2ebipfirewalltest.c
index 88ba15677d2f63296dd5df4d8178d40116e66820..b5a89f4fb11a4fabd0302698ead126e3b4a48160 100644 (file)
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2ebipfirewalltest.c
@@ -1,5 +1,5 @@
 /*
- * nwfilterxml2firewalltest.c: Test iptables rule generation
+ * nwfilterxml2ebipfirewalltest.c: Test iptables rule generation
  *
  * Copyright (C) 2014 Red Hat, Inc.
  *
@@ -418,7 +418,7 @@ testCompareXMLToIPTablesHelper(const void *data)
 
     xml = g_strdup_printf("%s/nwfilterxml2firewalldata/%s.xml",
                           abs_srcdir, info->name);
-    args = g_strdup_printf("%s/nwfilterxml2firewalldata/%s-%s.args",
+    args = g_strdup_printf("%s/nwfilterxml2firewalldata/%s-%s.ebiptables.args",
                            abs_srcdir, info->name, RULESTYPE);
 
     result = testCompareXMLToArgvFiles(xml, args);

diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ah-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/ah-ipv6-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/ah-linux.args b/tests/nwfilterxml2firewalldata/ah-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ah-linux.args
rename to tests/nwfilterxml2firewalldata/ah-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args b/tests/nwfilterxml2firewalldata/all-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/all-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/all-ipv6-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/all-linux.args b/tests/nwfilterxml2firewalldata/all-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/all-linux.args
rename to tests/nwfilterxml2firewalldata/all-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/arp-linux.args b/tests/nwfilterxml2firewalldata/arp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/arp-linux.args
rename to tests/nwfilterxml2firewalldata/arp-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/comment-linux.args b/tests/nwfilterxml2firewalldata/comment-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/comment-linux.args
rename to tests/nwfilterxml2firewalldata/comment-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/conntrack-linux.args b/tests/nwfilterxml2firewalldata/conntrack-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/conntrack-linux.args
rename to tests/nwfilterxml2firewalldata/conntrack-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/esp-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/esp-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/esp-ipv6-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/esp-linux.args b/tests/nwfilterxml2firewalldata/esp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/esp-linux.args
rename to tests/nwfilterxml2firewalldata/esp-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/example-1-linux.args b/tests/nwfilterxml2firewalldata/example-1-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/example-1-linux.args
rename to tests/nwfilterxml2firewalldata/example-1-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/example-2-linux.args b/tests/nwfilterxml2firewalldata/example-2-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/example-2-linux.args
rename to tests/nwfilterxml2firewalldata/example-2-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/hex-data-linux.args b/tests/nwfilterxml2firewalldata/hex-data-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/hex-data-linux.args
rename to tests/nwfilterxml2firewalldata/hex-data-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/icmp-direction-linux.args b/tests/nwfilterxml2firewalldata/icmp-direction-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmp-direction-linux.args
rename to tests/nwfilterxml2firewalldata/icmp-direction-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/icmp-direction2-linux.args b/tests/nwfilterxml2firewalldata/icmp-direction2-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmp-direction2-linux.args
rename to tests/nwfilterxml2firewalldata/icmp-direction2-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/icmp-direction3-linux.args b/tests/nwfilterxml2firewalldata/icmp-direction3-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmp-direction3-linux.args
rename to tests/nwfilterxml2firewalldata/icmp-direction3-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/icmp-linux.args b/tests/nwfilterxml2firewalldata/icmp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmp-linux.args
rename to tests/nwfilterxml2firewalldata/icmp-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/icmpv6-linux.args b/tests/nwfilterxml2firewalldata/icmpv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmpv6-linux.args
rename to tests/nwfilterxml2firewalldata/icmpv6-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/igmp-linux.args b/tests/nwfilterxml2firewalldata/igmp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/igmp-linux.args
rename to tests/nwfilterxml2firewalldata/igmp-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/ip-linux.args b/tests/nwfilterxml2firewalldata/ip-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ip-linux.args
rename to tests/nwfilterxml2firewalldata/ip-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/ipset-linux.args b/tests/nwfilterxml2firewalldata/ipset-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ipset-linux.args
rename to tests/nwfilterxml2firewalldata/ipset-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args b/tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args
rename to tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/ipv6-linux.args b/tests/nwfilterxml2firewalldata/ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/ipv6-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/iter1-linux.args b/tests/nwfilterxml2firewalldata/iter1-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/iter1-linux.args
rename to tests/nwfilterxml2firewalldata/iter1-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/iter2-linux.args b/tests/nwfilterxml2firewalldata/iter2-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/iter2-linux.args
rename to tests/nwfilterxml2firewalldata/iter2-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/iter3-linux.args b/tests/nwfilterxml2firewalldata/iter3-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/iter3-linux.args
rename to tests/nwfilterxml2firewalldata/iter3-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/mac-linux.args b/tests/nwfilterxml2firewalldata/mac-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/mac-linux.args
rename to tests/nwfilterxml2firewalldata/mac-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/rarp-linux.args b/tests/nwfilterxml2firewalldata/rarp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/rarp-linux.args
rename to tests/nwfilterxml2firewalldata/rarp-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/sctp-ipv6-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/sctp-linux.args b/tests/nwfilterxml2firewalldata/sctp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/sctp-linux.args
rename to tests/nwfilterxml2firewalldata/sctp-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/stp-linux.args b/tests/nwfilterxml2firewalldata/stp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/stp-linux.args
rename to tests/nwfilterxml2firewalldata/stp-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/target-linux.args b/tests/nwfilterxml2firewalldata/target-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/target-linux.args
rename to tests/nwfilterxml2firewalldata/target-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/target2-linux.args b/tests/nwfilterxml2firewalldata/target2-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/target2-linux.args
rename to tests/nwfilterxml2firewalldata/target2-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/tcp-ipv6-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/tcp-linux.args b/tests/nwfilterxml2firewalldata/tcp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/tcp-linux.args
rename to tests/nwfilterxml2firewalldata/tcp-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/udp-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/udp-ipv6-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/udp-linux.args b/tests/nwfilterxml2firewalldata/udp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/udp-linux.args
rename to tests/nwfilterxml2firewalldata/udp-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/udplite-ipv6-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/udplite-linux.args b/tests/nwfilterxml2firewalldata/udplite-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/udplite-linux.args
rename to tests/nwfilterxml2firewalldata/udplite-linux.ebiptables.args

diff --git a/tests/nwfilterxml2firewalldata/vlan-linux.args b/tests/nwfilterxml2firewalldata/vlan-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/vlan-linux.args
rename to tests/nwfilterxml2firewalldata/vlan-linux.ebiptables.args