summaryrefslogtreecommitdiffstats
path: root/testcases/VIM/OpenStack/CI
diff options
context:
space:
mode:
authorvitikkan <viktor.tikkanen@nokia.com>2016-05-16 08:05:45 +0300
committervitikkan <viktor.tikkanen@nokia.com>2016-05-16 08:28:11 +0300
commit9bdb8955ba266abc34e1ab069ad0ee013dcf57ba (patch)
tree573772f8a5961bda3cbdd1d2a0fec4aa9cac0186 /testcases/VIM/OpenStack/CI
parent24165377a66c8aeab28872cbc281b863092e1237 (diff)
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 <viktor.tikkanen@nokia.com>
Diffstat (limited to 'testcases/VIM/OpenStack/CI')
-rw-r--r--testcases/VIM/OpenStack/CI/libraries/run_tempest.py17
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)