diff options
author | Cedric Ollivier <cedric.ollivier@orange.com> | 2018-08-29 18:12:27 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-08-29 18:12:27 +0000 |
commit | c3cb30973bd96cc2e562f24277c7d19433900d89 (patch) | |
tree | dd2ffd8789d54351e7bbf0389b6e081015308280 /functest/opnfv_tests/openstack/tempest/conf_utils.py | |
parent | 5b5e96a56c9b1eb128e699f245dceb54dc7e8160 (diff) | |
parent | 9d03fcdd488c385842b43fd914915cbe4ae5390a (diff) |
Merge "Create new project/user for tempest tests"
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/conf_utils.py')
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 3606a52bd..8a4bb9386 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -106,19 +106,17 @@ def get_verifier_id(): """ Returns verifier id for current Tempest """ - create_rally_deployment() - create_verifier() cmd = ("rally verify list-verifiers | awk '/" + getattr(config.CONF, 'tempest_verifier_name') + "/ {print $2}'") proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - deployment_uuid = proc.stdout.readline().rstrip() - if deployment_uuid == "": + verifier_uuid = proc.stdout.readline().rstrip() + if verifier_uuid == "": LOGGER.error("Tempest verifier not found.") raise Exception('Error with command:%s' % cmd) - return deployment_uuid + return verifier_uuid def get_verifier_deployment_id(): @@ -142,9 +140,6 @@ def get_verifier_repo_dir(verifier_id): """ Returns installed verifier repo directory for Tempest """ - if not verifier_id: - verifier_id = get_verifier_id() - return os.path.join(getattr(config.CONF, 'dir_rally_inst'), 'verification', 'verifier-{}'.format(verifier_id), @@ -155,12 +150,6 @@ def get_verifier_deployment_dir(verifier_id, deployment_id): """ Returns Rally deployment directory for current verifier """ - if not verifier_id: - verifier_id = get_verifier_id() - - if not deployment_id: - deployment_id = get_verifier_deployment_id() - return os.path.join(getattr(config.CONF, 'dir_rally_inst'), 'verification', 'verifier-{}'.format(verifier_id), |