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/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 \
+++ /dev/null
-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
+++ /dev/null
-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
--- /dev/null
+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
-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
-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
-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
-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
--- /dev/null
+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