From efa03f2d578fbbf377d73e7a50d446d9cfb7714c Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Wed, 10 Feb 2016 14:38:08 +0100 Subject: Rename the vPing scripts proplery and adapt documentation Change-Id: Idb498eb7cefd938006661f42f1bf1772395d9d47 Signed-off-by: jose.lausuch --- docs/devguide/index.rst | 6 ++++-- docs/userguide/index.rst | 12 ++++++------ docs/userguide/runfunctest.rst | 7 ++++--- 3 files changed, 14 insertions(+), 11 deletions(-) (limited to 'docs') 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 - one or more of the following: vping,odl,rally,tempest,vims,onos, promise. Separated by comma. + 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 - one or more of the following: vping,vping_userdata,odl,rally,tempest,vims,onos,promise. Separated by comma. + 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) -- cgit 1.2.3-korg