nitsi: Include some inital commands in make-install template

This allows us to have a couple fewer includes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 54460535f1c4ce4bb2e87ecbd330b77af3daac72..2e073b661eba061f56b0da51440ca4de95c115c7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -586,14 +586,10 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \
        https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/
 
 NITSI_INCLUDE_RECIPES = \
-       test/nitsi/include/make-install \
-       test/nitsi/include/network-reset \
-       test/nitsi/include/network-settings
+       test/nitsi/include/make-install
 
 EXTRA_DIST += \
        test/nitsi/include/make-install.in
-       test/nitsi/include/network-reset \
-       test/nitsi/include/network-settings
 
 CLEANFILES += \
        test/nitsi/include/make-install

diff --git a/test/nitsi/include/make-install.in b/test/nitsi/include/make-install.in
index 8b485d30b7fdebf0f0c7beb9ab7ff41bbf5aa33a..a2914948d2fd4adf3b2762a4b80909f50c9fcab1 100644 (file)
--- a/test/nitsi/include/make-install.in
+++ b/test/nitsi/include/make-install.in
@@ -2,3 +2,9 @@ all: tar xvfa @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz && cd @PACKAGE_NAME@-@PACK
 all: ./configure --prefix=/usr --sysconfdir=/etc && make -j2
 all: make
 all: make install
+
+# Drop all previous settings
+all: network reset --force
+
+# Enable debug mode
+all: network settings DEBUG=1

diff --git a/test/nitsi/include/network-reset b/test/nitsi/include/network-reset
deleted file mode 100644 (file)
index d82e2b1..0000000
--- a/test/nitsi/include/network-reset
+++ /dev/null
@@ -1 +0,0 @@
-all: network reset --force

diff --git a/test/nitsi/include/network-settings b/test/nitsi/include/network-settings
deleted file mode 100644 (file)
index 535fe4c..0000000
--- a/test/nitsi/include/network-settings
+++ /dev/null
@@ -1 +0,0 @@
-all: network settings DEBUG=1

diff --git a/test/nitsi/include/vpn-base b/test/nitsi/include/vpn-base
index a79bec47718063ac0fe82290cfc70564ef7d7465..4e62763d84ea232908f80e5780dc4be7c00b69d1 100644 (file)
--- a/test/nitsi/include/vpn-base
+++ b/test/nitsi/include/vpn-base
@@ -1,7 +1,5 @@
 # This contains the basic network configuration for all vpn-tests
 include: ../include/make-install
-include: ../include/network-settings
-include: ../include/network-reset
 include: ../include/alice-port-vars
 include: ../include/bob-port-vars
 all: network zone new upl0 bridge
@@ -34,4 +32,4 @@ bob: network zone net1 config new static 2001:470:6ef3:2::1/64
 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
\ No newline at end of file
+bob: ping6 -c 5 2001:470:6ef3:1::2

diff --git a/test/nitsi/test/zone-new-bridge/recipe b/test/nitsi/test/zone-new-bridge/recipe
index d6dcfb761f30a0a379c29ecff5d75bcef3be5499..01faf6cd2396d1afb06dccfe5660bddaf7e5a597 100644 (file)
--- a/test/nitsi/test/zone-new-bridge/recipe
+++ b/test/nitsi/test/zone-new-bridge/recipe
@@ -1,6 +1,5 @@
 include: ../../include/make-install
-include: ../../include/network-settings
-include: ../../include/network-reset
+
 alice: network zone new upl0 bridge
 # this returns zero if the device exists
 alice: ip link show upl0

diff --git a/test/nitsi/test/zone-port-attach-bridge/recipe b/test/nitsi/test/zone-port-attach-bridge/recipe
index 92dd262b4818e10f813a42a52b99fd2ab341875a..2edba5d95f988e35cbeba05a20ca7b160c4f11b8 100644 (file)
--- a/test/nitsi/test/zone-port-attach-bridge/recipe
+++ b/test/nitsi/test/zone-port-attach-bridge/recipe
@@ -1,9 +1,8 @@
 include: ../../include/make-install
-include: ../../include/network-settings
-include: ../../include/network-reset
+
 alice: network zone new upl0 bridge
 # Create a dummy port we can attach to upl0
 alice: network port new dummy
 alice: network zone upl0 port attach d0
 # Check if the port is really attached
-alice: ls /sys/class/net/upl0/brif/d0
\ No newline at end of file
+alice: ls /sys/class/net/upl0/brif/d0