[2/2] Add a test to check that we can attach ports to a zone of type bridge

Message ID 20180811130323.19669-2-jonatan.schlag@ipfire.org
State Accepted
Commit 9c8ff8de089ed8f6f24b9c12ad7bc8abd310134b
Headers
Series [1/2] Add new test zone-new-bridge |

Commit Message

Jonatan Schlag Aug. 11, 2018, 11:03 p.m. UTC
  Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 Makefile.am                                         | 10 +++++++---
 test/nitsi/test/zone-port-attach-bridge/.gitignore  |  3 +++
 test/nitsi/test/zone-port-attach-bridge/recipe      |  9 +++++++++
 test/nitsi/test/zone-port-attach-bridge/settings.in |  9 +++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 test/nitsi/test/zone-port-attach-bridge/.gitignore
 create mode 100644 test/nitsi/test/zone-port-attach-bridge/recipe
 create mode 100644 test/nitsi/test/zone-port-attach-bridge/settings.in
  

Patch

diff --git a/Makefile.am b/Makefile.am
index 1ea715e..fa12f4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -602,7 +602,8 @@  NITSI_TESTS = \
 	test/nitsi/test/hello-world \
 	test/nitsi/test/make-check \
 	test/nitsi/test/raw-device-get-by-mac \
-	test/nitsi/test/zone-new-bridge
+	test/nitsi/test/zone-new-bridge \
+	test/nitsi/test/zone-port-attach-bridge
 
 EXTRA_DIST += \
 	test/nitsi/test/hello-world/recipe \
@@ -612,13 +613,16 @@  EXTRA_DIST += \
 	test/nitsi/test/raw-device-get-by-mac/recipe \
 	test/nitsi/test/raw-device-get-by-mac/settings.in \
 	test/nitsi/test/zone-new-bridge/recipe \
-	test/nitsi/test/zone-new-bridge/settings.in
+	test/nitsi/test/zone-new-bridge/settings.in \
+	test/nitsi/test/zone-port-attach-bridge/recipe \
+	test/nitsi/test/zone-port-attach-bridge/settings.in
 
 CLEANFILES += \
 	test/nitsi/test/make-check/recipe \
 	test/nitsi/test/make-check/settings \
 	test/nitsi/test/raw-device-get-by-mac/settings \
-	test/nitsi/test/zone-new-bridge/settings
+	test/nitsi/test/zone-new-bridge/settings \
+	test/nitsi/test/zone-port-attach-bridge/settings
 
 NITSI_ENVIRONMENT =
 
diff --git a/test/nitsi/test/zone-port-attach-bridge/.gitignore b/test/nitsi/test/zone-port-attach-bridge/.gitignore
new file mode 100644
index 0000000..8a9bd77
--- /dev/null
+++ b/test/nitsi/test/zone-port-attach-bridge/.gitignore
@@ -0,0 +1,3 @@ 
+/log
+/recipe.log
+/settings
diff --git a/test/nitsi/test/zone-port-attach-bridge/recipe b/test/nitsi/test/zone-port-attach-bridge/recipe
new file mode 100644
index 0000000..92dd262
--- /dev/null
+++ b/test/nitsi/test/zone-port-attach-bridge/recipe
@@ -0,0 +1,9 @@ 
+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
diff --git a/test/nitsi/test/zone-port-attach-bridge/settings.in b/test/nitsi/test/zone-port-attach-bridge/settings.in
new file mode 100644
index 0000000..c52be6d
--- /dev/null
+++ b/test/nitsi/test/zone-port-attach-bridge/settings.in
@@ -0,0 +1,9 @@ 
+[GENERAL]
+name = zone-port-attach-bridge
+description = This test checks if we cann attach a dummy port to a zone
+
+copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
+copy_to = /root/
+
+[VIRTUAL_ENVIRONMENT]
+path = ../../virtual-environment/basic