Fix description for TC037 and TC038

Update rst files for TC037 and TC038 for latest template format.
Added TC037 and TC038 to index of test cases in 03-list-of-tcs.

JIRA: -

Change-Id: I32657b564ff1c393f8048a74e676b3f5791d6d0d
Signed-by: Ana C <ana.cunha@ericsson.com>

3 files changed, 68 insertions, 44 deletions

diff --git a/docs/yardstick/03-list-of-tcs.rst b/docs/yardstick/03-list-of-tcs.rst
index d2abf4e25..9e951ffab 100644
--- a/docs/yardstick/03-list-of-tcs.rst
+++ b/docs/yardstick/03-list-of-tcs.rst
@@ -26,6 +26,8 @@ Generic NFVI Test Case Descriptions
    opnfv_yardstick_tc009.rst
    opnfv_yardstick_tc010.rst
    opnfv_yardstick_tc012.rst
+   opnfv_yardstick_tc037.rst
+   opnfv_yardstick_tc038.rst
 
 OPNFV Feature Test Cases
 ========================
diff --git a/docs/yardstick/opnfv_yardstick_tc037.rst b/docs/yardstick/opnfv_yardstick_tc037.rst
index 32e1e6e1b..5c91f6bf1 100644
--- a/docs/yardstick/opnfv_yardstick_tc037.rst
+++ b/docs/yardstick/opnfv_yardstick_tc037.rst
@@ -1,12 +1,19 @@
 *************************************
 Yardstick Test Case Description TC037
 *************************************
+
+.. _cirros: https://download.cirros-cloud.net
+.. _pktgen: https://www.kernel.org/doc/Documentation/networking/pktgen.txt
+
 +-----------------------------------------------------------------------------+
-|Network Performance                                                          |
-+==============+==============================================================+
-|test case id  | OPNFV_YARDSTICK_TC037_NW PERF                                |
+|Latency, CPU Load, Throughput, Packet Loss                                   |
+|                                                                             |
++--------------+--------------------------------------------------------------+
+|test case id  | OPNFV_YARDSTICK_TC037_Latency,CPU Load,Throughput,Packet Loss|
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |metric        | Number of flows, latency, throughput, CPU load, packet loss  |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |test purpose  | To evaluate the IaaS network performance with regards to     |
 |              | flows and throughput, such as if and how different amounts   |
@@ -19,22 +26,20 @@ Yardstick Test Case Description TC037
 |              | graphs ans similar shall be stored for comparison reasons and|
 |              | product evolution understanding between different OPNFV      |
 |              | versions and/or configurations.                              |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |configuration | file: opnfv_yardstick_tc037.yaml                             |
 |              |                                                              |
 |              | Packet size: 64 bytes                                        |
-|              |                                                              |
 |              | Number of ports: 1, 10, 50, 100, 300, 500, 750 and 1000.     |
 |              | The amount configured ports map from 2 up to 1001000 flows,  |
 |              | respectively. Each port amount is run two times, for 20      |
 |              | seconds each. Then the next port_amount is run, and so on.   |
-|              |                                                              |
 |              | During the test CPU load on both client and server, and the  |
 |              | network latency between the client and server are measured.  |
-|              |                                                              |
 |              | The client and server are distributed on different HW.       |
-|              |                                                              |
 |              | For SLA max_ppm is set to 1000.                              |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |test tool     | pktgen                                                       |
 |              |                                                              |
@@ -49,40 +54,46 @@ Yardstick Test Case Description TC037
 |              | Ping is normally part of any Linux distribution, hence it    |
 |              | doesn't need to be installed. It is also part of the         |
 |              | Yardstick Glance image.                                      |
-|              | (For example also a Cirros image can be downloaded from      |
-|              | https://download.cirros-cloud.net, it includes ping)         |
+|              | (For example also a cirros_ image can be downloaded, it      |
+|              | includes ping)                                               |
 |              |                                                              |
 |              | mpstat                                                       |
 |              |                                                              |
 |              | (Mpstat is not always part of a Linux distribution, hence it |
 |              | needs to be installed. It is part of the Yardstick Glance    |
 |              | image.                                                       |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |references    | Ping and Mpstat man pages                                    |
 |              |                                                              |
-|              |https://www.kernel.org/doc/Documentation/networking/pktgen.txt|
+|              | pktgen_                                                      |
+|              |                                                              |
+|              | ETSI-NFV-TST001                                              |
 |              |                                                              |
-|              |ETSI-NFV-TST037                                               |
 +--------------+--------------------------------------------------------------+
 |applicability | Test can be configured with different packet sizes, amount   |
 |              | of flows and test duration. Default values exist.            |
 |              |                                                              |
-|              |SLA (optional):                                               |
-|              |    max_ppm: The number of packets per million packets sent   |
-|              |             that are acceptable to lose, i.e. not received.  |
+|              | SLA (optional): max_ppm: The number of packets per million   |
+|              | packets sent that are acceptable to loose, not received.     |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |pre-test      | The test case image needs to be installed into Glance        |
 |conditions    | with pktgen included in it.                                  |
 |              |                                                              |
 |              | No POD specific requirements have been identified.           |
-+--------------+------+----------------------------------+--------------------+
-|test sequence | step | description                      | result             |
-|              +------+----------------------------------+--------------------+
-|              |  1   | The hosts are installed, as      | Logs are stored    |
-|              |      | server and client. pktgen is     |                    |
-|              |      | invoked and logs are produced    |                    |
-|              |      | and stored.                      |                    |
-+--------------+------+----------------------------------+--------------------+
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|test sequence | description and expected result                              |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|step 1        | The hosts are installed, as server and client. pktgen is     |
+|              | invoked and logs are produced  and stored.                   |
+|              |                                                              |
+|              | Result: Logs are stored.                                     |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
 |test verdict  | Fails only if SLA is not passed, or if there is a test case  |
 |              | execution problem.                                           |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
diff --git a/docs/yardstick/opnfv_yardstick_tc038.rst b/docs/yardstick/opnfv_yardstick_tc038.rst
index 583555ede..93c2cf3d8 100644
--- a/docs/yardstick/opnfv_yardstick_tc038.rst
+++ b/docs/yardstick/opnfv_yardstick_tc038.rst
@@ -1,12 +1,19 @@
 *************************************
 Yardstick Test Case Description TC038
 *************************************
+
+.. _cirros: https://download.cirros-cloud.net
+.. _pktgen: https://www.kernel.org/doc/Documentation/networking/pktgen.txt
+
 +-----------------------------------------------------------------------------+
-|Network Performance                                                          |
-+==============+==============================================================+
-|test case id  | OPNFV_YARDSTICK_TC038_NW PERF                                |
+|Latency, CPU Load, Throughput, Packet Loss (Extended measurements)           |
+|                                                                             |
++--------------+--------------------------------------------------------------+
+|test case id  | OPNFV_YARDSTICK_TC038_Latency,CPU Load,Throughput,Packet Loss|
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |metric        | Number of flows, latency, throughput, CPU load, packet loss  |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |test purpose  | To evaluate the IaaS network performance with regards to     |
 |              | flows and throughput, such as if and how different amounts   |
@@ -19,22 +26,20 @@ Yardstick Test Case Description TC038
 |              | graphs ans similar shall be stored for comparison reasons and|
 |              | product evolution understanding between different OPNFV      |
 |              | versions and/or configurations.                              |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |configuration | file: opnfv_yardstick_tc038.yaml                             |
 |              |                                                              |
 |              | Packet size: 64 bytes                                        |
-|              |                                                              |
 |              | Number of ports: 1, 10, 50, 100, 300, 500, 750 and 1000.     |
 |              | The amount configured ports map from 2 up to 1001000 flows,  |
 |              | respectively. Each port amount is run ten times, for 20      |
 |              | seconds each. Then the next port_amount is run, and so on.   |
-|              |                                                              |
 |              | During the test CPU load on both client and server, and the  |
 |              | network latency between the client and server are measured.  |
-|              |                                                              |
 |              | The client and server are distributed on different HW.       |
-|              |                                                              |
 |              | For SLA max_ppm is set to 1000.                              |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |test tool     | pktgen                                                       |
 |              |                                                              |
@@ -49,40 +54,46 @@ Yardstick Test Case Description TC038
 |              | Ping is normally part of any Linux distribution, hence it    |
 |              | doesn't need to be installed. It is also part of the         |
 |              | Yardstick Glance image.                                      |
-|              | (For example also a Cirros image can be downloaded from      |
-|              | https://download.cirros-cloud.net, it includes ping)         |
+|              | (For example also a cirros_ image can be downloaded, it      |
+|              | includes ping)                                               |
 |              |                                                              |
 |              | mpstat                                                       |
 |              |                                                              |
 |              | (Mpstat is not always part of a Linux distribution, hence it |
 |              | needs to be installed. It is part of the Yardstick Glance    |
 |              | image.                                                       |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |references    | Ping and Mpstat man pages                                    |
 |              |                                                              |
-|              |https://www.kernel.org/doc/Documentation/networking/pktgen.txt|
+|              | pktgen_                                                      |
+|              |                                                              |
+|              | ETSI-NFV-TST001                                              |
 |              |                                                              |
-|              |ETSI-NFV-TST038                                               |
 +--------------+--------------------------------------------------------------+
 |applicability | Test can be configured with different packet sizes, amount   |
 |              | of flows and test duration. Default values exist.            |
 |              |                                                              |
-|              |SLA (optional):                                               |
-|              |    max_ppm: The number of packets per million packets sent   |
-|              |             that are acceptable to lose, i.e. not received.  |
+|              | SLA (optional): max_ppm: The number of packets per million   |
+|              | packets sent that are acceptable to loose, not received.     |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |pre-test      | The test case image needs to be installed into Glance        |
 |conditions    | with pktgen included in it.                                  |
 |              |                                                              |
 |              | No POD specific requirements have been identified.           |
-+--------------+------+----------------------------------+--------------------+
-|test sequence | step | description                      | result             |
-|              +------+----------------------------------+--------------------+
-|              |  1   | The hosts are installed, as      | Logs are stored    |
-|              |      | server and client. pktgen is     |                    |
-|              |      | invoked and logs are produced    |                    |
-|              |      | and stored.                      |                    |
-+--------------+------+----------------------------------+--------------------+
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|test sequence | description and expected result                              |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|step 1        | The hosts are installed, as server and client. pktgen is     |
+|              | invoked and logs are produced  and stored.                   |
+|              |                                                              |
+|              | Result: Logs are stored.                                     |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
 |test verdict  | Fails only if SLA is not passed, or if there is a test case  |
 |              | execution problem.                                           |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+