Split modules in apidoc

Change-Id: Iff2bd9377efb4e8abde35ef3fc38aca120feccaf
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

60 files changed, 341 insertions, 301 deletions

diff --git a/api/apidoc/functest.ci.check_deployment.rst b/api/apidoc/functest.ci.check_deployment.rst
new file mode 100644
index 000000000..278fa3a9a
--- /dev/null
+++ b/api/apidoc/functest.ci.check_deployment.rst
@@ -0,0 +1,7 @@
+functest.ci.check\_deployment module
+====================================
+
+.. automodule:: functest.ci.check_deployment
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.ci.rst b/api/apidoc/functest.ci.rst
index 576fc222a..06d0cd508 100644
--- a/api/apidoc/functest.ci.rst
+++ b/api/apidoc/functest.ci.rst
@@ -4,14 +4,9 @@ functest.ci package
 Submodules
 ----------
 
-functest.ci.check\_deployment module
-------------------------------------
-
-.. automodule:: functest.ci.check_deployment
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.ci.check_deployment
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.core.cloudify.rst b/api/apidoc/functest.core.cloudify.rst
new file mode 100644
index 000000000..aa186afe7
--- /dev/null
+++ b/api/apidoc/functest.core.cloudify.rst
@@ -0,0 +1,7 @@
+functest.core.cloudify module
+=============================
+
+.. automodule:: functest.core.cloudify
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.core.rst b/api/apidoc/functest.core.rst
index fb1c39ff8..6d457c7f5 100644
--- a/api/apidoc/functest.core.rst
+++ b/api/apidoc/functest.core.rst
@@ -4,30 +4,11 @@ functest.core package
 Submodules
 ----------
 
-functest.core.cloudify module
------------------------------
-
-.. automodule:: functest.core.cloudify
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.core.singlevm module
------------------------------
-
-.. automodule:: functest.core.singlevm
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.core.tenantnetwork module
-----------------------------------
-
-.. automodule:: functest.core.tenantnetwork
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.core.cloudify
+   functest.core.singlevm
+   functest.core.tenantnetwork
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.core.singlevm.rst b/api/apidoc/functest.core.singlevm.rst
new file mode 100644
index 000000000..171a3fae5
--- /dev/null
+++ b/api/apidoc/functest.core.singlevm.rst
@@ -0,0 +1,7 @@
+functest.core.singlevm module
+=============================
+
+.. automodule:: functest.core.singlevm
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.core.tenantnetwork.rst b/api/apidoc/functest.core.tenantnetwork.rst
new file mode 100644
index 000000000..db1dbf8a3
--- /dev/null
+++ b/api/apidoc/functest.core.tenantnetwork.rst
@@ -0,0 +1,7 @@
+functest.core.tenantnetwork module
+==================================
+
+.. automodule:: functest.core.tenantnetwork
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.api.connection_check.rst b/api/apidoc/functest.opnfv_tests.openstack.api.connection_check.rst
new file mode 100644
index 000000000..62e9e87a9
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.api.connection_check.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.api.connection\_check module
+============================================================
+
+.. automodule:: functest.opnfv_tests.openstack.api.connection_check
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.api.rst b/api/apidoc/functest.opnfv_tests.openstack.api.rst
index 209f80710..8f32cf8ee 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.api.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.api.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.openstack.api package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.api.connection\_check module
-------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.api.connection_check
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.api.connection_check
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.cinder.cinder_test.rst b/api/apidoc/functest.opnfv_tests.openstack.cinder.cinder_test.rst
new file mode 100644
index 000000000..4f362cd22
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.cinder.cinder_test.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.cinder.cinder\_test module
+==========================================================
+
+.. automodule:: functest.opnfv_tests.openstack.cinder.cinder_test
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.cinder.rst b/api/apidoc/functest.opnfv_tests.openstack.cinder.rst
index dc2c93b96..58564dfc1 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.cinder.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.cinder.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.openstack.cinder package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.cinder.cinder\_test module
-----------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.cinder.cinder_test
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.cinder.cinder_test
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.patrole.patrole.rst b/api/apidoc/functest.opnfv_tests.openstack.patrole.patrole.rst
new file mode 100644
index 000000000..6477fe7a2
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.patrole.patrole.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.patrole.patrole module
+======================================================
+
+.. automodule:: functest.opnfv_tests.openstack.patrole.patrole
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.patrole.rst b/api/apidoc/functest.opnfv_tests.openstack.patrole.rst
index 72679f370..71138307b 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.patrole.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.patrole.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.openstack.patrole package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.patrole.patrole module
-------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.patrole.patrole
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.patrole.patrole
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.rally.rally.rst b/api/apidoc/functest.opnfv_tests.openstack.rally.rally.rst
new file mode 100644
index 000000000..480a5db46
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.rally.rally.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.rally.rally module
+==================================================
+
+.. automodule:: functest.opnfv_tests.openstack.rally.rally
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.rally.rst b/api/apidoc/functest.opnfv_tests.openstack.rally.rst
index 377b82221..b066607f5 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.rally.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.rally.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.openstack.rally package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.rally.rally module
---------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.rally.rally
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.rally.rally
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.refstack.refstack.rst b/api/apidoc/functest.opnfv_tests.openstack.refstack.refstack.rst
new file mode 100644
index 000000000..5e02e013c
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.refstack.refstack.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.refstack.refstack module
+========================================================
+
+.. automodule:: functest.opnfv_tests.openstack.refstack.refstack
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.refstack.rst b/api/apidoc/functest.opnfv_tests.openstack.refstack.rst
index a35e944ae..fbc4844de 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.refstack.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.refstack.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.openstack.refstack package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.refstack.refstack module
---------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.refstack.refstack
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.refstack.refstack
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.shaker.rst b/api/apidoc/functest.opnfv_tests.openstack.shaker.rst
index fb298cb6a..ec347a952 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.shaker.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.shaker.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.openstack.shaker package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.shaker.shaker module
-----------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.shaker.shaker
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.shaker.shaker
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.shaker.shaker.rst b/api/apidoc/functest.opnfv_tests.openstack.shaker.shaker.rst
new file mode 100644
index 000000000..7035b816b
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.shaker.shaker.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.shaker.shaker module
+====================================================
+
+.. automodule:: functest.opnfv_tests.openstack.shaker.shaker
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.snaps.api_check.rst b/api/apidoc/functest.opnfv_tests.openstack.snaps.api_check.rst
new file mode 100644
index 000000000..ac540e9c8
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.snaps.api_check.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.snaps.api\_check module
+=======================================================
+
+.. automodule:: functest.opnfv_tests.openstack.snaps.api_check
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.snaps.health_check.rst b/api/apidoc/functest.opnfv_tests.openstack.snaps.health_check.rst
new file mode 100644
index 000000000..81e4fd341
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.snaps.health_check.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.snaps.health\_check module
+==========================================================
+
+.. automodule:: functest.opnfv_tests.openstack.snaps.health_check
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.snaps.rst b/api/apidoc/functest.opnfv_tests.openstack.snaps.rst
index dd786208b..2bd4ba2c7 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.snaps.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.snaps.rst
@@ -4,54 +4,14 @@ functest.opnfv\_tests.openstack.snaps package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.snaps.api\_check module
--------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.snaps.api_check
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.openstack.snaps.health\_check module
-----------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.snaps.health_check
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.openstack.snaps.smoke module
---------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.snaps.smoke
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.openstack.snaps.snaps\_suite\_builder module
-------------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.snaps.snaps_suite_builder
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.openstack.snaps.snaps\_test\_runner module
-----------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.snaps.snaps_test_runner
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.openstack.snaps.snaps\_utils module
----------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.snaps.snaps_utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
+.. toctree::
+
+   functest.opnfv_tests.openstack.snaps.api_check
+   functest.opnfv_tests.openstack.snaps.health_check
+   functest.opnfv_tests.openstack.snaps.smoke
+   functest.opnfv_tests.openstack.snaps.snaps_suite_builder
+   functest.opnfv_tests.openstack.snaps.snaps_test_runner
+   functest.opnfv_tests.openstack.snaps.snaps_utils
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.snaps.smoke.rst b/api/apidoc/functest.opnfv_tests.openstack.snaps.smoke.rst
new file mode 100644
index 000000000..90f5a10ad
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.snaps.smoke.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.snaps.smoke module
+==================================================
+
+.. automodule:: functest.opnfv_tests.openstack.snaps.smoke
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.snaps.snaps_suite_builder.rst b/api/apidoc/functest.opnfv_tests.openstack.snaps.snaps_suite_builder.rst
new file mode 100644
index 000000000..e21864f85
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.snaps.snaps_suite_builder.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.snaps.snaps\_suite\_builder module
+==================================================================
+
+.. automodule:: functest.opnfv_tests.openstack.snaps.snaps_suite_builder
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.snaps.snaps_test_runner.rst b/api/apidoc/functest.opnfv_tests.openstack.snaps.snaps_test_runner.rst
new file mode 100644
index 000000000..b72c28ee4
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.snaps.snaps_test_runner.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.snaps.snaps\_test\_runner module
+================================================================
+
+.. automodule:: functest.opnfv_tests.openstack.snaps.snaps_test_runner
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.snaps.snaps_utils.rst b/api/apidoc/functest.opnfv_tests.openstack.snaps.snaps_utils.rst
new file mode 100644
index 000000000..d98919903
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.snaps.snaps_utils.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.snaps.snaps\_utils module
+=========================================================
+
+.. automodule:: functest.opnfv_tests.openstack.snaps.snaps_utils
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.tempest.conf_utils.rst b/api/apidoc/functest.opnfv_tests.openstack.tempest.conf_utils.rst
new file mode 100644
index 000000000..891c7e1f9
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.tempest.conf_utils.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.tempest.conf\_utils module
+==========================================================
+
+.. automodule:: functest.opnfv_tests.openstack.tempest.conf_utils
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.tempest.rst b/api/apidoc/functest.opnfv_tests.openstack.tempest.rst
index 5eceffe6a..40aef5bfc 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.tempest.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.tempest.rst
@@ -4,22 +4,10 @@ functest.opnfv\_tests.openstack.tempest package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.tempest.conf\_utils module
-----------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.tempest.conf_utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.openstack.tempest.tempest module
-------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.tempest.tempest
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.tempest.conf_utils
+   functest.opnfv_tests.openstack.tempest.tempest
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.tempest.tempest.rst b/api/apidoc/functest.opnfv_tests.openstack.tempest.tempest.rst
new file mode 100644
index 000000000..ad60f3ee3
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.tempest.tempest.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.tempest.tempest module
+======================================================
+
+.. automodule:: functest.opnfv_tests.openstack.tempest.tempest
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.vgpu.rst b/api/apidoc/functest.opnfv_tests.openstack.vgpu.rst
index 59fdc28e6..7ba162d24 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.vgpu.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.vgpu.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.openstack.vgpu package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.vgpu.vgpu module
-------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.vgpu.vgpu
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.vgpu.vgpu
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.vgpu.vgpu.rst b/api/apidoc/functest.opnfv_tests.openstack.vgpu.vgpu.rst
new file mode 100644
index 000000000..9bb3b55a5
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.vgpu.vgpu.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.vgpu.vgpu module
+================================================
+
+.. automodule:: functest.opnfv_tests.openstack.vgpu.vgpu
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.vmtp.rst b/api/apidoc/functest.opnfv_tests.openstack.vmtp.rst
index 311dffba2..50f558f45 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.vmtp.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.vmtp.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.openstack.vmtp package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.vmtp.vmtp module
-------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.vmtp.vmtp
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.vmtp.vmtp
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.vmtp.vmtp.rst b/api/apidoc/functest.opnfv_tests.openstack.vmtp.vmtp.rst
new file mode 100644
index 000000000..c6c53d86b
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.vmtp.vmtp.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.vmtp.vmtp module
+================================================
+
+.. automodule:: functest.opnfv_tests.openstack.vmtp.vmtp
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.vping.rst b/api/apidoc/functest.opnfv_tests.openstack.vping.rst
index 828eecbc5..3b8983697 100644
--- a/api/apidoc/functest.opnfv_tests.openstack.vping.rst
+++ b/api/apidoc/functest.opnfv_tests.openstack.vping.rst
@@ -4,22 +4,10 @@ functest.opnfv\_tests.openstack.vping package
 Submodules
 ----------
 
-functest.opnfv\_tests.openstack.vping.vping\_ssh module
--------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.vping.vping_ssh
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.openstack.vping.vping\_userdata module
-------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.openstack.vping.vping_userdata
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.openstack.vping.vping_ssh
+   functest.opnfv_tests.openstack.vping.vping_userdata
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.openstack.vping.vping_ssh.rst b/api/apidoc/functest.opnfv_tests.openstack.vping.vping_ssh.rst
new file mode 100644
index 000000000..192cbfb8f
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.vping.vping_ssh.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.vping.vping\_ssh module
+=======================================================
+
+.. automodule:: functest.opnfv_tests.openstack.vping.vping_ssh
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.openstack.vping.vping_userdata.rst b/api/apidoc/functest.opnfv_tests.openstack.vping.vping_userdata.rst
new file mode 100644
index 000000000..66a2f35d8
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.openstack.vping.vping_userdata.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.openstack.vping.vping\_userdata module
+============================================================
+
+.. automodule:: functest.opnfv_tests.openstack.vping.vping_userdata
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.sdn.odl.odl.rst b/api/apidoc/functest.opnfv_tests.sdn.odl.odl.rst
new file mode 100644
index 000000000..caca46c67
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.sdn.odl.odl.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.sdn.odl.odl module
+========================================
+
+.. automodule:: functest.opnfv_tests.sdn.odl.odl
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.sdn.odl.rst b/api/apidoc/functest.opnfv_tests.sdn.odl.rst
index 539fe56a6..3c1e85fcf 100644
--- a/api/apidoc/functest.opnfv_tests.sdn.odl.rst
+++ b/api/apidoc/functest.opnfv_tests.sdn.odl.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.sdn.odl package
 Submodules
 ----------
 
-functest.opnfv\_tests.sdn.odl.odl module
-----------------------------------------
-
-.. automodule:: functest.opnfv_tests.sdn.odl.odl
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.sdn.odl.odl
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.vnf.epc.juju_epc.rst b/api/apidoc/functest.opnfv_tests.vnf.epc.juju_epc.rst
new file mode 100644
index 000000000..59f4d586c
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.epc.juju_epc.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.epc.juju\_epc module
+==============================================
+
+.. automodule:: functest.opnfv_tests.vnf.epc.juju_epc
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.epc.rst b/api/apidoc/functest.opnfv_tests.vnf.epc.rst
index d159bb0e9..13f9886ef 100644
--- a/api/apidoc/functest.opnfv_tests.vnf.epc.rst
+++ b/api/apidoc/functest.opnfv_tests.vnf.epc.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.vnf.epc package
 Submodules
 ----------
 
-functest.opnfv\_tests.vnf.epc.juju\_epc module
-----------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.epc.juju_epc
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.vnf.epc.juju_epc
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.vnf.ims.clearwater.rst b/api/apidoc/functest.opnfv_tests.vnf.ims.clearwater.rst
new file mode 100644
index 000000000..82ed81dbc
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.ims.clearwater.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.ims.clearwater module
+===============================================
+
+.. automodule:: functest.opnfv_tests.vnf.ims.clearwater
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.ims.cloudify_ims.rst b/api/apidoc/functest.opnfv_tests.vnf.ims.cloudify_ims.rst
new file mode 100644
index 000000000..9c32d7d16
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.ims.cloudify_ims.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.ims.cloudify\_ims module
+==================================================
+
+.. automodule:: functest.opnfv_tests.vnf.ims.cloudify_ims
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.ims.heat_ims.rst b/api/apidoc/functest.opnfv_tests.vnf.ims.heat_ims.rst
new file mode 100644
index 000000000..21cdc46db
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.ims.heat_ims.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.ims.heat\_ims module
+==============================================
+
+.. automodule:: functest.opnfv_tests.vnf.ims.heat_ims
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.ims.rst b/api/apidoc/functest.opnfv_tests.vnf.ims.rst
index c6d17107c..cce1944af 100644
--- a/api/apidoc/functest.opnfv_tests.vnf.ims.rst
+++ b/api/apidoc/functest.opnfv_tests.vnf.ims.rst
@@ -4,30 +4,11 @@ functest.opnfv\_tests.vnf.ims package
 Submodules
 ----------
 
-functest.opnfv\_tests.vnf.ims.clearwater module
------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.ims.clearwater
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.vnf.ims.cloudify\_ims module
---------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.ims.cloudify_ims
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.vnf.ims.heat\_ims module
-----------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.ims.heat_ims
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.vnf.ims.clearwater
+   functest.opnfv_tests.vnf.ims.cloudify_ims
+   functest.opnfv_tests.vnf.ims.heat_ims
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.cloudify_vrouter.rst b/api/apidoc/functest.opnfv_tests.vnf.router.cloudify_vrouter.rst
new file mode 100644
index 000000000..2e265716e
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.cloudify_vrouter.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.router.cloudify\_vrouter module
+=========================================================
+
+.. automodule:: functest.opnfv_tests.vnf.router.cloudify_vrouter
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.rst b/api/apidoc/functest.opnfv_tests.vnf.router.rst
index 40192438b..de5ae5743 100644
--- a/api/apidoc/functest.opnfv_tests.vnf.router.rst
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.rst
@@ -12,30 +12,11 @@ Subpackages
 Submodules
 ----------
 
-functest.opnfv\_tests.vnf.router.cloudify\_vrouter module
----------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.router.cloudify_vrouter
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.vnf.router.utilvnf module
------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.router.utilvnf
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.vnf.router.vrouter\_base module
------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.router.vrouter_base
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.vnf.router.cloudify_vrouter
+   functest.opnfv_tests.vnf.router.utilvnf
+   functest.opnfv_tests.vnf.router.vrouter_base
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.test_controller.function_test_exec.rst b/api/apidoc/functest.opnfv_tests.vnf.router.test_controller.function_test_exec.rst
new file mode 100644
index 000000000..612314e21
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.test_controller.function_test_exec.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.router.test\_controller.function\_test\_exec module
+=============================================================================
+
+.. automodule:: functest.opnfv_tests.vnf.router.test_controller.function_test_exec
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.test_controller.rst b/api/apidoc/functest.opnfv_tests.vnf.router.test_controller.rst
index 8de6ffc90..a3194e1dc 100644
--- a/api/apidoc/functest.opnfv_tests.vnf.router.test_controller.rst
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.test_controller.rst
@@ -4,14 +4,9 @@ functest.opnfv\_tests.vnf.router.test\_controller package
 Submodules
 ----------
 
-functest.opnfv\_tests.vnf.router.test\_controller.function\_test\_exec module
------------------------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.router.test_controller.function_test_exec
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.vnf.router.test_controller.function_test_exec
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.utilvnf.rst b/api/apidoc/functest.opnfv_tests.vnf.router.utilvnf.rst
new file mode 100644
index 000000000..06571a085
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.utilvnf.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.router.utilvnf module
+===============================================
+
+.. automodule:: functest.opnfv_tests.vnf.router.utilvnf
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.checker.rst b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.checker.rst
new file mode 100644
index 000000000..6759dd7ec
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.checker.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.router.vnf\_controller.checker module
+===============================================================
+
+.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.checker
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.command_generator.rst b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.command_generator.rst
new file mode 100644
index 000000000..869b34e65
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.command_generator.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.router.vnf\_controller.command\_generator module
+==========================================================================
+
+.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.command_generator
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.rst b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.rst
index 1db20c69f..3f0ef5ac8 100644
--- a/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.rst
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.rst
@@ -4,46 +4,13 @@ functest.opnfv\_tests.vnf.router.vnf\_controller package
 Submodules
 ----------
 
-functest.opnfv\_tests.vnf.router.vnf\_controller.checker module
----------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.checker
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.vnf.router.vnf\_controller.command\_generator module
---------------------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.command_generator
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.vnf.router.vnf\_controller.ssh\_client module
--------------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.ssh_client
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.vnf.router.vnf\_controller.vm\_controller module
-----------------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.vm_controller
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.opnfv\_tests.vnf.router.vnf\_controller.vnf\_controller module
------------------------------------------------------------------------
-
-.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.vnf_controller
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.opnfv_tests.vnf.router.vnf_controller.checker
+   functest.opnfv_tests.vnf.router.vnf_controller.command_generator
+   functest.opnfv_tests.vnf.router.vnf_controller.ssh_client
+   functest.opnfv_tests.vnf.router.vnf_controller.vm_controller
+   functest.opnfv_tests.vnf.router.vnf_controller.vnf_controller
 
 Module contents
 ---------------
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.ssh_client.rst b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.ssh_client.rst
new file mode 100644
index 000000000..2f330a208
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.ssh_client.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.router.vnf\_controller.ssh\_client module
+===================================================================
+
+.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.ssh_client
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.vm_controller.rst b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.vm_controller.rst
new file mode 100644
index 000000000..d30b754a9
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.vm_controller.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.router.vnf\_controller.vm\_controller module
+======================================================================
+
+.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.vm_controller
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.vnf_controller.rst b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.vnf_controller.rst
new file mode 100644
index 000000000..8d799373f
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.vnf_controller.vnf_controller.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.router.vnf\_controller.vnf\_controller module
+=======================================================================
+
+.. automodule:: functest.opnfv_tests.vnf.router.vnf_controller.vnf_controller
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.opnfv_tests.vnf.router.vrouter_base.rst b/api/apidoc/functest.opnfv_tests.vnf.router.vrouter_base.rst
new file mode 100644
index 000000000..eb766389e
--- /dev/null
+++ b/api/apidoc/functest.opnfv_tests.vnf.router.vrouter_base.rst
@@ -0,0 +1,7 @@
+functest.opnfv\_tests.vnf.router.vrouter\_base module
+=====================================================
+
+.. automodule:: functest.opnfv_tests.vnf.router.vrouter_base
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.utils.config.rst b/api/apidoc/functest.utils.config.rst
new file mode 100644
index 000000000..5ea6e8982
--- /dev/null
+++ b/api/apidoc/functest.utils.config.rst
@@ -0,0 +1,7 @@
+functest.utils.config module
+============================
+
+.. automodule:: functest.utils.config
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.utils.constants.rst b/api/apidoc/functest.utils.constants.rst
new file mode 100644
index 000000000..b2c17a59f
--- /dev/null
+++ b/api/apidoc/functest.utils.constants.rst
@@ -0,0 +1,7 @@
+functest.utils.constants module
+===============================
+
+.. automodule:: functest.utils.constants
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.utils.env.rst b/api/apidoc/functest.utils.env.rst
new file mode 100644
index 000000000..cbcb3d6b0
--- /dev/null
+++ b/api/apidoc/functest.utils.env.rst
@@ -0,0 +1,7 @@
+functest.utils.env module
+=========================
+
+.. automodule:: functest.utils.env
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.utils.functest_utils.rst b/api/apidoc/functest.utils.functest_utils.rst
new file mode 100644
index 000000000..73e33f34d
--- /dev/null
+++ b/api/apidoc/functest.utils.functest_utils.rst
@@ -0,0 +1,7 @@
+functest.utils.functest\_utils module
+=====================================
+
+.. automodule:: functest.utils.functest_utils
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/api/apidoc/functest.utils.rst b/api/apidoc/functest.utils.rst
index 107045043..716a11937 100644
--- a/api/apidoc/functest.utils.rst
+++ b/api/apidoc/functest.utils.rst
@@ -4,38 +4,12 @@ functest.utils package
 Submodules
 ----------
 
-functest.utils.config module
-----------------------------
-
-.. automodule:: functest.utils.config
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.utils.constants module
--------------------------------
-
-.. automodule:: functest.utils.constants
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.utils.env module
--------------------------
-
-.. automodule:: functest.utils.env
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-functest.utils.functest\_utils module
--------------------------------------
-
-.. automodule:: functest.utils.functest_utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
 
+   functest.utils.config
+   functest.utils.constants
+   functest.utils.env
+   functest.utils.functest_utils
 
 Module contents
 ---------------