diff options
| -rw-r--r-- | docker/Dockerfile | 1 | ||||
| -rwxr-xr-x | docker/run_tests.sh | 7 | ||||
| -rwxr-xr-x | testcases/config_functest.py | 5 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 1 | ||||
| -rw-r--r-- | testcases/features/doctor.py | 64 | ||||
| -rw-r--r-- | testcases/functest_utils.py | 9 |
6 files changed, 81 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 4a2d87bf6..69c2bd48f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -74,4 +74,3 @@ ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/op RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 RUN curl -L https://get.rvm.io | bash -s stable -RUN bash -c 'source /etc/profile.d/rvm.sh ; rvm autolibs enable ; rvm install 1.9.3 ; rvm use 1.9.3' diff --git a/docker/run_tests.sh b/docker/run_tests.sh index d6faff23a..4fd505bbd 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -129,7 +129,12 @@ function run_test(){ "promise") info "Running PROMISE test case..." # TODO - esac + ;; + "doctor") + info "Running Doctor test..." + python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py + ;; + esac } diff --git a/testcases/config_functest.py b/testcases/config_functest.py index 19d894fb7..c2e8737b7 100755 --- a/testcases/config_functest.py +++ b/testcases/config_functest.py @@ -115,10 +115,13 @@ def action_start(): action_clean() exit(-1) + logger.info("Installing Ruby libraries for vIMS testcase...") # Install ruby libraries for vims test-case script = 'source /etc/profile.d/rvm.sh; ' script += 'cd ' + VIMS_TEST_DIR + '; ' - script += 'rvm use system;' + script += 'rvm autolibs enable ;' + script += 'rvm install 1.9.3; ' + script += 'rvm use 1.9.3;' script += 'bundle install' cmd = "/bin/bash -c '" + script + "'" diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index 7c42ffaa9..814a424e0 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -17,6 +17,7 @@ general: dir_repo_bgpvpn: /home/opnfv/repos/bgpvpn dir_repo_onos: /home/opnfv/repos/onos dir_repo_promise: /home/opnfv/repos/promise + dir_repo_doctor: /home/opnfv/repos/doctor dir_functest: /home/opnfv/functest dir_results: /home/opnfv/functest/results dir_functest_conf: /home/opnfv/functest/conf diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py new file mode 100644 index 000000000..a68c31cd0 --- /dev/null +++ b/testcases/features/doctor.py @@ -0,0 +1,64 @@ +#!/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 +# +# 0.1: This script boots the VM1 and allocates IP address from Nova +# Later, the VM2 boots then execute cloud-init to ping VM1. +# After successful ping, both the VMs are deleted. +# 0.2: measure test duration and publish results under json format +# +# + +import os +import time +import sys +import yaml + + +with open('/home/opnfv/functest/conf/config_functest.yaml') as f: + functest_yaml = yaml.safe_load(f) + +dirs = functest_yaml.get('general').get('directories') +FUNCTEST_REPO = dirs.get('dir_repo_functest') +DOCTOR_REPO = dirs.get('dir_repo_doctor') +TEST_DB_URL = functest_yaml.get('results').get('test_db_url') + +sys.path.append('%s/testcases' % FUNCTEST_REPO) +import functest_utils + + +def main(): + cmd = 'cd %s/tests && ./run.sh' % DOCTOR_REPO + start_time_ts = time.time() + + ret = functest_utils.execute_command(cmd, exit_on_error=False) + + end_time_ts = time.time() + duration = round(end_time_ts - start_time_ts, 1) + if ret: + test_status = 'OK' + else: + test_status = 'NOK' + + details = { + 'timestart': start_time_ts, + 'duration': duration, + 'status': test_status, + } + pod_name = functest_utils.get_pod_name() + git_version = functest_utils.get_git_branch(DOCTOR_REPO) + functest_utils.push_results_to_db(TEST_DB_URL, + 'doctor-notification', + None, + pod_name, + git_version, + details) + + +if __name__ == '__main__': + main() diff --git a/testcases/functest_utils.py b/testcases/functest_utils.py index e7641b01d..a104182b5 100644 --- a/testcases/functest_utils.py +++ b/testcases/functest_utils.py @@ -577,7 +577,7 @@ def download_url(url, dest_path): return True -def execute_command(cmd, logger=None): +def execute_command(cmd, logger=None, exit_on_error=True): """ Execute Linux command """ @@ -596,7 +596,9 @@ def execute_command(cmd, logger=None): else: if logger: logger.error("Error when executing command %s" % cmd) - exit(-1) + if exit_on_error: + exit(-1) + return False def get_git_branch(repo_path): @@ -646,7 +648,8 @@ def push_results_to_db(db_url, case_name, logger, pod_name, headers = {'Content-Type': 'application/json'} try: r = requests.post(url, data=json.dumps(params), headers=headers) - logger.debug(r) + if logger: + logger.debug(r) return True except: print "Error:", sys.exc_info()[0] |