Add VPN n2n tests for vti

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

diff --git a/Makefile.am b/Makefile.am
index 3df14fb2cfef90ab9f824ee4be8f553fb31b0511..ae66e36079df8b29ec2e5d177a52f8843071a8a3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -601,7 +601,13 @@ NITSI_TESTS = \
        test/nitsi/test/phase1 \
        test/nitsi/test/raw-device-get-by-mac \
        test/nitsi/test/zone-new-bridge \
-       test/nitsi/test/zone-port-attach-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
 
 EXTRA_DIST += \
        test/nitsi/test/settings.in \
@@ -612,7 +618,19 @@ EXTRA_DIST += \
        test/nitsi/test/zone-new-bridge/recipe \
        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/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
 
 CLEANFILES += \
        test/nitsi/test/settings \
@@ -626,7 +644,7 @@ NITSI_ENVIRONMENT =
 
 .PHONY: $(NITSI_TESTS)
 $(NITSI_TESTS): % : %/recipe %/settings test/nitsi/test/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES)
-       $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@ \
+       $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level debug run-test -d $@ --interactive-error-handling \
                --default-settings $(abs_builddir)/test/nitsi/test/settings
 
 .PHONY: nitsi

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/.gitignore b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/.gitignore
new file mode 100644 (file)
index 0000000..1920d37
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/.gitignore
@@ -0,0 +1,2 @@
+/log
+/recipe.log

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/recipe b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/recipe
new file mode 100644 (file)
index 0000000..88ab49a
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/recipe
@@ -0,0 +1,14 @@
+include: ../../include/vpn-ipsec-basic-connection
+include: ../../include/vpn-ipsec-basic-peer-ipv4
+include: ../../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
+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/settings b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv4-vti/settings
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/.gitignore b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/.gitignore
new file mode 100644 (file)
index 0000000..1920d37
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/.gitignore
@@ -0,0 +1,2 @@
+/log
+/recipe.log

diff --git a/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/recipe b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/recipe
new file mode 100644 (file)
index 0000000..dd08c6f
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/recipe
@@ -0,0 +1,14 @@
+include: ../../include/vpn-ipsec-basic-connection
+include: ../../include/vpn-ipsec-basic-peer-ipv6
+include: ../../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
+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-ipv6-vti/settings b/test/nitsi/test/vpn-ipsec-ipv4-via-ipv6-vti/settings
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/.gitignore b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/.gitignore
new file mode 100644 (file)
index 0000000..1920d37
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/.gitignore
@@ -0,0 +1,2 @@
+/log
+/recipe.log

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/recipe b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/recipe
new file mode 100644 (file)
index 0000000..be7f94a
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/recipe
@@ -0,0 +1,14 @@
+include: ../../include/vpn-ipsec-basic-connection
+include: ../../include/vpn-ipsec-basic-peer-ipv4
+include: ../../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
+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-ipv6-via-ipv4-vti/settings b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv4-vti/settings
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/.gitignore b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/.gitignore
new file mode 100644 (file)
index 0000000..1920d37
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/.gitignore
@@ -0,0 +1,2 @@
+/log
+/recipe.log

diff --git a/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/recipe b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/recipe
new file mode 100644 (file)
index 0000000..f3ee0a8
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/recipe
@@ -0,0 +1,14 @@
+include: ../../include/vpn-ipsec-basic-connection
+include: ../../include/vpn-ipsec-basic-peer-ipv6
+include: ../../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
+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-ipv6-via-ipv6-vti/settings b/test/nitsi/test/vpn-ipsec-ipv6-via-ipv6-vti/settings
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/.gitignore b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/.gitignore
new file mode 100644 (file)
index 0000000..1920d37
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/.gitignore
@@ -0,0 +1,2 @@
+/log
+/recipe.log

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/recipe b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/recipe
new file mode 100644 (file)
index 0000000..7cbdf79
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/recipe
@@ -0,0 +1,14 @@
+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-ipv4-vti/settings b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv4-vti/settings
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/.gitignore b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/.gitignore
new file mode 100644 (file)
index 0000000..1920d37
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/.gitignore
@@ -0,0 +1,2 @@
+/log
+/recipe.log

diff --git a/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/recipe b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/recipe
new file mode 100644 (file)
index 0000000..77eb446
--- /dev/null
+++ b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/recipe
@@ -0,0 +1,14 @@
+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-ipv64-via-ipv6-vti/settings b/test/nitsi/test/vpn-ipsec-ipv64-via-ipv6-vti/settings
new file mode 100644 (file)
index 0000000..e69de29