Make setting of traffic selectors in nitsi test easier

We now include the file for ipv4 and for ipv6 into the file for ipv64
which makes maintenance easier.

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

diff --git a/test/nitsi/include/vpn-ipsec-basic-ts-ipv4 b/test/nitsi/include/vpn-ipsec-basic-ts-ipv4
index 34ed574795d00247933f963c5527b2e4741ec771..e9a5a22d04cd0a81ffa5015fbae046b9fca1af91 100644 (file)
--- a/test/nitsi/include/vpn-ipsec-basic-ts-ipv4
+++ b/test/nitsi/include/vpn-ipsec-basic-ts-ipv4
@@ -1,4 +1,4 @@
-alice: network vpn ipsec connection basic local prefix 192.168.200.0/24
-alice: network vpn ipsec connection basic remote prefix 192.168.201.0/24
-bob: network vpn ipsec connection basic local prefix 192.168.201.0/24
-bob: network vpn ipsec connection basic remote prefix 192.168.200.0/24
\ No newline at end of file
+alice: network vpn ipsec connection basic local prefix +192.168.200.0/24
+alice: network vpn ipsec connection basic remote prefix +192.168.201.0/24
+bob: network vpn ipsec connection basic local prefix +192.168.201.0/24
+bob: network vpn ipsec connection basic remote prefix +192.168.200.0/24
\ No newline at end of file

diff --git a/test/nitsi/include/vpn-ipsec-basic-ts-ipv6 b/test/nitsi/include/vpn-ipsec-basic-ts-ipv6
index 7f1bf74c3ffe3ca7638076b54806b28e2722084c..8a4676f7ab78df63f7473ae2244edb50600b9650 100644 (file)
--- a/test/nitsi/include/vpn-ipsec-basic-ts-ipv6
+++ b/test/nitsi/include/vpn-ipsec-basic-ts-ipv6
@@ -1,4 +1,4 @@
-alice: network vpn ipsec connection basic local prefix 2001:470:6ef3::/64
-alice: network vpn ipsec connection basic remote prefix 2001:470:6ef3:2::/64
-bob: network vpn ipsec connection basic local prefix 2001:470:6ef3:2::/64
-bob: network vpn ipsec connection basic remote prefix 2001:470:6ef3::/64
\ No newline at end of file
+alice: network vpn ipsec connection basic local prefix +2001:470:6ef3::/64
+alice: network vpn ipsec connection basic remote prefix +2001:470:6ef3:2::/64
+bob: network vpn ipsec connection basic local prefix +2001:470:6ef3:2::/64
+bob: network vpn ipsec connection basic remote prefix +2001:470:6ef3::/64
\ No newline at end of file

diff --git a/test/nitsi/include/vpn-ipsec-basic-ts-ipv64 b/test/nitsi/include/vpn-ipsec-basic-ts-ipv64
index 7845bc601b9635df624762a59f20cb0326c66d15..90d36d9f2816b4904a7e649ec3c46aff57f741f4 100644 (file)
--- a/test/nitsi/include/vpn-ipsec-basic-ts-ipv64
+++ b/test/nitsi/include/vpn-ipsec-basic-ts-ipv64
@@ -1,4 +1,2 @@
-alice: network vpn ipsec connection basic local prefix 192.168.200.0/24 2001:470:6ef3::/64
-alice: network vpn ipsec connection basic remote prefix 192.168.201.0/24 2001:470:6ef3:2::/64
-bob: network vpn ipsec connection basic local prefix 192.168.201.0/24 2001:470:6ef3:2::/64
-bob: network vpn ipsec connection basic remote prefix 192.168.200.0/24 2001:470:6ef3::/64
\ No newline at end of file
+include: ./vpn-ipsec-basic-ts-ipv4
+include: ./vpn-ipsec-basic-ts-ipv6
\ No newline at end of file