diff options
| -rwxr-xr-x | docker/run_tests.sh | 17 | ||||
| -rw-r--r-- | docs/devguide/index.rst | 6 | ||||
| -rw-r--r-- | docs/userguide/index.rst | 12 | ||||
| -rw-r--r-- | docs/userguide/runfunctest.rst | 7 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 4 | ||||
| -rw-r--r-- | testcases/tests/TestFunctestUtils.py | 7 | ||||
| -rw-r--r-- | testcases/vPing/CI/libraries/vPing_ssh.py (renamed from testcases/vPing/CI/libraries/vPing2.py) | 2 | ||||
| -rw-r--r-- | testcases/vPing/CI/libraries/vPing_userdata.py (renamed from testcases/vPing/CI/libraries/vPing.py) | 2 |
8 files changed, 32 insertions, 25 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh index 9d5f681ca..7dc7f0586 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -23,12 +23,13 @@ where: -r|--report push results to database (false by default) -n|--no-clean do not clean OpenStack resources after test run -t|--test run specific set of tests - <test_name> one or more of the following: vping,odl,rally,tempest,vims,onos,promise,ovno. Separated by comma. + <test_name> one or more of the following separated by comma: + vping_ssh,vping_userdata,odl,rally,tempest,vims,onos,promise,ovno examples: $(basename "$0") - $(basename "$0") --test vping,odl + $(basename "$0") --test vping_ssh,odl $(basename "$0") -t tempest,rally" @@ -82,14 +83,14 @@ function run_test(){ echo "----------------------------------------------" echo "" case $test_name in - "vping") - info "Running vPing test..." - python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing2.py \ + "vping_ssh") + info "Running vPing-SSH test..." + python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_ssh.py \ --debug ${report} ;; "vping_userdata") - info "Running vPing test using userdata/cloudinit.... " - python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \ + info "Running vPing-userdata test... " + python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing_userdata.py \ --debug ${report} ;; "odl") @@ -225,7 +226,7 @@ if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]] &&\ [[ -f $tests_file ]]; then arr_test=($(cat $tests_file)) else - arr_test=(vping tempest vims rally) + arr_test=(vping_ssh tempest vims rally) fi BASEDIR=`dirname $0` diff --git a/docs/devguide/index.rst b/docs/devguide/index.rst index 7dd5cc790..7f3233c4c 100644 --- a/docs/devguide/index.rst +++ b/docs/devguide/index.rst @@ -41,7 +41,8 @@ Functest can be described as follow:: Functest deals with internal and external test cases. The Internal test cases in Brahmaputra are: - * vPing + * vPing_SSH + * vPing_userdata * ODL * Tempest * vIMS @@ -265,7 +266,8 @@ own project:: And do not forget to update also the help line:: -t|--test run specific set of tests - <test_name> one or more of the following: vping,odl,rally,tempest,vims,onos, promise. Separated by comma. + <test_name> one or more of the following separated by comma: + vping_ssh,vping_userdata,odl,rally,tempest,vims,onos,promise,ovno config_funtest.yaml diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst index 89e3ef115..b33b3120c 100644 --- a/docs/userguide/index.rst +++ b/docs/userguide/index.rst @@ -24,8 +24,8 @@ The different scenarios are described in the section hereafter. VIM (Virtualized Infrastructure Manager) --- -vPing -^^^^^ +vPing_SSH +^^^^^^^^^ Given the script 'ping.sh':: @@ -371,8 +371,8 @@ Test results VIM --- -vPing -^^^^^ +vPing_SSH +^^^^^^^^^ vPing test case output is displayed in the console:: @@ -726,8 +726,8 @@ Troubleshooting VIM --- -vPing -^^^^^ +vPing_SSH +^^^^^^^^^ vPing should work on all the scenarios. In case of timeout, check your network connectivity. The test case creates its own security group to allow SSH access, diff --git a/docs/userguide/runfunctest.rst b/docs/userguide/runfunctest.rst index 94e11a63a..61511413c 100644 --- a/docs/userguide/runfunctest.rst +++ b/docs/userguide/runfunctest.rst @@ -27,7 +27,8 @@ several options:: -r|--report push results to database (false by default) -n|--no-clean do not clean up OpenStack resources after test run -t|--test run specific set of tests - <test_name> one or more of the following: vping,vping_userdata,odl,rally,tempest,vims,onos,promise. Separated by comma. + <test_name> one or more of the following separated by comma: + vping_ssh,vping_userdata,odl,rally,tempest,vims,onos,promise,ovno examples: run_tests.sh @@ -140,7 +141,7 @@ The order of execution is also described in the Functest configuration file:: test_exec_priority: - 1: vping + 1: vping_ssh 2: vping_userdata 3: tempest 4: odl @@ -156,7 +157,7 @@ The order of execution is also described in the Functest configuration file:: The tests are executed in the following order: - * Basic scenario (vPing, vPing_userdata, Tempest) + * Basic scenario (vPing_ssh, vPing_userdata, Tempest) * Controller suites: ODL or ONOS or OpenContrail * Feature projects (promise, vIMS) * Rally (benchmark scenario) diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index 2f034f940..7d5f21360 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -166,7 +166,7 @@ results: # the execution order is important as some tests may be more destructive than others # and if vPing is failing is usually not needed to continue... test_exec_priority: - 1: vping + 1: vping_ssh 2: vping_userdata 3: tempest 4: odl @@ -231,7 +231,7 @@ test-dependencies: functest: vims: scenario: '(ocl)|(odl)|(nosdn)' - vping: + vping_ssh: vping_userdata: scenario: '(ocl)|(odl)|(nosdn)' tempest: diff --git a/testcases/tests/TestFunctestUtils.py b/testcases/tests/TestFunctestUtils.py index 17bc958e3..fd83ed6f5 100644 --- a/testcases/tests/TestFunctestUtils.py +++ b/testcases/tests/TestFunctestUtils.py @@ -65,7 +65,10 @@ class TestFunctestUtils(unittest.TestCase): test = isTestRunnable('functest/odl', functest_yaml) self.assertTrue(test) - test = isTestRunnable('functest/vping', functest_yaml) + test = isTestRunnable('functest/vping_ssh', functest_yaml) + self.assertTrue(test) + + test = isTestRunnable('functest/vping_userdata', functest_yaml) self.assertTrue(test) test = isTestRunnable('functest/tempest', functest_yaml) @@ -82,7 +85,7 @@ class TestFunctestUtils(unittest.TestCase): test = generateTestcaseList(functest_yaml) - expected_list = "vping tempest odl doctor promise policy-test odl-vpn_service-tests vims rally " + expected_list = "vping_ssh vping_userdata tempest odl doctor promise policy-test odl-vpn_service-tests vims rally " self.assertEqual(test, expected_list) def tearDown(self): diff --git a/testcases/vPing/CI/libraries/vPing2.py b/testcases/vPing/CI/libraries/vPing_ssh.py index 1ce6dc9e5..9c83c80e7 100644 --- a/testcases/vPing/CI/libraries/vPing2.py +++ b/testcases/vPing/CI/libraries/vPing_ssh.py @@ -42,7 +42,7 @@ args = parser.parse_args() """ logging configuration """ -logger = logging.getLogger('vPing') +logger = logging.getLogger('vPing_ssh') logger.setLevel(logging.DEBUG) ch = logging.StreamHandler() diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing_userdata.py index 1368bbec1..be1ed3f8e 100644 --- a/testcases/vPing/CI/libraries/vPing.py +++ b/testcases/vPing/CI/libraries/vPing_userdata.py @@ -40,7 +40,7 @@ args = parser.parse_args() """ logging configuration """ -logger = logging.getLogger('vPing') +logger = logging.getLogger('vPing_userdata') logger.setLevel(logging.DEBUG) ch = logging.StreamHandler() |