From cde9426dc760c43f6e616b5b0b51a01753673e78 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sun, 16 Sep 2018 16:00:00 +0200 Subject: [PATCH] Adjust include paths because of the new include path feature Signed-off-by: Jonatan Schlag --- test/nitsi/test/phase1/recipe | 4 ++-- test/nitsi/test/port-vlan/recipe | 6 +++--- test/nitsi/test/pppoe/recipe | 6 +++--- test/nitsi/test/raw-device-get-by-mac/recipe | 2 +- test/nitsi/test/zone-new-bridge/recipe | 2 +- test/nitsi/test/zone-port-attach-bridge/recipe | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/nitsi/test/phase1/recipe b/test/nitsi/test/phase1/recipe index 61e27f3c..38234a06 100644 --- a/test/nitsi/test/phase1/recipe +++ b/test/nitsi/test/phase1/recipe @@ -1,5 +1,5 @@ -include: ../../include/setup -include: ../../include/phase1 +include: setup +include: phase1 # Let Alice ping Bob alice: ping -c 5 192.168.100.102 diff --git a/test/nitsi/test/port-vlan/recipe b/test/nitsi/test/port-vlan/recipe index aad19fd2..d41377b4 100644 --- a/test/nitsi/test/port-vlan/recipe +++ b/test/nitsi/test/port-vlan/recipe @@ -1,8 +1,8 @@ -include: ../../include/setup +include: setup # This contains the basic network configuration for all vpn-tests -include: ../../include/alice-port-vars -include: ../../include/bob-port-vars +include: alice-port-vars +include: bob-port-vars # Create an uplink zone all: network zone new upl0 bridge --stp=off diff --git a/test/nitsi/test/pppoe/recipe b/test/nitsi/test/pppoe/recipe index a164a838..f639b449 100644 --- a/test/nitsi/test/pppoe/recipe +++ b/test/nitsi/test/pppoe/recipe @@ -1,8 +1,8 @@ -include: ../../include/setup +include: setup # Get port names for Alice and Bob -include: ../../include/alice-port-vars -include: ../../include/bob-port-vars +include: alice-port-vars +include: bob-port-vars # Start a PPPoE server on Alice alice: network zone new upl0 bridge diff --git a/test/nitsi/test/raw-device-get-by-mac/recipe b/test/nitsi/test/raw-device-get-by-mac/recipe index 61ea1fbd..ccdcdfa7 100644 --- a/test/nitsi/test/raw-device-get-by-mac/recipe +++ b/test/nitsi/test/raw-device-get-by-mac/recipe @@ -1,4 +1,4 @@ -include: ../../include/setup +include: setup alice: port="$(network raw device-get-by-mac-address "52:54:00:8a:b8:b5")" alice: echo $port alice: [ "52:54:00:8a:b8:b5" = "$(cat /sys/class/net/${port}/address)" ] diff --git a/test/nitsi/test/zone-new-bridge/recipe b/test/nitsi/test/zone-new-bridge/recipe index a1ae1807..693dc024 100644 --- a/test/nitsi/test/zone-new-bridge/recipe +++ b/test/nitsi/test/zone-new-bridge/recipe @@ -1,4 +1,4 @@ -include: ../../include/setup +include: setup alice: network zone new upl0 bridge # this returns zero if the device exists diff --git a/test/nitsi/test/zone-port-attach-bridge/recipe b/test/nitsi/test/zone-port-attach-bridge/recipe index 3abf294d..4efbd184 100644 --- a/test/nitsi/test/zone-port-attach-bridge/recipe +++ b/test/nitsi/test/zone-port-attach-bridge/recipe @@ -1,4 +1,4 @@ -include: ../../include/setup +include: setup alice: network zone new upl0 bridge # Create a dummy port we can attach to upl0 -- 2.47.2