Merge "Check quantum status dependent on the plugin"

This commit is contained in:
Jenkins 2013-05-14 15:04:34 +00:00 committed by Gerrit Code Review
commit 07a8a5eb02
10 changed files with 37 additions and 5 deletions

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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