summaryrefslogtreecommitdiffstats
path: root/functest
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-08-18 08:56:58 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-08-18 09:32:24 +0200
commit90080307c68683f352be2cad48c8371c746d4788 (patch)
tree11a3cea46b40df8deb09057ec99eb0109a15652b /functest
parent20ee61db8d38bf12127afd12e34ac601d36b3ff5 (diff)
Generate API doc rst files
It also fixes few docstrings Change-Id: I10bae7b7fab40edd931dd55ab8859946e3b38a71 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest')
-rw-r--r--functest/ci/check_deployment.py4
-rw-r--r--functest/core/tenantnetwork.py1
-rw-r--r--functest/utils/functest_utils.py6
3 files changed, 5 insertions, 6 deletions
diff --git a/functest/ci/check_deployment.py b/functest/ci/check_deployment.py
index a475491a1..16c69345c 100644
--- a/functest/ci/check_deployment.py
+++ b/functest/ci/check_deployment.py
@@ -7,10 +7,10 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
-"""
-OpenStack deployment checker
+""" OpenStack deployment checker
Verifies that:
+
- Credentials file is given and contains the right information
- OpenStack endpoints are reachable
"""
diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py
index 760dc30e9..dbbb497dc 100644
--- a/functest/core/tenantnetwork.py
+++ b/functest/core/tenantnetwork.py
@@ -11,6 +11,7 @@
It offers a simple way to create all tenant network ressources required by a
testcase (including all Functest ones):
+
- TenantNetwork1 selects the user and the project set as env vars
- TenantNetwork2 creates a user and project to isolate the same ressources
diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index c5950c965..1993f1e83 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -98,15 +98,13 @@ def get_nova_version(cloud):
def get_openstack_version(cloud):
""" Detect OpenStack version via Nova API microversion
- It follows MicroversionHistory_.
+ It follows `MicroversionHistory
+ <https://docs.openstack.org/nova/latest/reference/api-microversion-history.html>`_.
Returns:
- OpenStack release
- Unknown on operation error
-
- .. _MicroversionHistory:
- https://docs.openstack.org/nova/latest/reference/api-microversion-history.html
"""
version = get_nova_version(cloud)
try: