From 9bdb8955ba266abc34e1ab069ad0ee013dcf57ba Mon Sep 17 00:00:00 2001 From: vitikkan Date: Mon, 16 May 2016 08:05:45 +0300 Subject: BGPVPN test case refactored BGPVPN test case is refactored and moved into bgpvpn.py module. JIRA: FUNCTEST-234 Change-Id: Ib0dd6e11f3c568470d9c3837ca192da767c64843 Signed-off-by: vitikkan --- testcases/VIM/OpenStack/CI/libraries/run_tempest.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'testcases/VIM/OpenStack') diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py index 9eca6cbd8..bf62ce306 100644 --- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py @@ -172,21 +172,6 @@ def create_tempest_resources(): exit(-1) -def get_deployment_dir(): - logger.debug("Resolving deployment UUID and directory...") - cmd = "rally deployment list | awk '/" + DEPLOYMENT_MAME + "/ {print $2}'" - p = subprocess.Popen(cmd, shell=True, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - deployment_uuid = p.stdout.readline().rstrip() - if deployment_uuid == "": - logger.error("Rally deployment NOT found.") - exit(-1) - deployment_dir = (RALLY_INSTALLATION_DIR + "/tempest/for-deployment-" + - deployment_uuid) - return deployment_dir - - def configure_tempest(deployment_dir): """ Add/update needed parameters into tempest.conf file generated by Rally @@ -345,7 +330,7 @@ def main(): if not os.path.exists(TEMPEST_RESULTS_DIR): os.makedirs(TEMPEST_RESULTS_DIR) - deployment_dir = get_deployment_dir() + deployment_dir = ft_utils.get_deployment_dir(logger) configure_tempest(deployment_dir) create_tempest_resources() generate_test_list(deployment_dir, args.mode) -- cgit 1.2.3-korg