Move vpn tests into an own directory structure

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index e52bf17f8c55ebf35c39d50188b44cea440e23cb..398576b874d512991499bef651fa9d7e266b9d0f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -603,12 +603,12 @@ NITSI_TESTS = \
        test/nitsi/test/raw-device-get-by-mac \
        test/nitsi/test/zone-new-bridge \
        test/nitsi/test/zone-port-attach-bridge \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4 \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6 \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4 \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6 \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4 \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6 \
        test/nitsi/test/port-vlan
 
 EXTRA_DIST += \
@@ -621,20 +621,20 @@ EXTRA_DIST += \
        test/nitsi/test/zone-new-bridge/settings.in \
        test/nitsi/test/zone-port-attach-bridge/recipe \
        test/nitsi/test/zone-port-attach-bridge/settings.in \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/recipe \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/settings \
-       test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/settings \
-       test/nitsi/test/port-vlan/settings \
-       test/nitsi/test/port-vlan/recipe
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/recipe \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/settings \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/recipe \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/settings \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/recipe \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/settings \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/recipe \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/settings \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/recipe \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/settings \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/recipe \
+       test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/settings \
+       test/nitsi/test/port-vlan/recipe \
+       test/nitsi/test/port-vlan/settings
 
 CLEANFILES += \
        test/nitsi/test/settings \

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/recipe b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/recipe
deleted file mode 100644 (file)
index 7cbdf79..0000000
--- a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/recipe
+++ /dev/null
@@ -1,14 +0,0 @@
-include: ../../include/vpn-ipsec-basic-connection
-include: ../../include/vpn-ipsec-basic-peer-ipv4
-include: ../../include/vpn-ipsec-basic-ts-ipv64
-all: mv -f /root/strongswan.conf /etc/strongswan.conf
-all: systemctl restart strongswan
-all:network vpn  ipsec connection basic mode vti
-alice: network vpn ipsec connection basic up
-include: ../../include/vpn-ipsec-basic-ping-test-ipv64
-include: ../../include/vpn-ipsec-basic-vti-test
-all: swanctl --list-sas
-all: ip route show
-all: ip route show table 220
-all: network vpn ipsec connection basic down
-all: network vpn ipsec connection destroy basic
\ No newline at end of file

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/recipe b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/recipe
deleted file mode 100644 (file)
index 77eb446..0000000
--- a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/recipe
+++ /dev/null
@@ -1,14 +0,0 @@
-include: ../../include/vpn-ipsec-basic-connection
-include: ../../include/vpn-ipsec-basic-peer-ipv6
-include: ../../include/vpn-ipsec-basic-ts-ipv64
-all: mv -f /root/strongswan.conf /etc/strongswan.conf
-all: systemctl restart strongswan
-all:network vpn  ipsec connection basic mode vti
-alice: network vpn ipsec connection basic up
-include: ../../include/vpn-ipsec-basic-ping-test-ipv64
-include: ../../include/vpn-ipsec-basic-vti-test
-all: swanctl --list-sas
-all: ip route show
-all: ip route show table 220
-all: network vpn ipsec connection basic down
-all: network vpn ipsec connection destroy basic
\ No newline at end of file

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/.gitignore b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/.gitignore
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/.gitignore
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/.gitignore

diff --git a/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/recipe b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/recipe
new file mode 100644 (file)
index 0000000..3bfe957
--- /dev/null
+++ b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/recipe
@@ -0,0 +1,14 @@
+include: vpn-ipsec-basic-connection
+include: vpn-ipsec-basic-peer-ipv4
+include: vpn-ipsec-basic-ts-ipv4
+all: mv -f /root/strongswan.conf /etc/strongswan.conf
+all: systemctl restart strongswan
+all:network vpn  ipsec connection basic mode vti
+alice: network vpn ipsec connection basic up
+include: vpn-ipsec-basic-ping-test-ipv4
+include: vpn-ipsec-basic-vti-test
+all: swanctl --list-sas
+all: ip route show
+all: ip route show table 220
+alice: network vpn ipsec connection basic down
+all: network vpn ipsec connection destroy basic

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/settings b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/settings
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/settings
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/settings

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/.gitignore b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/.gitignore
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/.gitignore
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/.gitignore

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/recipe b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/recipe
similarity index 50%
rename from test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/recipe
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/recipe
index 88ab49a1864f9602399b56dc5d32f907d26846cf..dd32bf2b065c5060ac7c5cf40d7d2a7ea76a1c4d 100644 (file)
--- a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/recipe
+++ b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/recipe
@@ -1,14 +1,14 @@
-include: ../../include/vpn-ipsec-basic-connection
-include: ../../include/vpn-ipsec-basic-peer-ipv4
-include: ../../include/vpn-ipsec-basic-ts-ipv4
+include: vpn-ipsec-basic-connection
+include: vpn-ipsec-basic-peer-ipv6
+include: vpn-ipsec-basic-ts-ipv4
 all: mv -f /root/strongswan.conf /etc/strongswan.conf
 all: systemctl restart strongswan
 all:network vpn  ipsec connection basic mode vti
 alice: network vpn ipsec connection basic up
-include: ../../include/vpn-ipsec-basic-ping-test-ipv4
-include: ../../include/vpn-ipsec-basic-vti-test
+include: vpn-ipsec-basic-ping-test-ipv4
+include: vpn-ipsec-basic-vti-test
 all: swanctl --list-sas
 all: ip route show
 all: ip route show table 220
 all: network vpn ipsec connection basic down
-all: network vpn ipsec connection destroy basic
\ No newline at end of file
+all: network vpn ipsec connection destroy basic

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/settings b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/settings
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/settings
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/settings

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/.gitignore b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/.gitignore
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/.gitignore
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/.gitignore

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/recipe b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/recipe
similarity index 50%
rename from test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/recipe
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/recipe
index dd08c6f64aa869f5c182e46b80428624c0885576..229a707f9309f609a55a8ecbdb98a967ae4f0077 100644 (file)
--- a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/recipe
+++ b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/recipe
@@ -1,14 +1,14 @@
-include: ../../include/vpn-ipsec-basic-connection
-include: ../../include/vpn-ipsec-basic-peer-ipv6
-include: ../../include/vpn-ipsec-basic-ts-ipv4
+include: vpn-ipsec-basic-connection
+include: vpn-ipsec-basic-peer-ipv4
+include: vpn-ipsec-basic-ts-ipv6
 all: mv -f /root/strongswan.conf /etc/strongswan.conf
 all: systemctl restart strongswan
 all:network vpn  ipsec connection basic mode vti
 alice: network vpn ipsec connection basic up
-include: ../../include/vpn-ipsec-basic-ping-test-ipv4
-include: ../../include/vpn-ipsec-basic-vti-test
+include: vpn-ipsec-basic-ping-test-ipv6
+include: vpn-ipsec-basic-vti-test
 all: swanctl --list-sas
 all: ip route show
 all: ip route show table 220
 all: network vpn ipsec connection basic down
-all: network vpn ipsec connection destroy basic
\ No newline at end of file
+all: network vpn ipsec connection destroy basic

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/settings b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/settings
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/settings
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/settings

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/.gitignore b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/.gitignore
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/.gitignore
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/.gitignore

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/recipe b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/recipe
similarity index 50%
rename from test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/recipe
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/recipe
index be7f94a042fb6578b55f71ed8d22d42baca1e7c2..ec50662948857260611c4d2c7c64232c114efc7e 100644 (file)
--- a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/recipe
+++ b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/recipe
@@ -1,14 +1,14 @@
-include: ../../include/vpn-ipsec-basic-connection
-include: ../../include/vpn-ipsec-basic-peer-ipv4
-include: ../../include/vpn-ipsec-basic-ts-ipv6
+include: vpn-ipsec-basic-connection
+include: vpn-ipsec-basic-peer-ipv6
+include: vpn-ipsec-basic-ts-ipv6
 all: mv -f /root/strongswan.conf /etc/strongswan.conf
 all: systemctl restart strongswan
 all:network vpn  ipsec connection basic mode vti
 alice: network vpn ipsec connection basic up
-include: ../../include/vpn-ipsec-basic-ping-test-ipv6
-include: ../../include/vpn-ipsec-basic-vti-test
+include: vpn-ipsec-basic-ping-test-ipv6
+include: vpn-ipsec-basic-vti-test
 all: swanctl --list-sas
 all: ip route show
 all: ip route show table 220
 all: network vpn ipsec connection basic down
-all: network vpn ipsec connection destroy basic
\ No newline at end of file
+all: network vpn ipsec connection destroy basic

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/settings b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/settings
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/settings
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/settings

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/.gitignore b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/.gitignore
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/.gitignore
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/.gitignore

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/recipe b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/recipe
similarity index 50%
rename from test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/recipe
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/recipe
index f3ee0a86f3aaac5c249f522d35e8bca20f259e4c..d09e011d0d7b1ec522d19b8bc0a75cdb7b333dae 100644 (file)
--- a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/recipe
+++ b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/recipe
@@ -1,14 +1,14 @@
-include: ../../include/vpn-ipsec-basic-connection
-include: ../../include/vpn-ipsec-basic-peer-ipv6
-include: ../../include/vpn-ipsec-basic-ts-ipv6
+include: vpn-ipsec-basic-connection
+include: vpn-ipsec-basic-peer-ipv4
+include: vpn-ipsec-basic-ts-ipv64
 all: mv -f /root/strongswan.conf /etc/strongswan.conf
 all: systemctl restart strongswan
 all:network vpn  ipsec connection basic mode vti
 alice: network vpn ipsec connection basic up
-include: ../../include/vpn-ipsec-basic-ping-test-ipv6
-include: ../../include/vpn-ipsec-basic-vti-test
+include: vpn-ipsec-basic-ping-test-ipv64
+include: vpn-ipsec-basic-vti-test
 all: swanctl --list-sas
 all: ip route show
 all: ip route show table 220
 all: network vpn ipsec connection basic down
-all: network vpn ipsec connection destroy basic
\ No newline at end of file
+all: network vpn ipsec connection destroy basic

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/settings b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/settings
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/settings
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/settings

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/.gitignore b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/.gitignore
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/.gitignore
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/.gitignore

diff --git a/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/recipe b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/recipe
new file mode 100644 (file)
index 0000000..c7dff9a
--- /dev/null
+++ b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/recipe
@@ -0,0 +1,14 @@
+include: vpn-ipsec-basic-connection
+include: vpn-ipsec-basic-peer-ipv6
+include: vpn-ipsec-basic-ts-ipv64
+all: mv -f /root/strongswan.conf /etc/strongswan.conf
+all: systemctl restart strongswan
+all:network vpn  ipsec connection basic mode vti
+alice: network vpn ipsec connection basic up
+include: vpn-ipsec-basic-ping-test-ipv64
+include: vpn-ipsec-basic-vti-test
+all: swanctl --list-sas
+all: ip route show
+all: ip route show table 220
+all: network vpn ipsec connection basic down
+all: network vpn ipsec connection destroy basic

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/settings b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/settings
similarity index 100%
rename from test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/settings
rename to test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/settings