summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2015-05-13 12:55:07 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-05-13 12:55:07 +0000
commitd87137be590c7048eda824bed715b8e2f5a62611 (patch)
treed435c588f5f1fe936bfa4f70701994dcf1ae7d79
parent2b745471efe898ab9abe42131bcbbf12cac9a8ff (diff)
parentf1d31e7be159d68651747fcdfb0e2d2f69de2307 (diff)
Merge "Doc updates: vPing picture updated to check console for ping Removed configuration of external network"
-rw-r--r--docs/functest.rst20
1 files changed, 8 insertions, 12 deletions
diff --git a/docs/functest.rst b/docs/functest.rst
index 7db6f250d..5dd3c53eb 100644
--- a/docs/functest.rst
+++ b/docs/functest.rst
@@ -180,10 +180,11 @@ The goal of this test can be described as follow::
| +------------------>| Test |
| | VM2 pings VM1 | |
| | | |
- | | If ping: | |
- | | shutdown VM2, OK | |
- | | else (timeout) | |
- | | test KO | |
+ | | Check console log | |
+ | | If ping: | |
+ | | exit OK | |
+ | | else (timeout) | |
+ | | exit KO | |
| | | |
| | | |
+-------------+ +-------------+
@@ -227,18 +228,19 @@ This script will:
* Install Tempest
* Retrieve test scenarios
* Setup ODL environment
- * Create temporary neutron external network
* Create temporary neutron private network
* Create router to connect both
* Create Glance images
Useful links:
+
.. _`OpenRC`: http://docs.openstack.org/user-guide/common/cli_set_environment_variables_using_openstack_rc.html
.. _`Rally installation procedure`: https://rally.readthedocs.org/en/latest/tutorial/step_0_installation.html
.. _`config_test.py` : https://git.opnfv.org/cgit/functest/tree/testcases/config_functest.py
+
.. _`config_test.py` : https://git.opnfv.org/cgit/functest/tree/testcases/functest.yaml
@@ -276,12 +278,6 @@ Do not change the directories structure
* image_url: URL of the image to be downloaded
* image_disk_format: glance image disk format (raw, qcow2, ...)
- * neutron_public_net_name: name of the OpenStack external network. If not existing, it will be created
- * neutron_public_subnet_name: external network subnet to be created if not existing
- * neutron_public_subnet_cidr: range of the external subnet. IMPORTANT: this subnet range must be reachable from the jumpstart server
- * neutron_public_subnet_start: start IP
- * neutron_public_subnet_end: end IP
-
* neutron_private_net_name: name of an OpenStack private network. If not existing, it will be created
* neutron_private_subnet_name: private subnet network to be created if not existing
* neutron_private_subnet_cidr: range of the private subnet.
@@ -448,7 +444,7 @@ vPing
=====
The test can be executed with command::
- #python ~./.functest/vPing.py
+ #python ~./.functest/vPing.py -d
.. _automatictest: