Merge remote-tracking branch 'jschlag/master'

diff --git a/Makefile.am b/Makefile.am
index 809c824f8a861adb8aebfc58e19442fd6f5a9db3..b28f03049f637a9ab4b1a4ed5bbac327f7fa8b5b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -604,12 +604,13 @@ 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 += \
        test/nitsi/test/settings.in \
@@ -621,18 +622,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/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/phase1/recipe b/test/nitsi/test/phase1/recipe
index 61e27f3ccd6d8cf475d69bc59f8b52708571c795..38234a06c322b7c84f9f92f14cfee4d3e5248ad3 100644 (file)
--- a/test/nitsi/test/phase1/recipe
+++ b/test/nitsi/test/phase1/recipe
@@ -1,5 +1,5 @@
-include: ../../include/setup
-include: ../../include/phase1
+include: setup
+include: phase1
 
 # Let Alice ping Bob
 alice: ping -c 5 192.168.100.102

diff --git a/test/nitsi/test/port-vlan/recipe b/test/nitsi/test/port-vlan/recipe
new file mode 100644 (file)
index 0000000..d41377b
--- /dev/null
+++ b/test/nitsi/test/port-vlan/recipe
@@ -0,0 +1,27 @@
+include: setup
+
+# This contains the basic network configuration for all vpn-tests
+include: alice-port-vars
+include: bob-port-vars
+
+# Create an uplink zone
+all: network zone new upl0 bridge --stp=off
+
+# Add IP addresses for Alice
+alice: network zone upl0 config new static 192.168.100.101/24
+
+# Add IP addresses for Bob
+bob: network zone upl0 config new static 192.168.100.102/24
+
+# Print what has been brought up
+all: network status
+
+# Create a vlan device with parent port attached to net1
+all: network port new vlan --parent-device=${p_net1} --tag=42
+all: network zone upl0 port attach "${p_net1}v42"
+
+# Test if the vlan works by pinging bob
+alice: ping -c 5 192.168.100.102
+
+# Test that we can detach the vlan port
+all: network zone upl0 port detach "${p_net1}v42"

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

diff --git a/test/nitsi/test/pppoe/recipe b/test/nitsi/test/pppoe/recipe
index a164a8381b9b979aa5ba8dbf37b21b069ea47f39..f639b449bd653292dd95c93cd0a12595844a34d2 100644 (file)
--- a/test/nitsi/test/pppoe/recipe
+++ b/test/nitsi/test/pppoe/recipe
@@ -1,8 +1,8 @@
-include: ../../include/setup
+include: setup
 
 # Get port names for Alice and Bob
-include: ../../include/alice-port-vars
-include: ../../include/bob-port-vars
+include: alice-port-vars
+include: bob-port-vars
 
 # Start a PPPoE server on Alice
 alice: network zone new upl0 bridge

diff --git a/test/nitsi/test/raw-device-get-by-mac/recipe b/test/nitsi/test/raw-device-get-by-mac/recipe
index 61ea1fbd61e4a004f05c9202cced8fb857ff1865..ccdcdfa7db7d4076814bba27e85c333e1034d954 100644 (file)
--- a/test/nitsi/test/raw-device-get-by-mac/recipe
+++ b/test/nitsi/test/raw-device-get-by-mac/recipe
@@ -1,4 +1,4 @@
-include: ../../include/setup
+include: setup
 alice: port="$(network raw device-get-by-mac-address "52:54:00:8a:b8:b5")"
 alice: echo $port
 alice: [ "52:54:00:8a:b8:b5" = "$(cat /sys/class/net/${port}/address)" ]

diff --git a/test/nitsi/test/settings.in b/test/nitsi/test/settings.in
index 0c33eb1ac3a1ab48591d7ee2136aee9338f78ad1..2aa7eaf8e9f9a5ff1320ff1d3121593cd9365f9a 100644 (file)
--- a/test/nitsi/test/settings.in
+++ b/test/nitsi/test/settings.in
@@ -1,6 +1,7 @@
 [GENERAL]
 copy_from = ../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 copy_to = /root/
+include_path = ../include
 
 [VIRTUAL_ENVIRONMENT]
 path = ../virtual-environment/basic

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-ipv6-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-ipv6-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-ipv6-via-ipv4-vti/settings b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/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/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-ipv6-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-ipv6-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-ipv64-via-ipv4-vti/settings b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/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/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-ipv6-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-ipv6-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/n2n/vti/ipv64-via-ipv6/settings b/test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/settings
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/nitsi/test/zone-new-bridge/recipe b/test/nitsi/test/zone-new-bridge/recipe
index a1ae1807837e47f9eda5b246489832add8147708..693dc024d0cbe828fe7918c4138560202f926457 100644 (file)
--- a/test/nitsi/test/zone-new-bridge/recipe
+++ b/test/nitsi/test/zone-new-bridge/recipe
@@ -1,4 +1,4 @@
-include: ../../include/setup
+include: setup
 
 alice: network zone new upl0 bridge
 # this returns zero if the device exists

diff --git a/test/nitsi/test/zone-port-attach-bridge/recipe b/test/nitsi/test/zone-port-attach-bridge/recipe
index 3abf294d335fd241d755c464c7ef0ddd973be220..4efbd184de78f32ea42034e7cc7f19efb3e7b32a 100644 (file)
--- a/test/nitsi/test/zone-port-attach-bridge/recipe
+++ b/test/nitsi/test/zone-port-attach-bridge/recipe
@@ -1,4 +1,4 @@
-include: ../../include/setup
+include: setup
 
 alice: network zone new upl0 bridge
 # Create a dummy port we can attach to upl0