Merge "Add test case description and task file for TC044"

3 files changed, 86 insertions, 90 deletions

diff --git a/docs/userguide/opnfv_yardstick_tc044.rst b/docs/userguide/opnfv_yardstick_tc044.rst
new file mode 100644
index 000000000..2be8517a1
--- /dev/null
+++ b/docs/userguide/opnfv_yardstick_tc044.rst
@@ -0,0 +1,82 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International
+.. License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) OPNFV, Huawei Technologies Co.,Ltd and others.
+
+*************************************
+Yardstick Test Case Description TC044
+*************************************
+
+.. _man-pages: http://manpages.ubuntu.com/manpages/trusty/en/man1/free.1.html
+
++-----------------------------------------------------------------------------+
+|Memory Utilization                                                           |
+|                                                                             |
++--------------+--------------------------------------------------------------+
+|test case id  | OPNFV_YARDSTICK_TC044_Memory Utilization                     |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|metric        | Memory utilization                                           |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|test purpose  | To evaluate the IaaS compute capability with regards to      |
+|              | memory utilization.This test case should be run in parallel  |
+|              | to other Yardstick test cases and not run as a stand-alone   |
+|              | test case.                                                   |
+|              | Measure the memory usage statistics including used memory,   |
+|              | free memory, buffer, cache and shared memory.                |
+|              | Both average and maximun values are obtained.                |
+|              | The purpose is also to be able to spot trends.               |
+|              | Test results, graphs and similar shall be stored for         |
+|              | comparison reasons and product evolution understanding       |
+|              | between different OPNFV versions and/or configurations.      |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|configuration | File: memload.yaml (in the 'samples' directory)              |
+|              |                                                              |
+|              | * interval: 1 - repeat, pausing every 1 seconds in-between.  |
+|              | * count: 10 - display statistics 10 times, then exit.        |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|test tool     | free                                                         |
+|              |                                                              |
+|              | free provides information about unused and used memory and   |
+|              | swap space on any computer running Linux or another Unix-like|
+|              | operating system.                                            |
+|              | free is normally part of a Linux distribution, hence it      |
+|              | doesn't needs to be installed.                               |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|references    | man-pages_                                                   |
+|              |                                                              |
+|              | ETSI-NFV-TST001                                              |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|applicability | Test can be configured with different:                       |
+|              |                                                              |
+|              |  * interval;                                                 |
+|              |  * count;                                                    |
+|              |  * runner Iteration and intervals.                           |
+|              |                                                              |
+|              | There are default values for each above-mentioned option.    |
+|              | Run in background with other test cases.                     |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|pre-test      | The test case image needs to be installed into Glance        |
+|conditions    | with free included in the image.                             |
+|              |                                                              |
+|              | No POD specific requirements have been identified.           |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|test sequence | description and expected result                              |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|step 1        | The host is installed as client. The related TC, or TCs, is  |
+|              | invoked and free logs are produced and stored.               |
+|              |                                                              |
+|              | Result: logs are stored.                                     |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
+|test verdict  | None. Memory utilization results are fetched and stored.     |
+|              |                                                              |
++--------------+--------------------------------------------------------------+
diff --git a/samples/memload.yaml b/samples/memload.yaml
index 0acba21b1..87d727707 100644
--- a/samples/memload.yaml
+++ b/samples/memload.yaml
@@ -9,13 +9,14 @@ scenarios:
   type: MEMORYload
   options:
     interval: 1
-    count: 1
+    count: 10
 
   host: kratos.demo
 
   runner:
-    type: Duration
-    duration: 60
+    type: Iteration
+    iterations: 5
+    interval: 1
 
 context:
   name: demo
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc044.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc044.yaml
deleted file mode 100644
index d7406832d..000000000
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc044.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
----
-# Yardstick TC044 config file
-# Measure memory usage statistics, network throughput, latency and packet loss.
-# Different amounts of flows are tested with, from 2 up to 1001000.
-# All tests are run 2 times each. First 2 times with the least
-# amount of ports, then 2 times with the next amount of ports,
-# and so on until all packet sizes have been run with.
-#
-# During the measurements memory usage statistics and network latency are
-# recorded/measured using sar and ping, respectively.
-
-schema: "yardstick:task:0.1"
-
-scenarios:
--
-  type: MEMORYload
-  run_in_background: true
-
-  options:
-    interval: 1
-    count: 1
-
-  host: demeter.yardstick-TC044
--
-  type: MEMORYload
-  run_in_background: true
-
-  options:
-    interval: 1
-    count: 1
-
-  host: poseidon.yardstick-TC044
--
-  type: Ping
-  run_in_background: true
-
-  options:
-    packetsize: 100
-
-  host: demeter.yardstick-TC044
-  target: poseidon.yardstick-TC044
-
-  sla:
-    max_rtt: 10
-    action: monitor
-{% for num_ports in [1, 10, 50, 100, 300, 500, 750, 1000] %}
--
-  type: Pktgen
-  options:
-    packetsize: 64
-    number_of_ports: {{num_ports}}
-    duration: 20
-
-  host: demeter.yardstick-TC044
-  target: poseidon.yardstick-TC044
-
-  runner:
-    type: Iteration
-    iterations: 2
-    interval: 1
-
-  sla:
-    max_ppm: 1000
-    action: monitor
-{% endfor %}
-
-context:
-  name: yardstick-TC044
-  image: yardstick-trusty-server
-  flavor: yardstick-flavor
-  user: ubuntu
-
-  placement_groups:
-    pgrp1:
-      policy: "availability"
-
-  servers:
-    demeter:
-      floating_ip: true
-      placement: "pgrp1"
-    poseidon:
-      floating_ip: true
-      placement: "pgrp1"
-
-  networks:
-    test:
-      cidr: '10.0.1.0/24'