From: Jonatan Schlag Date: Sun, 16 Sep 2018 11:13:43 +0000 (+0200) Subject: Use new phase1 and setup recipes in vpn tests X-Git-Url: http://git.ipfire.org/?p=people%2Fjschlag%2Fnetwork.git;a=commitdiff_plain;h=582bd8855152f5babdf7e26ccc6f32b366f1c3a4 Use new phase1 and setup recipes in vpn tests Signed-off-by: Jonatan Schlag --- diff --git a/test/nitsi/include/vpn-base b/test/nitsi/include/vpn-base deleted file mode 100644 index c04a9c9..0000000 --- a/test/nitsi/include/vpn-base +++ /dev/null @@ -1,35 +0,0 @@ -# This contains the basic network configuration for all vpn-tests -include: ../include/setup -include: ../include/alice-port-vars -include: ../include/bob-port-vars -all: network zone new upl0 bridge -all: network zone new upl1 bridge -all: network zone new net0 bridge -all: network zone new net1 bridge -all: network zone upl0 port attach ${p_net1} -all: network zone upl1 port attach ${p_net2} -# Attach dummy ports to all net* -all: network port new dummy -all: network port new dummy -all: network zone net0 port attach d0 -all: network zone net1 port attach d1 -# Bring everyting up -all: network zone upl0 up -all: network zone upl1 up -all: network zone net0 up -all: network zone net1 up -all: network status -# IP config -alice: network zone upl0 config new static 192.168.122.2/24 -alice: network zone upl1 config new static fdd1:9e02:338f::1:1/64 -alice: network zone net0 config new static 192.168.200.1/24 -alice: network zone net1 config new static fdd1:9e02:338f::2:1/64 -bob: network zone upl0 config new static 192.168.122.3/24 -bob: network zone upl1 config new static fdd1:9e02:338f::1:2/64 -bob: network zone net0 config new static 192.168.201.1/24 -bob: network zone net1 config new static fdd1:9e02:338f::3:1/64 -# Simple ping test -alice: ping -c 5 192.168.122.3 -alice: ping6 -c 5 2001:470:6ef3:1::1 -bob: ping -c 5 192.168.122.2 -bob: ping6 -c 5 2001:470:6ef3:1::2 diff --git a/test/nitsi/include/vpn-ipsec-basic-connection b/test/nitsi/include/vpn-ipsec-basic-connection index f5594fa..8f5ecdd 100644 --- a/test/nitsi/include/vpn-ipsec-basic-connection +++ b/test/nitsi/include/vpn-ipsec-basic-connection @@ -1,4 +1,6 @@ # A basic vpn connection with some common config values set +include: ./setup +include: ./phase1 all: network vpn ipsec connection new basic all: network vpn ipsec connection basic authentication mode PSK all: network vpn ipsec connection basic authentication pre-shared-key "12345678" diff --git a/test/nitsi/include/vpn-ipsec-basic-peer-ipv4 b/test/nitsi/include/vpn-ipsec-basic-peer-ipv4 index 52c6d3f..25cc9a8 100644 --- a/test/nitsi/include/vpn-ipsec-basic-peer-ipv4 +++ b/test/nitsi/include/vpn-ipsec-basic-peer-ipv4 @@ -1,2 +1,2 @@ -alice: network vpn ipsec connection basic peer 192.168.122.3 -bob: network vpn ipsec connection basic peer 192.168.122.2 \ No newline at end of file +alice: network vpn ipsec connection basic peer 192.168.100.102 +bob: network vpn ipsec connection basic peer 192.168.100.101 diff --git a/test/nitsi/include/vpn-ipsec-basic-peer-ipv6 b/test/nitsi/include/vpn-ipsec-basic-peer-ipv6 index 9715e08..412b6c5 100644 --- a/test/nitsi/include/vpn-ipsec-basic-peer-ipv6 +++ b/test/nitsi/include/vpn-ipsec-basic-peer-ipv6 @@ -1,2 +1,2 @@ -alice: network vpn ipsec connection basic peer 2001:470:6ef3:1::2 -bob: network vpn ipsec connection basic peer 2001:470:6ef3:1::1 \ No newline at end of file +alice: network vpn ipsec connection basic peer 2001:db8:100::102 +bob: network vpn ipsec connection basic peer 2001:db8:100::101 diff --git a/test/nitsi/include/vpn-ipsec-basic-ping-test-ipv6 b/test/nitsi/include/vpn-ipsec-basic-ping-test-ipv6 index f785903..c4919f8 100644 --- a/test/nitsi/include/vpn-ipsec-basic-ping-test-ipv6 +++ b/test/nitsi/include/vpn-ipsec-basic-ping-test-ipv6 @@ -1,3 +1,3 @@ # This recipe tests if the vpn connection is working by pinging the remote subnet -alice: ping6 -c 5 fdd1:9e02:338f::3:1 -bob: ping6 -c 5 fdd1:9e02:338f::2:1 \ No newline at end of file +alice: ping6 -c 5 2001:db8:201::1 +bob: ping6 -c 5 2001:db8:200::1 diff --git a/test/nitsi/include/vpn-ipsec-basic-ts-ipv6 b/test/nitsi/include/vpn-ipsec-basic-ts-ipv6 index 11eacee..fbb1a7d 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 +fdd1:9e02:338f::2:1/64 -alice: network vpn ipsec connection basic remote prefix +fdd1:9e02:338f::3:1/64 -bob: network vpn ipsec connection basic local prefix +fdd1:9e02:338f::3:1/64 -bob: network vpn ipsec connection basic remote prefix +fdd1:9e02:338f::2:1/64 \ No newline at end of file +alice: network vpn ipsec connection basic local prefix +2001:db8:200::/64 +alice: network vpn ipsec connection basic remote prefix +2001:db8:201::/64 +bob: network vpn ipsec connection basic local prefix +2001:db8:201::/64 +bob: network vpn ipsec connection basic remote prefix +2001:db8:200::/64