Merge "Update userguide and results docs"

7 files changed, 19 insertions, 17 deletions

diff --git a/docs/results/os-onos-nofeature-ha.rst b/docs/results/os-onos-nofeature-ha.rst
index e5587505f..d8b3ace5f 100644
--- a/docs/results/os-onos-nofeature-ha.rst
+++ b/docs/results/os-onos-nofeature-ha.rst
@@ -240,7 +240,7 @@ The lost amount of packets normally differs a lot per test run.
 
 Detailed test results
 ---------------------
-The scenario was run on Intel POD5_ with:
+The scenario was run on Intel POD6_ with:
 Joid
 OpenStack Mitaka
 Onos Goldeneye
diff --git a/docs/results/results.rst b/docs/results/results.rst
index d7572e463..04c6b9f87 100644
--- a/docs/results/results.rst
+++ b/docs/results/results.rst
@@ -29,7 +29,7 @@ OPNFV labs, triggered by OPNFV CI pipeline, documented per scenario.
    os-odl_l2-bgpvpn-ha.rst
    os-odl_l2-sfc-ha.rst
    os-nosdn-kvm-ha.rst
-   os-onos-nofeature-h.rst
+   os-onos-nofeature-ha.rst
    os-onos-sfc-ha.rst
 
 Test results of executed tests are avilable in Dashboard_ and logs in Jenkins_.
diff --git a/docs/results/yardstick-opnfv-ha.rst b/docs/results/yardstick-opnfv-ha.rst
index 4ee9de847..ef1617342 100644
--- a/docs/results/yardstick-opnfv-ha.rst
+++ b/docs/results/yardstick-opnfv-ha.rst
@@ -114,5 +114,5 @@ There are several improvement points for HA test:
 a) Running test cases in different enveriment deployed by different installers,
 such as compass4nfv, apex and joid, with different versiones.
 b) The period of each request is a little long, it needs more accurate test
- method.
+method.
 c) More test cases with different faults and different monitors are needed.
diff --git a/docs/userguide/02-methodology.rst b/docs/userguide/02-methodology.rst
index 1849ffd0c..34d271095 100644
--- a/docs/userguide/02-methodology.rst
+++ b/docs/userguide/02-methodology.rst
@@ -170,17 +170,19 @@ options).
 +---------+-------------------+----------------+------------------------------+
 | Compute | TC003 [1]_        | TC003 [1]_     |  TC013 [1]_                  |
 |         | TC004             | TC004          |  TC015 [1]_                  |
-|         | TC014             | TC010          |                              |
-|         | TC024             | TC012          |                              |
-|         | TC069             | TC055          |                              |
+|         | TC010             | TC024          |                              |
+|         | TC012             | TC055          |                              |
+|         | TC014             |                |                              |
+|         | TC069             |                |                              |
 +---------+-------------------+----------------+------------------------------+
-| Network | TC001             | TC001          |  TC016 [1]_                  |
-|         | TC002             | TC008          |  TC018 [1]_                  |
-|         | TC011             | TC009          |                              |
-|         | TC073             | TC075          |                              |
+| Network | TC001             | TC044          |  TC016 [1]_                  |
+|         | TC002             | TC073          |  TC018 [1]_                  |
+|         | TC009             | TC075          |                              |
+|         | TC011             |                |                              |
+|         | TC042             |                |                              |
+|         | TC043             |                |                              |
 +---------+-------------------+----------------+------------------------------+
-| Storage | TC005             | TC005          |  TC017 [1]_                  |
-|         |                   | TC063          |                              |
+| Storage | TC005             | TC063          |  TC017 [1]_                  |
 +---------+-------------------+----------------+------------------------------+
 
 .. note:: The description in this OPNFV document is intended as a reference for
diff --git a/docs/userguide/opnfv_yardstick_tc043.rst b/docs/userguide/opnfv_yardstick_tc043.rst
index b6e557d86..59d7c6993 100644
--- a/docs/userguide/opnfv_yardstick_tc043.rst
+++ b/docs/userguide/opnfv_yardstick_tc043.rst
@@ -13,7 +13,7 @@ Yardstick Test Case Description TC043
 |Network Latency Between NFVI Nodes                                           |
 |                                                                             |
 +--------------+--------------------------------------------------------------+
-|test case id  | OPNFV_YARDSTICK_TC043_Latency_between_NFVI_nodes_            |
+|test case id  | OPNFV_YARDSTICK_TC043_Latency_between_NFVI_nodes             |
 |              | measurements                                                 |
 |              |                                                              |
 +--------------+--------------------------------------------------------------+
diff --git a/docs/userguide/opnfv_yardstick_tc073.rst b/docs/userguide/opnfv_yardstick_tc073.rst
index a6499eabb..ad4526405 100644
--- a/docs/userguide/opnfv_yardstick_tc073.rst
+++ b/docs/userguide/opnfv_yardstick_tc073.rst
@@ -37,7 +37,7 @@ Yardstick Test Case Description TC073
 |              | For SLA max_mean_latency is set to 100.                      |
 |              |                                                              |
 +--------------+--------------------------------------------------------------+
-|test tool     | netperf                                                      |
+|test tool     | netperf_                                                     |
 |              | Netperf is a software application that provides network      |
 |              | bandwidth testing between two hosts on a network. It         |
 |              | supports Unix domain sockets, TCP, SCTP, DLPI and UDP via    |
diff --git a/docs/userguide/references.rst b/docs/userguide/references.rst
index 7f6a0f0f0..05729ba75 100644
--- a/docs/userguide/references.rst
+++ b/docs/userguide/references.rst
@@ -15,8 +15,8 @@ OPNFV
 * Pharos wiki: https://wiki.opnfv.org/pharos
 * VTC: https://wiki.opnfv.org/vtc
 * Yardstick CI: https://build.opnfv.org/ci/view/yardstick/
-* Yardstick and ETSI TST001 presentation: https://wiki.opnfv.org/_media/opnfv_summit_-_bridging_opnfv_and_etsi.pdf
-* Yardstick Project presentation: https://wiki.opnfv.org/_media/opnfv_summit_-_yardstick_project.pdf
+* Yardstick and ETSI TST001 presentation: https://wiki.opnfv.org/display/yardstick/Yardstick?preview=%2F2925202%2F2925205%2Fopnfv_summit_-_bridging_opnfv_and_etsi.pdf
+* Yardstick Project presentation: https://wiki.opnfv.org/display/yardstick/Yardstick?preview=%2F2925202%2F2925208%2Fopnfv_summit_-_yardstick_project.pdf
 * Yardstick wiki: https://wiki.opnfv.org/yardstick
 
 References used in Test Cases
@@ -55,6 +55,6 @@ Standards
 =========
 
 * ETSI NFV: http://www.etsi.org/technologies-clusters/technologies/nfv
-* ETSI GS-NFV TST 001: https://docbox.etsi.org/ISG/NFV/Open/Drafts/TST001_-_Pre-deployment_Validation/
+* ETSI GS-NFV TST 001: http://www.etsi.org/deliver/etsi_gs/NFV-TST/001_099/001/01.01.01_60/gs_NFV-TST001v010101p.pdf
 * RFC2544: https://www.ietf.org/rfc/rfc2544.txt