From 50e49cae331630aac51122f31b615f9a83e920a4 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 15 Sep 2018 17:55:01 +0200 Subject: [PATCH] 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 --- test/nitsi/include/vpn-ipsec-basic-ts-ipv4 | 8 ++++---- test/nitsi/include/vpn-ipsec-basic-ts-ipv6 | 8 ++++---- test/nitsi/include/vpn-ipsec-basic-ts-ipv64 | 6 ++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/test/nitsi/include/vpn-ipsec-basic-ts-ipv4 b/test/nitsi/include/vpn-ipsec-basic-ts-ipv4 index 34ed5747..e9a5a22d 100644 --- 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 7f1bf74c..8a4676f7 100644 --- 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 7845bc60..90d36d9f 100644 --- 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 -- 2.39.5