From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 15 Sep 2018 14:53:25 +0000 (+0100)
Subject: nitsi: Include some inital commands in make-install template
X-Git-Tag: 010~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=870cf8cf7982d8df82c907635e4d35497ae87e71;p=network.git

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 54460535..2e073b66 100644
--- 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 8b485d30..a2914948 100644
--- 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
index d82e2b14..00000000
--- 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
index 535fe4c8..00000000
--- 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 a79bec47..4e62763d 100644
--- 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 d6dcfb76..01faf6cd 100644
--- 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 92dd262b..2edba5d9 100644
--- 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