4 files changed, 66 insertions, 46 deletions

diff --git a/docs/testing/user/userguide/deprecated.rst b/docs/testing/user/userguide/deprecated.rst
new file mode 100644
index 00000000..80fe44af
--- /dev/null
+++ b/docs/testing/user/userguide/deprecated.rst
@@ -0,0 +1,28 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+***********************************
+Bottlenecks - Deprecated Test Cases
+***********************************
+
+.. This index.rst file is used to structure and organise the content in these directories.
+.. The documentation toolchain will create web and pdf versions of the content of this file.
+
+.. toctree::
+   :maxdepth: 1
+
+   ./rubbos/rubbos_basic.rst
+   ./rubbos/rubbos_tc1101.rst
+   ./rubbos/rubbos_tc1201.rst
+   ./rubbos/rubbos_tc1301.rst
+   ./rubbos/rubbos_tc1401.rst
+   ./rubbos/rubbos_heavy_tc1101.rst
+   ./vstf/vstf_Ti1.rst
+   ./vstf/vstf_Ti2.rst
+   ./vstf/vstf_Ti3.rst
+   ./vstf/vstf_Tn1.rst
+   ./vstf/vstf_Tn2.rst
+   ./vstf/vstf_Tu1.rst
+   ./vstf/vstf_Tu2.rst
+   ./vstf/vstf_Tu3.rst
+
diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst
index 8afd57ab..795530d6 100644
--- a/docs/testing/user/userguide/index.rst
+++ b/docs/testing/user/userguide/index.rst
@@ -9,21 +9,9 @@ Bottlenecks - User Guide
 .. The documentation toolchain will create web and pdf versions of the content of this file.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
-   ./rubbos/rubbos_basic.rst
-   ./rubbos/rubbos_tc1101.rst
-   ./rubbos/rubbos_tc1201.rst
-   ./rubbos/rubbos_tc1301.rst
-   ./rubbos/rubbos_tc1401.rst
-   ./rubbos/rubbos_heavy_tc1101.rst
-   ./vstf/vstf_Ti1.rst
-   ./vstf/vstf_Ti2.rst
-   ./vstf/vstf_Ti3.rst
-   ./vstf/vstf_Tn1.rst
-   ./vstf/vstf_Tn2.rst
-   ./vstf/vstf_Tu1.rst
-   ./vstf/vstf_Tu2.rst
-   ./vstf/vstf_Tu3.rst
    ./posca/posca_stress_ping.rst
    ./posca/posca_stress_traffic.rst
+   ./deprecated.rst
+
diff --git a/docs/testing/user/userguide/posca/posca_stress_ping.rst b/docs/testing/user/userguide/posca/posca_stress_ping.rst
index 846b4686..963cf508 100644
--- a/docs/testing/user/userguide/posca/posca_stress_ping.rst
+++ b/docs/testing/user/userguide/posca/posca_stress_ping.rst
@@ -32,21 +32,23 @@ Test Case
 
 Configuration
 ============
-load_manager:
-  scenarios:
-    tool: ping
-    test_times: 100
-    package_size:
-    num_stack: 2, 5, 10
-    package_loss: 10%
+::
 
-  contexts:
-    stack_create: yardstick
-    flavor:
-    yardstick_test_ip:
-    yardstick_test_dir: "samples"
-    yardstick_testcase: "ping_bottlenecks"
+    load_manager:
+      scenarios:
+        tool: ping
+        test_times: 100
+        package_size:
+        num_stack: 2, 5, 10
+        package_loss: 10%
 
-dashboard:
-  dashboard: "y"
-  dashboard_ip:
+      contexts:
+        stack_create: yardstick
+        flavor:
+        yardstick_test_ip:
+        yardstick_test_dir: "samples"
+        yardstick_testcase: "ping_bottlenecks"
+
+    dashboard:
+      dashboard: "y"
+      dashboard_ip:
diff --git a/docs/testing/user/userguide/posca/posca_stress_traffic.rst b/docs/testing/user/userguide/posca/posca_stress_traffic.rst
index a995996e..5f02e036 100644
--- a/docs/testing/user/userguide/posca/posca_stress_traffic.rst
+++ b/docs/testing/user/userguide/posca/posca_stress_traffic.rst
@@ -32,18 +32,20 @@ Test Case
 
 Configration
 ===========
-test_config:
-  tool: netperf
-  protocol: tcp
-  test_time: 20
-  tx_pkt_sizes: 64, 256, 1024, 4096, 8192, 16384, 32768, 65536
-  rx_pkt_sizes: 64, 256, 1024, 4096, 8192, 16384, 32768, 65536
-  cpu_load: 0.9
-  latency: 100000
-runner_config:
-  dashboard: "y"
-  dashboard_ip:
-  stack_create: yardstick
-  yardstick_test_ip:
-  yardstick_test_dir: "samples"
-  yardstick_testcase: "netperf_bottlenecks"
+::
+
+    test_config:
+      tool: netperf
+      protocol: tcp
+      test_time: 20
+      tx_pkt_sizes: 64, 256, 1024, 4096, 8192, 16384, 32768, 65536
+      rx_pkt_sizes: 64, 256, 1024, 4096, 8192, 16384, 32768, 65536
+      cpu_load: 0.9
+      latency: 100000
+    runner_config:
+      dashboard: "y"
+      dashboard_ip:
+      stack_create: yardstick
+      yardstick_test_ip:
+      yardstick_test_dir: "samples"
+      yardstick_testcase: "netperf_bottlenecks"