diff --git a/exercises/quantum-adv-test.sh b/exercises/quantum-adv-test.sh index fbb1b779f2..34f4f62312 100755 --- 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 index 05bfb85125..e8299409cb 100644 --- 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 index 4857f49569..edee0eb748 100644 --- 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 index 6e26ad7842..fc86debb90 100644 --- 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 index 324e255231..b4b52e9c57 100644 --- 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 index f61f50bba5..4a2a49767a 100644 --- 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 index 6eefb022ec..305c3bfa7d 100644 --- 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 index ab16483452..6293257c96 100644 --- 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 index 912aa7ed80..14567104ed 100644 --- 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 index 113923235c..1b039dc950 100644 --- 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