aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/tempest/conf_utils.py
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2018-08-29 13:59:49 +0300
committerJuha Kosonen <juha.kosonen@nokia.com>2018-08-29 13:59:49 +0300
commit9d03fcdd488c385842b43fd914915cbe4ae5390a (patch)
tree351532ffcc95d4fd5d4c063016775ebf6e4fdae7 /functest/opnfv_tests/openstack/tempest/conf_utils.py
parent04f5136a4f389ff4a2bc5d3cb7ee6b0b51c394f7 (diff)
Create new project/user for tempest tests
JIRA: FUNCTEST-1009 Change-Id: I6b9bca3827ba6cc804c25689a896ca63eec6a78b Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/conf_utils.py')
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py17
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 bf1a193b6..c428c78ce 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -105,19 +105,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():
@@ -141,9 +139,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),
@@ -154,12 +149,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),