From 56107fbfd2c991cc00d999fb3b081c979f56db86 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Wed, 7 Jun 2017 16:12:41 +0200 Subject: Adapt SDNVPN Functest test according to new framework - Inherit from TestCase class in Functest - Remove any push to DB method, since Functest takes care of it After this change, we will be able to load this module from Functest and make a python call instead of a bash call. Change-Id: I80bdb7eaac3a2d1f48e32bafa381a42cadb36138 Signed-off-by: jose.lausuch --- sdnvpn/test/functest/run_sdnvpn_tests.py | 163 +++++++++++++++---------------- 1 file changed, 77 insertions(+), 86 deletions(-) (limited to 'sdnvpn/test/functest/run_sdnvpn_tests.py') diff --git a/sdnvpn/test/functest/run_sdnvpn_tests.py b/sdnvpn/test/functest/run_sdnvpn_tests.py index e671264..6fe7558 100644 --- a/sdnvpn/test/functest/run_sdnvpn_tests.py +++ b/sdnvpn/test/functest/run_sdnvpn_tests.py @@ -8,7 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 # -import argparse import importlib import logging import os @@ -17,99 +16,91 @@ import time import traceback import yaml -import functest.utils.functest_utils as ft_utils +from functest.core import testcase from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib.gather_logs import gather_logs -logger = logging.getLogger('sdnvpn-run-tests') - COMMON_CONFIG = sdnvpn_config.CommonConfig() -TEST_DB_URL = COMMON_CONFIG.test_db - - -def push_results(testname, start_time, end_time, criteria, details): - logger.info("Push testcase '%s' results into the DB...\n" % testname) - ft_utils.push_results_to_db("sdnvpn", - testname, - start_time, - end_time, - criteria, - details) - - -def main(report=False): - # Workaround for https://jira.opnfv.org/projects/SDNVPN/issues/SDNVPN-100 - # and SDNVPN-126 - cmd_line = "neutron quota-update --subnet -1 --network -1 --port -1" - logger.info("Setting subnet/net quota to unlimited : %s" % cmd_line) - cmd = os.popen(cmd_line) - output = cmd.read() - logger.debug(output) - - # Workaround for https://jira.opnfv.org/projects/SDNVPN/issues/SDNVPN-115 - cmd_line = "nova quota-class-update --instances -1 default" - logger.info("Setting instances quota to unlimited : %s" % cmd_line) - cmd = os.popen(cmd_line) - output = cmd.read() - logger.debug(output) - - with open(COMMON_CONFIG.config_file) as f: - config_yaml = yaml.safe_load(f) - - testcases = config_yaml.get("testcases") - overall_status = "PASS" - for testcase in testcases: - if testcases[testcase]['enabled']: - test_name = testcase - test_descr = testcases[testcase]['description'] - test_name_db = testcases[testcase]['testname_db'] - title = ("Running '%s - %s'" % - (test_name, test_descr)) - logger.info(title) - logger.info("%s\n" % ("=" * len(title))) - t = importlib.import_module(testcase, package=None) - start_time = time.time() - try: - result = t.main() - except Exception as ex: - result = -1 - logger.info("Caught Exception in %s: %s Trace: %s" % - (test_name, ex, traceback.format_exc())) - end_time = time.time() - if result < 0: - status = "FAIL" - overall_status = "FAIL" - logger.info("Testcase %s failed" % test_name) - else: - status = result.get("status") - details = result.get("details") - logger.info("Results of test case '%s - %s':\n%s\n" % - (test_name, test_descr, result)) - - if status == "FAIL": + + +class SdnvpnFunctest(testcase.TestCase): + + __logger = logging.getLogger(__name__) + + def run(self): + self.start_time = time.time() + + cmd_line = "neutron quota-update --subnet -1 --network -1 --port -1" + self.__logger.info("Setting subnet/net quota to unlimited : %s" + % cmd_line) + cmd = os.popen(cmd_line) + output = cmd.read() + self.__logger.debug(output) + + # Workaround for + # https://jira.opnfv.org/projects/SDNVPN/issues/SDNVPN-115 + cmd_line = "nova quota-class-update --instances -1 default" + self.__logger.info("Setting instances quota to unlimited : %s" + % cmd_line) + cmd = os.popen(cmd_line) + output = cmd.read() + self.__logger.debug(output) + + with open(COMMON_CONFIG.config_file) as f: + config_yaml = yaml.safe_load(f) + + testcases = config_yaml.get("testcases") + overall_status = "PASS" + for tc in testcases: + if testcases[tc]['enabled']: + test_name = tc + test_descr = testcases[tc]['description'] + title = ("Running '%s - %s'" % + (test_name, test_descr)) + self.__logger.info(title) + self.__logger.info("%s\n" % ("=" * len(title))) + module = 'sdnvpn.test.functest.' + test_name + t = importlib.import_module(module, package=None) + try: + result = t.main() + except Exception as ex: + result = -1 + self.__logger.info("Caught Exception in %s: %s Trace: %s" + % (test_name, ex, + traceback.format_exc())) + if result < 0: + status = "FAIL" overall_status = "FAIL" + self.__logger.info("Testcase %s failed" % test_name) + else: + status = result.get("status") + self.details.update( + {test_name: {'status': status, + 'details': result.get("details")}}) + self.__logger.info("Results of test case '%s - %s':\n%s\n" + % (test_name, test_descr, result)) + + if status == "FAIL": + overall_status = "FAIL" + + self.stop_time = time.time() - if report: - push_results( - test_name_db, start_time, end_time, status, details) + try: + gather_logs('overall') + except Exception as ex: + self.__logger.error(('Something went wrong in the Log gathering.' + 'Ex: %s, Trace: %s') + % ex, traceback.format_exc()) - try: - gather_logs('overall') - except Exception as ex: - logger.error(('Something went wrong in the Log gathering.' - 'Ex: %s, Trace: %s') - % ex, traceback.format_exc()) - if overall_status == "FAIL": - sys.exit(-1) + if overall_status == "PASS": + self.result = 100 + return testcase.TestCase.EX_OK - sys.exit(0) + return testcase.TestCase.EX_RUN_ERROR if __name__ == '__main__': - logging.basicConfig(level=logging.INFO) - parser = argparse.ArgumentParser() - parser.add_argument("-r", "--report", - help="Create json result file", - action="store_true") - args = parser.parse_args() - main(report=args.report) + logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s' + '- %(levelname)s - %(message)s') + SDNVPN = SdnvpnFunctest() + sys.exit(SDNVPN.run()) -- cgit 1.2.3-korg