From: Sam Hague Date: Mon, 19 Feb 2018 17:02:41 +0000 (-0500) Subject: Cleanup DevstackUtils.robot X-Git-Tag: pre-potassium~924 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=752e7a51f2fa0e0ef30ee4c0d2cdd86a9bd5325e Cleanup DevstackUtils.robot Change-Id: I1760a5c199e171df7fe2dd8e3c423c426b58ee11 Signed-off-by: Sam Hague --- diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot index 06de53b9d4..6af68b7a4f 100644 --- a/csit/libraries/DevstackUtils.robot +++ b/csit/libraries/DevstackUtils.robot @@ -1,30 +1,13 @@ *** Settings *** Documentation General Utils library. This library has broad scope, it can be used by any robot system tests. -Library SSHLibrary -Library String -Library DateTime -Library Process -Library Collections Library RequestsLibrary -Library ./UtilLibrary.py -Resource KarafKeywords.robot +Library SSHLibrary Resource OpenStackOperations.robot -Resource SSHKeywords.robot Resource ../variables/Variables.robot *** Variables *** -${default_devstack_prompt_timeout} 10s +${DEFAULT_DEVSTACK_PROMPT_TIMEOUT} 10s ${DEVSTACK_SYSTEM_PASSWORD} \ # set to empty, but provide for others to override if desired -${blacklist_file} /tmp/blacklist.txt -@{stable/newton_exclusion_regexes} ${EMPTY} -@{stable/ocata_exclusion_regexes} ${EMPTY} -@{stable/pike_exclusion_regexes} ${EMPTY} -@{master_exclusion_regexes} ${EMPTY} -${tempest_dir} /opt/stack/tempest -${tempest_config_file} ${tempest_dir}/etc/tempest.conf -${external_physical_network} physnet1 -# Parameter values below are based on releng/builder - changing them requires updates in releng/builder as well -${TEMPEST_TIMEOUT} 420s ${OS_CNTL_CONN_ID} None ${OS_CMP1_CONN_ID} None ${OS_CMP2_CONN_ID} None @@ -35,119 +18,6 @@ ${OS_CMP2_IP} ${EMPTY} @{OS_CMP_IPS} @{EMPTY} *** Keywords *** -Run Tempest Tests - [Arguments] ${tempest_regex} ${timeout}=${TEMPEST_TIMEOUT} ${debug}=False - Run Keyword If "${debug}"=="False" Run Tempest Tests Without Debug ${tempest_regex} timeout=${timeout} - Run Keyword If "${debug}"=="True" Run Tempest Tests With Debug ${tempest_regex} timeout=${timeout} - Run Keyword If "${debug}"!="True" and "${debug}"!="False" Fail debug argument must be True or False - -Run Tempest Tests Without Debug - [Arguments] ${tempest_regex} ${tempest_directory}=${tempest_dir} ${timeout}=${TEMPEST_TIMEOUT} - [Documentation] Using ostestr will allow us to (by default) run tests in paralllel. - ... Because of the parallel fashion, we must ensure there is no pause on teardown so that flag in tempest.conf is - ... explicitly set to False. - Return From Keyword If "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS} - Return From Keyword If "skip_if_${SECURITY_GROUP_MODE}" in @{TEST_TAGS} - ${tempest_conn_id}= SSHLibrary.Open Connection ${OS_CONTROL_NODE_IP} prompt=${DEFAULT_LINUX_PROMPT_STRICT} - SSHKeywords.Flexible SSH Login ${OS_USER} ${DEVSTACK_SYSTEM_PASSWORD} - Write Commands Until Prompt source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin - Write Commands Until Prompt cd ${tempest_directory} - SSHLibrary.Read - Tempest Conf Modify Pause On Test Teardown False - SSHLibrary.Set Client Configuration timeout=${timeout} - # There are tons of deprecation error messages when we use ostestr in our CSIT environment (openstack via devstack) - # The robot log files are very large and one culprit is all these deprecation warnings. If we redirect stderr to - # /dev/null we should be able to ignore them. We will miss any other errors, however. - ${output}= Write Commands Until Prompt ostestr --regex ${tempest_regex} 2>/dev/null timeout=${timeout} - Log ${output} - SSHLibrary.Close Connection - Should Contain ${output} Failed: 0 - -Run Tempest Tests With Debug - [Arguments] ${tempest_regex} ${tempest_directory}=${tempest_dir} ${timeout}=${TEMPEST_TIMEOUT} - [Documentation] After setting pause_teardown=True in tempest.conf, use the python -m testtools.run module to execute - ... a single tempest test case. We need to run only one tempest test case at a time as there will - ... be potentional for an unkown number of debug pdb() prompts to catch and continue if we are running multiple - ... test cases with a single command. Essentially, this keyword only handles one breakpoint at a single teardown. - Return From Keyword If "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS} - Return From Keyword If "skip_if_${SECURITY_GROUP_MODE}" in @{TEST_TAGS} - ${tempest_conn_id}= SSHLibrary.Open Connection ${OS_CONTROL_NODE_IP} prompt=${DEFAULT_LINUX_PROMPT_STRICT} - SSHKeywords.Flexible SSH Login ${OS_USER} ${DEVSTACK_SYSTEM_PASSWORD} - Write Commands Until Prompt source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin - Write Commands Until Prompt cd ${tempest_directory} - SSHLibrary.Read - Tempest Conf Modify Pause On Test Teardown True - SSHLibrary.Set Client Configuration timeout=${timeout} - SSHLibrary.Write python -m testtools.run ${tempest_regex} - ${output}= SSHLibrary.Read Until Regexp ${DEFAULT_LINUX_PROMPT_STRICT}|pdb.set_trace() - Log ${output} - Show Debugs - Get Test Teardown Debugs - SSHLibrary.Switch Connection ${tempest_conn_id} - SSHLibrary.Write continue - ${output}= SSHLibrary.Read Until Regexp ${DEFAULT_LINUX_PROMPT_STRICT}|pdb.set_trace() - Log ${output} - SSHLibrary.Write continue - ${output}= SSHLibrary.Read Until Prompt - Log ${output} - SSHLibrary.Close Connection - Should Contain ${output} OK - Should Not Contain ${output} FAILED - -Suite Setup - OpenStackOperations.OpenStack Suite Setup - Log In To Tempest Executor And Setup Test Environment - -Log In To Tempest Executor And Setup Test Environment - [Documentation] Initialize SetupUtils, open SSH connection to a devstack system and source the openstack - ... credentials needed to run the tempest tests. The (sometimes empty) tempest blacklist file will be created - ... and pushed to the tempest executor. - Create Blacklist File - # Tempest tests need an existing external network in order to create routers. - Create Network ${EXTERNAL_NET_NAME} --external --default --provider-network-type flat --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK} - Create Subnet ${EXTERNAL_NET_NAME} ${EXTERNAL_SUBNET_NAME} ${EXTERNAL_SUBNET} --gateway ${EXTERNAL_GATEWAY} --allocation-pool ${EXTERNAL_SUBNET_ALLOCATION_POOL} - List Networks - ${control_node_conn_id}= SSHLibrary.Open Connection ${OS_CONTROL_NODE_IP} prompt=${DEFAULT_LINUX_PROMPT_STRICT} - SSHKeywords.Flexible SSH Login ${OS_USER} - Write Commands Until Prompt source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin - Write Commands Until Prompt sudo rm -rf /opt/stack/tempest/.testrepository - ${net_id}= Get Net Id ${EXTERNAL_NET_NAME} - Tempest Conf Add External Network And Floating Network Name ${net_id} - -Tempest Conf Add External Network And Floating Network Name - [Arguments] ${external_network_id} - [Documentation] Tempest will be run with a config file - this function will add the - ... given external network ID to the configuration file. - Modify Config In File On Existing SSH Connection ${tempest_config_file} set network public_network_id ${external_network_id} - Modify Config In File On Existing SSH Connection ${tempest_config_file} set DEFAULT debug False - Modify Config In File On Existing SSH Connection ${tempest_config_file} set DEFAULT log_level INFO - Modify Config In File On Existing SSH Connection ${tempest_config_file} set network floating_network_name ${EXTERNAL_NET_NAME} - Write Commands Until Prompt sudo cat ${tempest_config_file} - Write Commands Until Prompt sudo chmod 777 ${tempest_config_file} - -Tempest Conf Modify Pause On Test Teardown - [Arguments] ${pause_flag} - [Documentation] Sets the DEFAULT section flag for pausing the test teardown. If True the tempest test case - ... being executed will break to a pdb() debug shell when it hits it's teardown() function. - Modify Config In File On Existing SSH Connection ${tempest_config_file} set DEFAULT pause_teardown ${pause_flag} - -Modify Config In File On Existing SSH Connection - [Arguments] ${config_file} ${modifier} ${config_section} ${config_key} ${config_value}=${EMPTY} - [Documentation] uses crudini to populate oslo cofg file. - # this keyword is only one line so seems like extra overhead, but this may be a good candidate to move - # to a library at some point, when/if other suites need to use it, so wanted to make it generic. - Write Commands Until Prompt sudo -E crudini --${modifier} ${config_file} ${config_section} ${config_key} ${config_value} - -Create Blacklist File - [Documentation] For each exclusion regex in the required @{${OPENSTACK_BRANCH}_exclusion_regexes} list a new - ... line will be created in the required ${blacklist_file} location. This file is pushed to the OS_CONTROL_NODE - ... which is assumed to be the tempest executor. - OperatingSystem.Create File ${blacklist_file} - : FOR ${exclusion} IN @{${OPENSTACK_BRANCH}_exclusion_regexes} - \ OperatingSystem.Append To File ${blacklist_file} ${exclusion}\n - Log File ${blacklist_file} - SSHKeywords.Copy File To Remote System ${OS_CONTROL_NODE_IP} ${blacklist_file} ${blacklist_file} - Open Connection [Arguments] ${name} ${ip} ${conn_id} = SSHLibrary.Open Connection ${ip} prompt=${DEFAULT_LINUX_PROMPT} @@ -158,27 +28,27 @@ Open Connection Devstack Suite Setup [Arguments] ${odl_ip}=${ODL_SYSTEM_IP} [Documentation] Open connections to the nodes - Get DevStack Nodes Data - Create Session session http://${odl_ip}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} - SSHLibrary.Set Default Configuration timeout=${default_devstack_prompt_timeout} - Run Keyword If 0 < ${NUM_OS_SYSTEM} Open Connection OS_CNTL_CONN_ID ${OS_CONTROL_NODE_IP} - Run Keyword If 1 < ${NUM_OS_SYSTEM} Open Connection OS_CMP1_CONN_ID ${OS_COMPUTE_1_IP} - Run Keyword If 2 < ${NUM_OS_SYSTEM} Open Connection OS_CMP2_CONN_ID ${OS_COMPUTE_2_IP} + DevstackUtils.Get DevStack Nodes Data + RequestsLibrary.Create Session session http://${odl_ip}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} + SSHLibrary.Set Default Configuration timeout=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT} + BuiltIn.Run Keyword If 0 < ${NUM_OS_SYSTEM} DevstackUtils.Open Connection OS_CNTL_CONN_ID ${OS_CONTROL_NODE_IP} + BuiltIn.Run Keyword If 1 < ${NUM_OS_SYSTEM} DevstackUtils.Open Connection OS_CMP1_CONN_ID ${OS_COMPUTE_1_IP} + BuiltIn.Run Keyword If 2 < ${NUM_OS_SYSTEM} DevstackUtils.Open Connection OS_CMP2_CONN_ID ${OS_COMPUTE_2_IP} Write Commands Until Prompt - [Arguments] ${cmd} ${timeout}=${default_devstack_prompt_timeout} + [Arguments] ${cmd} ${timeout}=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT} [Documentation] quick wrapper for Write and Read Until Prompt Keywords to make test cases more readable SSHLibrary.Set Client Configuration timeout=${timeout} SSHLibrary.Read SSHLibrary.Write ${cmd};echo Command Returns $? - ${output}= SSHLibrary.Read Until Prompt + ${output} = SSHLibrary.Read Until Prompt [Return] ${output} Write Commands Until Prompt And Log - [Arguments] ${cmd} ${timeout}=${default_devstack_prompt_timeout} + [Arguments] ${cmd} ${timeout}=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT} [Documentation] quick wrapper for Write and Read Until Prompt Keywords to make test cases more readable - ${output} = Write Commands Until Prompt ${cmd} ${timeout} - Log ${output} + ${output} = DevstackUtils.Write Commands Until Prompt ${cmd} ${timeout} + BuiltIn.Log ${output} [Return] ${output} Log Devstack Nodes Data @@ -216,8 +86,8 @@ Set Node Data For Control Only Node Setup Get DevStack Nodes Data [Documentation] Assign global variables for DevStack nodes BuiltIn.Set Suite Variable ${OS_CNTL_IP} ${OS_CONTROL_NODE_IP} - Run Keyword If ${NUM_OS_SYSTEM} == 1 Set Node Data For AllinOne Setup - ... ELSE IF ${NUM_OS_SYSTEM} == 2 Set Node Data For Control And Compute Node Setup - ... ELSE IF ${NUM_OS_SYSTEM} == 3 Set Node Data For Control Only Node Setup - Get DevStack Hostnames - Log Devstack Nodes Data + BuiltIn.Run Keyword If ${NUM_OS_SYSTEM} == 1 DevstackUtils.Set Node Data For AllinOne Setup + ... ELSE IF ${NUM_OS_SYSTEM} == 2 DevstackUtils.Set Node Data For Control And Compute Node Setup + ... ELSE IF ${NUM_OS_SYSTEM} == 3 DevstackUtils.Set Node Data For Control Only Node Setup + DevstackUtils.Get DevStack Hostnames + DevstackUtils.Log Devstack Nodes Data diff --git a/csit/libraries/Tempest.robot b/csit/libraries/Tempest.robot new file mode 100644 index 0000000000..cf51ff0dbb --- /dev/null +++ b/csit/libraries/Tempest.robot @@ -0,0 +1,131 @@ +*** Settings *** +Documentation General Utils library. This library has broad scope, it can be used by any robot system tests. +Library SSHLibrary +Resource DevstackUtils.robot +Resource OpenStackOperations.robot +Resource SSHKeywords.robot +Resource ../variables/Variables.robot + +*** Variables *** +@{stable/newton_EXCLUSION_REGEXES} ${EMPTY} +@{stable/ocata_EXCLUSION_REGEXES} ${EMPTY} +@{stable/pike_EXCLUSION_REGEXES} ${EMPTY} +@{master_EXCLUSION_REGEXES} ${EMPTY} +${BLACKLIST_FILE} /tmp/blacklist.txt +${TEMPEST_DIR} /opt/stack/tempest +${TEMPEST_CONFIG_FILE} ${TEMPEST_DIR}/etc/tempest.conf +# Parameter values below are based on releng/builder - changing them requires updates in releng/builder as well +${TEMPEST_TIMEOUT} 420s + +*** Keywords *** +Suite Setup + OpenStackOperations.OpenStack Suite Setup + Tempest.Log In To Tempest Executor And Setup Test Environment + +Run Tempest Tests + [Arguments] ${tempest_regex} ${timeout}=${TEMPEST_TIMEOUT} ${debug}=False + BuiltIn.Run Keyword If "${debug}" == "False" Tempest.Run Tempest Tests Without Debug ${tempest_regex} timeout=${timeout} + BuiltIn.Run Keyword If "${debug}" == "True" Tempest.Run Tempest Tests With Debug ${tempest_regex} timeout=${timeout} + BuiltIn.Run Keyword If "${debug}" != "True" and "${debug}" != "False" Fail debug argument must be True or False + +Run Tempest Tests Without Debug + [Arguments] ${tempest_regex} ${TEMPEST_DIRectory}=${TEMPEST_DIR} ${timeout}=${TEMPEST_TIMEOUT} + [Documentation] Using ostestr will allow us to (by default) run tests in paralllel. + ... Because of the parallel fashion, we must ensure there is no pause on teardown so that flag in tempest.conf is + ... explicitly set to False. + BuiltIn.Return From Keyword If "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS} + BuiltIn.Return From Keyword If "skip_if_${SECURITY_GROUP_MODE}" in @{TEST_TAGS} + ${tempest_conn_id} = SSHLibrary.Open Connection ${OS_CONTROL_NODE_IP} prompt=${DEFAULT_LINUX_PROMPT_STRICT} + SSHKeywords.Flexible SSH Login ${OS_USER} ${DEVSTACK_SYSTEM_PASSWORD} + DevstackUtils.Write Commands Until Prompt source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin + DevstackUtils.Write Commands Until Prompt cd ${TEMPEST_DIRectory} + SSHLibrary.Read + Tempest.Tempest Conf Modify Pause On Test Teardown False + SSHLibrary.Set Client Configuration timeout=${timeout} + # There are tons of deprecation error messages when we use ostestr in our CSIT environment (openstack via devstack) + # The robot log files are very large and one culprit is all these deprecation warnings. If we redirect stderr to + # /dev/null we should be able to ignore them. We will miss any other errors, however. + ${output} = DevstackUtils.Write Commands Until Prompt And Log ostestr --regex ${tempest_regex} 2>/dev/null timeout=${timeout} + SSHLibrary.Close Connection + BuiltIn.Should Contain ${output} Failed: 0 + +Run Tempest Tests With Debug + [Arguments] ${tempest_regex} ${TEMPEST_DIRectory}=${TEMPEST_DIR} ${timeout}=${TEMPEST_TIMEOUT} + [Documentation] After setting pause_teardown=True in tempest.conf, use the python -m testtools.run module to execute + ... a single tempest test case. We need to run only one tempest test case at a time as there will + ... be potentional for an unkown number of debug pdb() prompts to catch and continue if we are running multiple + ... test cases with a single command. Essentially, this keyword only handles one breakpoint at a single teardown. + BuiltIn.Return From Keyword If "skip_if_${OPENSTACK_BRANCH}" in @{TEST_TAGS} + BuiltIn.Return From Keyword If "skip_if_${SECURITY_GROUP_MODE}" in @{TEST_TAGS} + ${tempest_conn_id} = SSHLibrary.Open Connection ${OS_CONTROL_NODE_IP} prompt=${DEFAULT_LINUX_PROMPT_STRICT} + SSHKeywords.Flexible SSH Login ${OS_USER} ${DEVSTACK_SYSTEM_PASSWORD} + DevstackUtils.Write Commands Until Prompt source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin + DevstackUtils.Write Commands Until Prompt cd ${TEMPEST_DIRectory} + SSHLibrary.Read + Tempest Conf Modify Pause On Test Teardown True + SSHLibrary.Set Client Configuration timeout=${timeout} + SSHLibrary.Write python -m testtools.run ${tempest_regex} + ${output} = SSHLibrary.Read Until Regexp ${DEFAULT_LINUX_PROMPT_STRICT}|pdb.set_trace() + BuiltIn.Log ${output} + OpenStackOperations.Show Debugs + OpenStackOperations.Get Test Teardown Debugs + SSHLibrary.Switch Connection ${tempest_conn_id} + SSHLibrary.Write continue + ${output} = SSHLibrary.Read Until Regexp ${DEFAULT_LINUX_PROMPT_STRICT}|pdb.set_trace() + BuiltIn.Log ${output} + SSHLibrary.Write continue + ${output} = SSHLibrary.Read Until Prompt + BuiltIn.Log ${output} + SSHLibrary.Close Connection + BuiltIn.Should Contain ${output} OK + BuiltIn.Should Not Contain ${output} FAILED + +Log In To Tempest Executor And Setup Test Environment + [Documentation] Initialize SetupUtils, open SSH connection to a devstack system and source the openstack + ... credentials needed to run the tempest tests. The (sometimes empty) tempest blacklist file will be created + ... and pushed to the tempest executor. + Tempest.Create Blacklist File + # Tempest tests need an existing external network in order to create routers. + OpenStackOperations.Create Network ${EXTERNAL_NET_NAME} --external --default --provider-network-type flat --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK} + OpenStackOperations.Create Subnet ${EXTERNAL_NET_NAME} ${EXTERNAL_SUBNET_NAME} ${EXTERNAL_SUBNET} --gateway ${EXTERNAL_GATEWAY} --allocation-pool ${EXTERNAL_SUBNET_ALLOCATION_POOL} + OpenStackOperations.List Networks + ${control_node_conn_id} = SSHLibrary.Open Connection ${OS_CONTROL_NODE_IP} prompt=${DEFAULT_LINUX_PROMPT_STRICT} + SSHKeywords.Flexible SSH Login ${OS_USER} + DevstackUtils.Write Commands Until Prompt source ${DEVSTACK_DEPLOY_PATH}/openrc admin admin + DevstackUtils.Write Commands Until Prompt sudo rm -rf /opt/stack/tempest/.testrepository + ${net_id} = OpenStackOperations.Get Net Id ${EXTERNAL_NET_NAME} + Tempest.Tempest Conf Add External Network And Floating Network Name ${net_id} + +Tempest Conf Add External Network And Floating Network Name + [Arguments] ${external_network_id} + [Documentation] Tempest will be run with a config file - this function will add the + ... given external network ID to the configuration file. + Tempest.Modify Config In File On Existing SSH Connection ${TEMPEST_CONFIG_FILE} set network public_network_id ${external_network_id} + Tempest.Modify Config In File On Existing SSH Connection ${TEMPEST_CONFIG_FILE} set DEFAULT debug False + Tempest.Modify Config In File On Existing SSH Connection ${TEMPEST_CONFIG_FILE} set DEFAULT log_level INFO + Tempest.Modify Config In File On Existing SSH Connection ${TEMPEST_CONFIG_FILE} set network floating_network_name ${EXTERNAL_NET_NAME} + DevstackUtils.Write Commands Until Prompt sudo cat ${TEMPEST_CONFIG_FILE} + DevstackUtils.Write Commands Until Prompt sudo chmod 777 ${TEMPEST_CONFIG_FILE} + +Tempest Conf Modify Pause On Test Teardown + [Arguments] ${pause_flag} + [Documentation] Sets the DEFAULT section flag for pausing the test teardown. If True the tempest test case + ... being executed will break to a pdb() debug shell when it hits it's teardown() function. + Tempest.Modify Config In File On Existing SSH Connection ${TEMPEST_CONFIG_FILE} set DEFAULT pause_teardown ${pause_flag} + +Modify Config In File On Existing SSH Connection + [Arguments] ${config_file} ${modifier} ${config_section} ${config_key} ${config_value}=${EMPTY} + [Documentation] uses crudini to populate oslo cofg file. + # this keyword is only one line so seems like extra overhead, but this may be a good candidate to move + # to a library at some point, when/if other suites need to use it, so wanted to make it generic. + DevstackUtils.Write Commands Until Prompt sudo -E crudini --${modifier} ${config_file} ${config_section} ${config_key} ${config_value} + +Create Blacklist File + [Documentation] For each exclusion regex in the required @{${OPENSTACK_BRANCH}_EXCLUSION_REGEXES} list a new + ... line will be created in the required ${BLACKLIST_FILE} location. This file is pushed to the OS_CONTROL_NODE + ... which is assumed to be the tempest executor. + OperatingSystem.Create File ${BLACKLIST_FILE} + : FOR ${exclusion} IN @{${OPENSTACK_BRANCH}_EXCLUSION_REGEXES} + \ OperatingSystem.Append To File ${BLACKLIST_FILE} ${exclusion}\n + OperatingSystem.Log File ${BLACKLIST_FILE} + SSHKeywords.Copy File To Remote System ${OS_CONTROL_NODE_IP} ${BLACKLIST_FILE} ${BLACKLIST_FILE} diff --git a/csit/suites/openstack/tempest/tempest.robot b/csit/suites/openstack/tempest/tempest.robot index 7fd5d31b72..3c2ced2f42 100644 --- a/csit/suites/openstack/tempest/tempest.robot +++ b/csit/suites/openstack/tempest/tempest.robot @@ -1,17 +1,18 @@ *** Settings *** Documentation Test suite for running tempest tests. It is assumed that the test environment ... is already deployed and ready. -Suite Setup DevstackUtils.Suite Setup +Suite Setup Tempest.Suite Setup Suite Teardown OpenStackOperations.OpenStack Suite Teardown Test Setup SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing -Test Teardown BuiltIn.Run Keywords OpenStackOperations.Get Test Teardown Debugs -Test Template DevstackUtils.Run Tempest Tests +Test Teardown OpenStackOperations.Get Test Teardown Debugs +Test Template Tempest.Run Tempest Tests Library OperatingSystem Library SSHLibrary Resource ../../../libraries/DevstackUtils.robot Resource ../../../libraries/OpenStackOperations.robot Resource ../../../libraries/SetupUtils.robot Resource ../../../libraries/SSHKeywords.robot +Resource ../../../libraries/Tempest.robot Resource ../../../variables/Variables.robot Resource ../../../variables/netvirt/Variables.robot