Update the way of running tempest

Use 'tempest run' instead of 'run_tempest.sh', which has
been removed by tempest 16.0.0
Also, 'tempest.py' has been renamed to 'run_tempest.py', to
avoid package importing conflict

Change-Id: I61e802e0381d1f33281610e98d05813c9b96faf9
Signed-off-by: Linda Wang <wangwulin@huawei.com>

1 files changed, 0 insertions, 92 deletions

diff --git a/sdnvpn/test/functest/tempest.py b/sdnvpn/test/functest/tempest.py
deleted file mode 100644
index d34af0b..0000000
--- a/sdnvpn/test/functest/tempest.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2017 All rights reserved
-# This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-#
-import ConfigParser
-import logging
-import os
-import re
-import shutil
-
-import functest.opnfv_tests.openstack.tempest.conf_utils as tempest_utils
-
-logger = logging.getLogger('sdnvpn-tempest')
-
-
-def main():
-    verifier_repo_dir = tempest_utils.get_verifier_repo_dir(None)
-    src_tempest_dir = tempest_utils.get_verifier_deployment_dir(None, None)
-
-    if not src_tempest_dir:
-        logger.error("Rally deployment not found.")
-        exit(-1)
-
-    tempest_utils.configure_verifier(src_tempest_dir)
-
-    src_tempest_conf = os.path.join(src_tempest_dir, 'tempest.conf')
-    bgpvpn_tempest_conf = src_tempest_dir + '/bgpvpn_tempest.conf'
-
-    if not os.path.isfile(src_tempest_conf):
-        logger.error("tempest.conf not found in %s." % src_tempest_conf)
-        exit(-1)
-    shutil.copy(src_tempest_conf, bgpvpn_tempest_conf)
-
-    logger.info("Copying tempest.conf to %s." % bgpvpn_tempest_conf)
-    config = ConfigParser.RawConfigParser()
-    config.read(bgpvpn_tempest_conf)
-    config.set('service_available', 'bgpvpn', 'True')
-    logger.debug("Updating %s with bgpvpn=True" % bgpvpn_tempest_conf)
-    with open(bgpvpn_tempest_conf, 'wb') as tempest_conf:
-        config.write(tempest_conf)
-
-    cmd_line = (verifier_repo_dir +
-                "/run_tempest.sh -C %s -t -N -- "
-                "networking_bgpvpn_tempest" % bgpvpn_tempest_conf)
-    logger.info("Executing: %s" % cmd_line)
-    cmd = os.popen(cmd_line)
-    output = cmd.read()
-    logger.debug(output)
-
-    # Results parsing
-    error_logs = ""
-    duration = 0
-    failed = 0
-    try:
-        # Look For errors
-        error_logs = ""
-        for match in re.findall('(.*?)[. ]*FAILED', output):
-            error_logs += match
-        # look for duration
-        m = re.search('tests in(.*)sec', output)
-        duration = m.group(1)
-        # Look for num tests run
-        m = re.search('Ran:(.*)tests', output)
-        num_tests = m.group(1)
-        # Look for tests failed
-        m = re.search('Failed:(.*)', output)
-        failed = m.group(1)
-        # Look for name of the tests
-        testcases = re.findall("\{0\} (.*)", output)
-
-        results = {"duration": duration,
-                   "num_tests": num_tests, "failed": failed,
-                   "tests": testcases}
-        if int(failed) == 0:
-            status = "PASS"
-        else:
-            status = "FAIL"
-
-        return {"status": status, "details": results}
-    except:
-        logger.error("Problem when parsing the results.")
-
-
-if __name__ == '__main__':
-    logging.basicConfig(level=logging.INFO)
-    main()