aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-07-12 17:10:55 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2016-07-14 16:00:26 +0200
commitee529409814e8452d409d9c5e8c56a047a483cd8 (patch)
treed239652744755e64c8deb4eba4ec90fda2bbdf35
parentaddc7f7318147c29de474813b00ae40882ca9662 (diff)
Enable new SDNVPN test cases in Functest
JIRA:FUNCTEST-99 The tempest execution has been moved to the sdnvpn to leverage the logic of execution and collecting the results from the executor wrapper: sdnvpn/test/functest/run_tests.py Change-Id: Ic4763f4ab45dde81f91b241ae91073b9ea47e333 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rwxr-xr-xci/exec_test.sh2
-rwxr-xr-xtestcases/features/bgpvpn.py123
2 files changed, 1 insertions, 124 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 35192002..37516429 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -116,7 +116,7 @@ function run_test(){
$clean_flag --sanity all $report
;;
"bgpvpn")
- python ${FUNCTEST_REPO_DIR}/testcases/features/bgpvpn.py
+ python ${repos_dir}/sdnvpn/test/functest/run_tests.py
;;
"onos")
python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
diff --git a/testcases/features/bgpvpn.py b/testcases/features/bgpvpn.py
deleted file mode 100755
index bac25591..00000000
--- a/testcases/features/bgpvpn.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2015 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
-#
-# Execute BGPVPN Tempest test cases
-#
-import argparse
-import os
-import re
-import time
-import yaml
-import ConfigParser
-
-import functest.utils.functest_logger as ft_logger
-import functest.utils.functest_utils as ft_utils
-
-with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
- functest_yaml = yaml.safe_load(f)
-
-""" tests configuration """
-parser = argparse.ArgumentParser()
-parser.add_argument("-d", "--debug",
- help="Debug mode",
- action="store_true")
-parser.add_argument("-r", "--report",
- help="Create json result file",
- action="store_true")
-args = parser.parse_args()
-
-dirs = functest_yaml.get('general').get('directories')
-FUNCTEST_REPO = dirs.get('dir_repo_functest')
-BGPVPN_REPO = dirs.get('dir_repo_bgpvpn')
-TEST_DB_URL = functest_yaml.get('results').get('test_db_url')
-
-logger = ft_logger.Logger("bgpvpn").getLogger()
-
-
-def main():
- logger.info("Running BGPVPN Tempest test case...")
- start_time = time.time()
-
- cmd = 'cd ' + BGPVPN_REPO + ';pip install --no-deps -e .'
- ft_utils.execute_command(cmd, logger, exit_on_error=False)
-
- src_tempest_dir = ft_utils.get_deployment_dir(logger)
- if not src_tempest_dir:
- logger.error("Rally deployment not found.")
- exit(-1)
-
- src_tempest_conf = src_tempest_dir + '/tempest.conf'
- dst_tempest_conf = src_tempest_dir + '/etc/tempest.conf'
-
- config = ConfigParser.RawConfigParser()
- config.read(src_tempest_conf)
- config.set('service_available', 'bgpvpn', 'True')
- with open(dst_tempest_conf, 'wb') as config_file:
- config.write(config_file)
-
- cmd_line = (src_tempest_dir +
- '/run_tempest.sh -t -N -- networking_bgpvpn_tempest;'
- 'rm -rf ' + dst_tempest_conf)
- cmd = os.popen(cmd_line)
- output = cmd.read()
- # Results parsing
- error_logs = ""
- duration = 0
- tests = 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 tests run
- m = re.search('Ran:(.*)tests', output)
- tests = m.group(1)
- # Look for tests failed
- m = re.search('Failed:(.*)', output)
- failed = m.group(1)
- except:
- logger.error("Impossible to parse the result file")
-
- # Generate json results for DB
- json_results = {"duration": float(duration),
- "tests": int(tests),
- "failures": int(failed),
- "errors": error_logs}
-
- logger.info("Results: " + str(json_results))
- criteria = "FAIL"
- # criteria = success rate = 100% (i.e all tests passed)
- # TODO use criteria defined in config file
- criteria_run = int(tests)
- if not failed:
- criteria_failed = 0
- else:
- criteria_failed = int(failed)
-
- if criteria_run > 0 and criteria_failed < 1:
- criteria = "PASS"
-
- # Push results in payload of testcase
- if args.report:
- logger.debug("Push bgpvpn results into DB")
- stop_time = time.time()
- ft_utils.push_results_to_db("sdnvpn",
- "bgpvpn_api",
- logger,
- start_time,
- stop_time,
- criteria,
- json_results)
-
-if __name__ == '__main__':
- main()