summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Kunz <georg.kunz@ericsson.com>2018-05-11 00:13:57 +0200
committerPeriyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>2018-05-11 10:01:52 +0000
commite617beda206166f291433f58081e48ac50e48dbb (patch)
tree01df0670c5ff6d40877b74427d9658a625784b5a
parent5a48bbcdee0b1900ef6ab0618006600104fbfb07 (diff)
Fixing invocation of Tempest tests
Only 7 bgpvpn Tempest tests were run by the SDNVPN Tempest test instead of the full set of Tempest tests. This patch fixes and simplifies the invocation of bgpvpn Tempest tests. Change-Id: I1b207ea3da27dd43ab034b84f81992a5e0be2ec1 Signed-off-by: Georg Kunz <georg.kunz@ericsson.com> (cherry picked from commit 2b8d01a7f79b0d3903964827be56347dc83d5591)
-rw-r--r--sdnvpn/test/functest/run_tempest.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/sdnvpn/test/functest/run_tempest.py b/sdnvpn/test/functest/run_tempest.py
index 801a889..e27fce4 100644
--- a/sdnvpn/test/functest/run_tempest.py
+++ b/sdnvpn/test/functest/run_tempest.py
@@ -21,8 +21,6 @@ logger = logutil.getLogger('sdnvpn-tempest')
def main():
verifier_id = tempest_utils.get_verifier_id()
- verifier_repo_dir = tempest_utils.get_verifier_repo_dir(
- verifier_id)
deployment_id = tempest_utils.get_verifier_deployment_id()
src_tempest_dir = tempest_utils.get_verifier_deployment_dir(
verifier_id, deployment_id)
@@ -35,7 +33,6 @@ def main():
src_tempest_conf = os.path.join(src_tempest_dir, 'tempest.conf')
bgpvpn_tempest_conf = os.path.join(src_tempest_dir, 'bgpvpn_tempest.conf')
- bgpvpn_tempest_list = os.path.join(src_tempest_dir, 'tempest_list.txt')
if not os.path.isfile(src_tempest_conf):
logger.error("tempest.conf not found in %s." % src_tempest_conf)
@@ -50,11 +47,6 @@ def main():
with open(bgpvpn_tempest_conf, 'wb') as tempest_conf:
config.write(tempest_conf)
- cmd = ("cd {0};"
- "testr list-tests networking_bgpvpn_tempest > {1};"
- "cd -;".format(verifier_repo_dir, bgpvpn_tempest_list))
- logger.info("Generating bgpvpn tempest list: %s" % cmd)
- os.popen(cmd)
# TODO: Though --config-file parameter is set during the tempest run,
# it looks for tempest.conf at /etc/tempest/ directory. so applying
# the following workaround. Will remove it when the root cause is found.
@@ -63,8 +55,7 @@ def main():
logger.info("Configuring default tempest conf file")
os.popen(cmd)
- cmd_line = ("tempest run --config-file {0} -t --whitelist-file {1}"
- .format(bgpvpn_tempest_conf, bgpvpn_tempest_list))
+ cmd_line = "tempest run -t --regex networking_bgpvpn_tempest"
logger.info("Executing: %s" % cmd_line)
cmd = os.popen(cmd_line)
output = cmd.read()