Merge "Add vBNG test cases stats processing functionality"

4 files changed, 157 insertions, 144 deletions

diff --git a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.yaml b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.yaml
index 2c2010a11..441886224 100644
--- a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.yaml
+++ b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.yaml
@@ -15,6 +15,9 @@
 ---
 {% set sessions_per_port = sessions_per_port or 4000 %}
 {% set sessions_per_svlan = sessions_per_svlan or 1000 %}
+{% set duration = duration or 60 %}
+{% set tolerance_low = tolerance_low or 0.0001 %}
+{% set tolerance_high = tolerance_high or 0.0001 %}
 schema: yardstick:task:0.1
 description: >
   vBNG RFC2544 test case with QoS base line with link congestion.
@@ -31,10 +34,11 @@ scenarios:
     tg__0: tg_0.yardstick
     vnf__0: vnf_0.yardstick
   options:
+    duration: {{ duration }}
     pppoe_client: # access network
       sessions_per_port: {{ sessions_per_port }}
       sessions_per_svlan: {{ sessions_per_svlan }}
-      pap_user: 'wfnos'
+      pap_user: 'pppoe_user'
       pap_password: ''
       ip: [{'tg__0': 'xe0'}, {'tg__0': 'xe2'}, {'tg__0': 'xe4'}, {'tg__0': 'xe6'}]
       s_vlan: 100  # s-vlan applies per device group
@@ -52,17 +56,27 @@ scenarios:
     framesize:
       uplink: {70B: 33, 940B: 33, 1470B: 34}
       downlink: {68B: 3, 932B: 1, 1470B: 96}
+    priority:
+      # 0 - (000) Routine
+      # 1 - (001) Priority
+      # 2 - (010) Immediate
+      # 3 - (011) Flash
+      # 4 - (100) Flash Override
+      # 5 - (101) CRITIC/ECP
+      # 6 - (110) Internetwork Control
+      # 7 - (111) Network Control
+      tos: {precedence: [0, 4, 7]}
     flow:
       src_ip: [{'tg__0': 'xe0'}, {'tg__0': 'xe2'}, {'tg__0': 'xe4'}, {'tg__0': 'xe6'}]
       dst_ip: [{'tg__0': 'xe1'}, {'tg__0': 'xe3'}, {'tg__0': 'xe5'}, {'tg__0': 'xe7'}]
       count: 1
     traffic_type: 4
     rfc2544:
-      allowed_drop_rate: 0.0001 - 0.0001
+      allowed_drop_rate: "{{ tolerance_low }} - {{ tolerance_high }}"
   runner:
     type: Iteration
-    iterations: 10
-    interval: 75
+    iterations: 1
+    interval: {{ duration + 15 }}
 context:
   type: Node
   name: yardstick
diff --git a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.yaml b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.yaml
index f0696ab24..afd60cc69 100644
--- a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.yaml
+++ b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.yaml
@@ -15,8 +15,10 @@
 ---
 {% set sessions_per_port = sessions_per_port or 4000 %}
 {% set sessions_per_svlan = sessions_per_svlan or 1000 %}
+{% set duration = duration or 60 %}
 {% set vports = vports or 2 %}
-{% set svlans_per_port = sessions_per_port / sessions_per_svlan %}
+{% set tolerance_low = tolerance_low or 0.0001 %}
+{% set tolerance_high = tolerance_high or 0.0001 %}
 schema: yardstick:task:0.1
 description: >
   vBNG RFC2544 test case with QoS base line without link congestion.
@@ -28,16 +30,16 @@ scenarios:
   topology: "../agnostic/agnostic_vnf_topology_ixia_{{ vports }}ports.yaml"
   ixia_config: IxiaPppoeClient
   extra_args:
-    svlans_per_port: {{ svlans_per_port|int }}
     access_vports_num: {{ vports|int / 2 }}
   nodes:
     tg__0: tg_0.yardstick
     vnf__0: vnf_0.yardstick
   options:
+    duration: {{ duration }}
     pppoe_client: # access network
       sessions_per_port: {{ sessions_per_port }}
       sessions_per_svlan: {{ sessions_per_svlan }}
-      pap_user: 'wfnos'
+      pap_user: 'pppoe_user'
       pap_password: ''
       ip:
 {% for vnf_num in range(0, vports|int, 2) %}
@@ -64,6 +66,16 @@ scenarios:
     framesize:
       uplink: {70B: 33, 940B: 33, 1470B: 34}
       downlink: {68B: 3, 932B: 1, 1470B: 96}
+    priority:
+      # 0 - (000) Routine
+      # 1 - (001) Priority
+      # 2 - (010) Immediate
+      # 3 - (011) Flash
+      # 4 - (100) Flash Override
+      # 5 - (101) CRITIC/ECP
+      # 6 - (110) Internetwork Control
+      # 7 - (111) Network Control
+      tos: {precedence: [0, 4, 7]}
     flow:
       src_ip:
 {% for vnf_num in range(0, vports|int, 2) %}
@@ -76,11 +88,11 @@ scenarios:
       count: 1
     traffic_type: 4
     rfc2544:
-      allowed_drop_rate: 0.0001 - 0.0001
+      allowed_drop_rate: "{{ tolerance_low }} - {{ tolerance_high }}"
   runner:
     type: Iteration
     iterations: 10
-    interval: 75
+    interval: {{ duration + 15 }}
 context:
   type: Node
   name: yardstick
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_1port_congested-8.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_1port_congested-8.yaml
index a3170048a..77bc55751 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_1port_congested-8.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_1port_congested-8.yaml
@@ -25,9 +25,10 @@ traffic_profile:
   duration: {{ duration }}
   enable_latency: True
 
-uplink_0:
+uplink_0:  # traffic flow from xe0 to xe1
       ipv4:
         id: 1
+        frame_rate: 25%
         port: xe0
         outer_l2:
           framesize: &uplink_framesize
@@ -49,12 +50,17 @@ uplink_0:
             1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
 
         outer_l3v4:
-            priority:
+            priority: &uplink_precedence
+              {% if priority %}
+              {{ priority }}
+              {% else %}
               tos:
-                precedence: &uplink_precedence [0, 4, 7]
-downlink_0:
+                precedence: [0, 4, 7]
+              {% endif %}
+downlink_0:  # traffic flow from xe1 to xe0
       ipv4:
         id: 2
+        frame_rate: 50%
         port: xe1
         outer_l2:
           framesize: &downlink_framesize
@@ -76,337 +82,311 @@ downlink_0:
             1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
 
         outer_l3v4:
-            priority:
+            priority: &downlink_precedence
+              {% if priority %}
+              {{ priority }}
+              {% else %}
               tos:
-                precedence: &downlink_precedence [0, 4, 7]
-uplink_1:
+                precedence: [0, 4, 7]
+              {% endif %}
+uplink_1:  # traffic flow from xe0 to xe1
       ipv4:
         id: 3
+        frame_rate: 25%
         port: xe0
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_1:
+            priority: *uplink_precedence
+downlink_1:  # traffic flow from xe1 to xe0
       ipv4:
         id: 4
+        frame_rate: 50%
         port: xe1
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_2:
+            priority: *downlink_precedence
+uplink_2:  # traffic flow from xe0 to xe3
       ipv4:
         id: 5
+        frame_rate: 25%
         port: xe0
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_2:
+            priority: *uplink_precedence
+downlink_2:  # traffic flow from xe3 to xe0
       ipv4:
         id: 6
+        frame_rate: 50%
         port: xe3
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_3:
+            priority: *downlink_precedence
+uplink_3:  # traffic flow from xe0 to xe3
       ipv4:
         id: 7
+        frame_rate: 25%
         port: xe0
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_3:
+            priority: *uplink_precedence
+downlink_3:  # traffic flow from xe3 to xe0
       ipv4:
         id: 8
+        frame_rate: 50%
         port: xe3
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_4:
+            priority: *downlink_precedence
+uplink_4:  # traffic flow from xe2 to xe5
       ipv4:
         id: 9
+        frame_rate: 25%
         port: xe2
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_4:
+            priority: *uplink_precedence
+downlink_4:  # traffic flow from xe5 to xe2
       ipv4:
         id: 10
+        frame_rate: 7%
         port: xe5
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_5:
+            priority: *downlink_precedence
+uplink_5:  # traffic flow from xe2 to xe5
       ipv4:
         id: 11
+        frame_rate: 25%
         port: xe2
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_5:
+            priority: *uplink_precedence
+downlink_5:  # traffic flow from xe5 to xe2
       ipv4:
         id: 12
+        frame_rate: 7%
         port: xe5
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_6:
+            priority: *downlink_precedence
+uplink_6:  # traffic flow from xe2 to xe5
       ipv4:
         id: 13
+        frame_rate: 25%
         port: xe2
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_6:
+            priority: *uplink_precedence
+downlink_6:  # traffic flow from xe5 to xe2
       ipv4:
         id: 14
+        frame_rate: 7%
         port: xe5
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_7:
+            priority: *downlink_precedence
+uplink_7:  # traffic flow from xe2 to xe5
       ipv4:
         id: 15
+        frame_rate: 25%
         port: xe2
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_7:
+            priority: *uplink_precedence
+downlink_7:  # traffic flow from xe5 to xe2
       ipv4:
         id: 16
+        frame_rate: 7%
         port: xe5
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_8:
+            priority: *downlink_precedence
+uplink_8:  # traffic flow from xe4 to xe5
       ipv4:
         id: 17
+        frame_rate: 25%
         port: xe4
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_8:
+            priority: *uplink_precedence
+downlink_8:  # traffic flow from xe5 to xe4
       ipv4:
         id: 18
+        frame_rate: 7%
         port: xe5
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_9:
+            priority: *downlink_precedence
+uplink_9:  # traffic flow from xe4 to xe5
       ipv4:
         id: 19
+        frame_rate: 25%
         port: xe4
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_9:
+            priority: *uplink_precedence
+downlink_9:  # traffic flow from xe5 to xe4
       ipv4:
         id: 20
+        frame_rate: 7%
         port: xe5
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_10:
+            priority: *downlink_precedence
+uplink_10:  # traffic flow from xe4 to xe7
       ipv4:
         id: 21
+        frame_rate: 25%
         port: xe4
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_10:
+            priority: *uplink_precedence
+downlink_10:  # traffic flow from xe7 to xe4
       ipv4:
         id: 22
+        frame_rate: 7%
         port: xe7
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_11:
+            priority: *downlink_precedence
+uplink_11:  # traffic flow from xe4 to xe7
       ipv4:
         id: 23
+        frame_rate: 25%
         port: xe4
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_11:
+            priority: *uplink_precedence
+downlink_11:  # traffic flow from xe7 to xe4
       ipv4:
         id: 24
+        frame_rate: 7%
         port: xe7
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
+            priority: *downlink_precedence
 
-uplink_12:
+uplink_12:  # traffic flow from xe6 to xe7
       ipv4:
         id: 25
+        frame_rate: 25%
         port: xe6
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_12:
+            priority: *uplink_precedence
+downlink_12:  # traffic flow from xe7 to xe6
       ipv4:
         id: 26
+        frame_rate: 7%
         port: xe7
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_13:
+            priority: *downlink_precedence
+uplink_13:  # traffic flow from xe6 to xe7
       ipv4:
         id: 27
+        frame_rate: 25%
         port: xe6
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_13:
+            priority: *uplink_precedence
+downlink_13:  # traffic flow from xe7 to xe6
       ipv4:
         id: 28
+        frame_rate: 7%
         port: xe7
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_14:
+            priority: *downlink_precedence
+uplink_14:  # traffic flow from xe6 to xe7
       ipv4:
         id: 29
+        frame_rate: 25%
         port: xe6
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_14:
+            priority: *uplink_precedence
+downlink_14:  # traffic flow from xe7 to xe6
       ipv4:
         id: 30
+        frame_rate: 7%
         port: xe7
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
-uplink_15:
+            priority: *downlink_precedence
+uplink_15:  # traffic flow from xe6 to xe7
       ipv4:
         id: 31
+        frame_rate: 25%
         port: xe6
         outer_l2:
           framesize: *uplink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *uplink_precedence
-downlink_15:
+            priority: *uplink_precedence
+downlink_15:  # traffic flow from xe7 to xe6
       ipv4:
         id: 32
+        frame_rate: 7%
         port: xe7
         outer_l2:
           framesize: *downlink_framesize
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: *downlink_precedence
+            priority: *downlink_precedence
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_scale_up.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_scale_up.yaml
index 4f427b76a..91658a586 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_scale_up.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_scale_up.yaml
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 ---
-{% set svlan_per_port = get(extra_args, 'svlans_per_port') %}
 {% set ports = get(extra_args, 'access_vports_num')|int %}
 schema: "nsb:traffic_profile:0.1"
 
@@ -23,11 +22,11 @@ name:            rfc2544
 description:     Traffic profile to run RFC2544 latency
 traffic_profile:
   traffic_type : IXIARFC2544PppoeScenarioProfile # defines traffic behavior - constant or look for highest possible throughput
-  frame_rate : 12.5%  # pc of linerate
+  frame_rate : 100%  # pc of linerate
   duration: {{ duration }}
   enable_latency: True
 
-{% for i in range(svlan_per_port|int * ports|int) %}
+{% for i in range(ports|int) %}
 uplink_{{ i }}:
       ipv4:
         id: {{ (i * 2) + 1 }}
@@ -51,9 +50,13 @@ uplink_{{ i }}:
             1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: [0, 4, 7]
+          priority:
+            {% if priority %}
+            {{ priority }}
+            {% else %}
+            tos:
+              precedence: [0, 4, 7]
+            {% endif %}
 downlink_{{ i }}:
       ipv4:
         id: {{ (i * 2) + 2 }}
@@ -77,7 +80,11 @@ downlink_{{ i }}:
             1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
 
         outer_l3v4:
-            priority:
-              tos:
-                precedence: [0, 4, 7]
+          priority:
+            {% if priority %}
+            {{ priority }}
+            {% else %}
+            tos:
+              precedence: [0, 4, 7]
+            {% endif %}
 {% endfor %}