diff options
author | 2016-05-17 13:27:40 +0000 | |
---|---|---|
committer | 2016-05-17 13:27:40 +0000 | |
commit | d338cc665efc9a2d73d6dff1567dc6de6bc63bd8 (patch) | |
tree | c64a765136c0330ec72872166af1a7fe57f73a32 /testcases/VIM/OpenStack/CI/libraries/run_tempest.py | |
parent | 8f645a8d931da93f99c15593e2bd1f4d93a6d987 (diff) | |
parent | 9bdb8955ba266abc34e1ab069ad0ee013dcf57ba (diff) |
Merge "BGPVPN test case refactored"
Diffstat (limited to 'testcases/VIM/OpenStack/CI/libraries/run_tempest.py')
-rw-r--r-- | testcases/VIM/OpenStack/CI/libraries/run_tempest.py | 17 |
1 files changed, 1 insertions, 16 deletions
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) |