From: Jonatan Schlag Date: Sat, 15 Sep 2018 15:55:01 +0000 (+0200) Subject: Make setting of traffic selectors in nitsi test easier X-Git-Tag: 010~108 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f620bf5c49e7a7f1c56c514a403e689d02f3d050;p=network.git 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 --- 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