Check quantum status dependent on the plugin

armando-migliaccio · armando-migliaccio · commit 7c025fedc32c · 2013-05-09T09:05:15.000-07:00
There are Quantum plugins that do not require the use of an agent.
This patch relaxes the constraint in quantum-adv-test.sh by adding
the ability to customize the logic that verifies whether the test
can run or not, depending on the Quantum plugin of your choice.

Fixes bug #1177904

Change-Id: I6e2c17f43d9e1475b2eb175cceb5107a83f9aa74
diff --git a/exercises/quantum-adv-test.sh b/exercises/quantum-adv-test.sh
@@ -43,13 +43,12 @@ source $TOP_DIR/functions
 # Import configuration
 source $TOP_DIR/openrc
 
-# If quantum is not enabled we exit with exitcode 55 which mean
-# exercise is skipped.
-is_service_enabled quantum && is_service_enabled q-agt && is_service_enabled q-dhcp || exit 55
-
-# Import quantum fucntions
+# Import quantum functions
 source $TOP_DIR/lib/quantum
 
+# If quantum is not enabled we exit with exitcode 55, which means exercise is skipped.
+quantum_plugin_check_adv_test_requirements || exit 55
+
 # Import exercise configuration
 source $TOP_DIR/exerciserc
 
diff --git a/lib/quantum_plugins/README.md b/lib/quantum_plugins/README.md
@@ -34,3 +34,5 @@ functions
 * ``quantum_plugin_setup_interface_driver``
 * ``has_quantum_plugin_security_group``:
   return 0 if the plugin support quantum security group otherwise return 1
+* ``quantum_plugin_check_adv_test_requirements``:
+  return 0 if requirements are satisfied otherwise return 1
diff --git a/lib/quantum_plugins/bigswitch_floodlight b/lib/quantum_plugins/bigswitch_floodlight
@@ -56,5 +56,9 @@ function has_quantum_plugin_security_group() {
     return 1
 }
 
+function quantum_plugin_check_adv_test_requirements() {
+    is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
+}
+
 # Restore xtrace
 $MY_XTRACE
diff --git a/lib/quantum_plugins/brocade b/lib/quantum_plugins/brocade
@@ -50,5 +50,9 @@ function has_quantum_plugin_security_group() {
     return 0
 }
 
+function quantum_plugin_check_adv_test_requirements() {
+    is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
+}
+
 # Restore xtrace
 $BRCD_XTRACE
diff --git a/lib/quantum_plugins/linuxbridge b/lib/quantum_plugins/linuxbridge
@@ -86,5 +86,9 @@ function has_quantum_plugin_security_group() {
     return 0
 }
 
+function quantum_plugin_check_adv_test_requirements() {
+    is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
+}
+
 # Restore xtrace
 $MY_XTRACE
diff --git a/lib/quantum_plugins/nec b/lib/quantum_plugins/nec
@@ -118,5 +118,9 @@ function has_quantum_plugin_security_group() {
     return 0
 }
 
+function quantum_plugin_check_adv_test_requirements() {
+    is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
+}
+
 # Restore xtrace
 $MY_XTRACE
diff --git a/lib/quantum_plugins/nicira b/lib/quantum_plugins/nicira
@@ -146,5 +146,9 @@ function has_quantum_plugin_security_group() {
     return 0
 }
 
+function quantum_plugin_check_adv_test_requirements() {
+    is_service_enabled q-dhcp && return 0
+}
+
 # Restore xtrace
 $MY_XTRACE
diff --git a/lib/quantum_plugins/openvswitch b/lib/quantum_plugins/openvswitch
@@ -144,5 +144,9 @@ function has_quantum_plugin_security_group() {
     return 0
 }
 
+function quantum_plugin_check_adv_test_requirements() {
+    is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
+}
+
 # Restore xtrace
 $MY_XTRACE
diff --git a/lib/quantum_plugins/plumgrid b/lib/quantum_plugins/plumgrid
@@ -35,5 +35,8 @@ function quantum_plugin_configure_debug_command() {
     :
 }
 
+function quantum_plugin_check_adv_test_requirements() {
+    is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
+}
 # Restore xtrace
 $MY_XTRACE
diff --git a/lib/quantum_plugins/ryu b/lib/quantum_plugins/ryu
@@ -71,5 +71,9 @@ function has_quantum_plugin_security_group() {
     return 0
 }
 
+function quantum_plugin_check_adv_test_requirements() {
+    is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
+}
+
 # Restore xtrace
 $MY_XTRACE

Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,9 @@ function has_quantum_plugin_security_group() {`
`56`	`56`	`return 1`
`57`	`57`	`}`
`58`	`58`
	`59`	`+function quantum_plugin_check_adv_test_requirements() {`
	`60`	`+ is_service_enabled q-agt && is_service_enabled q-dhcp && return 0`
	`61`	`+}`
	`62`	`+`
`59`	`63`	`# Restore xtrace`
`60`	`64`	`$MY_XTRACE`
Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,9 @@ function has_quantum_plugin_security_group() {`
`50`	`50`	`return 0`
`51`	`51`	`}`
`52`	`52`
	`53`	`+function quantum_plugin_check_adv_test_requirements() {`
	`54`	`+ is_service_enabled q-agt && is_service_enabled q-dhcp && return 0`
	`55`	`+}`
	`56`	`+`
`53`	`57`	`# Restore xtrace`
`54`	`58`	`$BRCD_XTRACE`
Original file line number	Diff line number	Diff line change
`@@ -86,5 +86,9 @@ function has_quantum_plugin_security_group() {`
`86`	`86`	`return 0`
`87`	`87`	`}`
`88`	`88`
	`89`	`+function quantum_plugin_check_adv_test_requirements() {`
	`90`	`+ is_service_enabled q-agt && is_service_enabled q-dhcp && return 0`
	`91`	`+}`
	`92`	`+`
`89`	`93`	`# Restore xtrace`
`90`	`94`	`$MY_XTRACE`
Original file line number	Diff line number	Diff line change
`@@ -118,5 +118,9 @@ function has_quantum_plugin_security_group() {`
`118`	`118`	`return 0`
`119`	`119`	`}`
`120`	`120`
	`121`	`+function quantum_plugin_check_adv_test_requirements() {`
	`122`	`+ is_service_enabled q-agt && is_service_enabled q-dhcp && return 0`
	`123`	`+}`
	`124`	`+`
`121`	`125`	`# Restore xtrace`
`122`	`126`	`$MY_XTRACE`
Original file line number	Diff line number	Diff line change
`@@ -146,5 +146,9 @@ function has_quantum_plugin_security_group() {`
`146`	`146`	`return 0`
`147`	`147`	`}`
`148`	`148`
	`149`	`+function quantum_plugin_check_adv_test_requirements() {`
	`150`	`+ is_service_enabled q-dhcp && return 0`
	`151`	`+}`
	`152`	`+`
`149`	`153`	`# Restore xtrace`
`150`	`154`	`$MY_XTRACE`
Original file line number	Diff line number	Diff line change
`@@ -144,5 +144,9 @@ function has_quantum_plugin_security_group() {`
`144`	`144`	`return 0`
`145`	`145`	`}`
`146`	`146`
	`147`	`+function quantum_plugin_check_adv_test_requirements() {`
	`148`	`+ is_service_enabled q-agt && is_service_enabled q-dhcp && return 0`
	`149`	`+}`
	`150`	`+`
`147`	`151`	`# Restore xtrace`
`148`	`152`	`$MY_XTRACE`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,8 @@ function quantum_plugin_configure_debug_command() {`
`35`	`35`	`:`
`36`	`36`	`}`
`37`	`37`
	`38`	`+function quantum_plugin_check_adv_test_requirements() {`
	`39`	`+ is_service_enabled q-agt && is_service_enabled q-dhcp && return 0`
	`40`	`+}`
`38`	`41`	`# Restore xtrace`
`39`	`42`	`$MY_XTRACE`
Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,9 @@ function has_quantum_plugin_security_group() {`
`71`	`71`	`return 0`
`72`	`72`	`}`
`73`	`73`
	`74`	`+function quantum_plugin_check_adv_test_requirements() {`
	`75`	`+ is_service_enabled q-agt && is_service_enabled q-dhcp && return 0`
	`76`	`+}`
	`77`	`+`
`74`	`78`	`# Restore xtrace`
`75`	`79`	`$MY_XTRACE`