Merge "Extend vBNG PPPoE test cases functionality"

2 files changed, 425 insertions, 69 deletions

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
new file mode 100644
index 000000000..a3170048a
--- /dev/null
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_1port_congested-8.yaml
@@ -0,0 +1,412 @@
+# Copyright (c) 2018 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+schema: "nsb:traffic_profile:0.1"
+
+# This file is a template, it will be filled with values from tc.yaml before passing to the traffic generator
+
+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
+  duration: {{ duration }}
+  enable_latency: True
+
+uplink_0:
+      ipv4:
+        id: 1
+        port: xe0
+        outer_l2:
+          framesize: &uplink_framesize
+            64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
+            68B: "{{get(imix, 'imix.uplink.68B', '0') }}"
+            70B: "{{get(imix, 'imix.uplink.70B', '0') }}"
+            128B: "{{get(imix, 'imix.uplink.128B', '0') }}"
+            256B: "{{get(imix, 'imix.uplink.256B', '0') }}"
+            373B: "{{get(imix, 'imix.uplink.373B', '0') }}"
+            512B: "{{get(imix, 'imix.uplink.512B', '0') }}"
+            570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+            932B: "{{get(imix, 'imix.uplink.932B', '0') }}"
+            940B: "{{get(imix, 'imix.uplink.940B', '0') }}"
+            1024B: "{{get(imix, 'imix.uplink.1024B', '0') }}"
+            1280B: "{{get(imix, 'imix.uplink.1280B', '0') }}"
+            1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
+            1470B: "{{get(imix, 'imix.uplink.1470B', '0') }}"
+            1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
+            1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: &uplink_precedence [0, 4, 7]
+downlink_0:
+      ipv4:
+        id: 2
+        port: xe1
+        outer_l2:
+          framesize: &downlink_framesize
+            64B: "{{get(imix, 'imix.downlink.64B', '0') }}"
+            68B: "{{get(imix, 'imix.downlink.68B', '0') }}"
+            70B: "{{get(imix, 'imix.downlink.70B', '0') }}"
+            128B: "{{get(imix, 'imix.downlink.128B', '0') }}"
+            256B: "{{get(imix, 'imix.downlink.256B', '0') }}"
+            373B: "{{get(imix, 'imix.downlink.373B', '0') }}"
+            512B: "{{get(imix, 'imix.downlink.512B', '0') }}"
+            570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+            932B: "{{get(imix, 'imix.downlink.932B', '0') }}"
+            940B: "{{get(imix, 'imix.downlink.940B', '0') }}"
+            1024B: "{{get(imix, 'imix.downlink.1024B', '0') }}"
+            1280B: "{{get(imix, 'imix.downlink.1280B', '0') }}"
+            1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
+            1470B: "{{get(imix, 'imix.downlink.1470B', '0') }}"
+            1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
+            1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: &downlink_precedence [0, 4, 7]
+uplink_1:
+      ipv4:
+        id: 3
+        port: xe0
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_1:
+      ipv4:
+        id: 4
+        port: xe1
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_2:
+      ipv4:
+        id: 5
+        port: xe0
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_2:
+      ipv4:
+        id: 6
+        port: xe3
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_3:
+      ipv4:
+        id: 7
+        port: xe0
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_3:
+      ipv4:
+        id: 8
+        port: xe3
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_4:
+      ipv4:
+        id: 9
+        port: xe2
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_4:
+      ipv4:
+        id: 10
+        port: xe5
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_5:
+      ipv4:
+        id: 11
+        port: xe2
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_5:
+      ipv4:
+        id: 12
+        port: xe5
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_6:
+      ipv4:
+        id: 13
+        port: xe2
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_6:
+      ipv4:
+        id: 14
+        port: xe5
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_7:
+      ipv4:
+        id: 15
+        port: xe2
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_7:
+      ipv4:
+        id: 16
+        port: xe5
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_8:
+      ipv4:
+        id: 17
+        port: xe4
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_8:
+      ipv4:
+        id: 18
+        port: xe5
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_9:
+      ipv4:
+        id: 19
+        port: xe4
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_9:
+      ipv4:
+        id: 20
+        port: xe5
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_10:
+      ipv4:
+        id: 21
+        port: xe4
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_10:
+      ipv4:
+        id: 22
+        port: xe7
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_11:
+      ipv4:
+        id: 23
+        port: xe4
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_11:
+      ipv4:
+        id: 24
+        port: xe7
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+
+uplink_12:
+      ipv4:
+        id: 25
+        port: xe6
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_12:
+      ipv4:
+        id: 26
+        port: xe7
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_13:
+      ipv4:
+        id: 27
+        port: xe6
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_13:
+      ipv4:
+        id: 28
+        port: xe7
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_14:
+      ipv4:
+        id: 29
+        port: xe6
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_14:
+      ipv4:
+        id: 30
+        port: xe7
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
+uplink_15:
+      ipv4:
+        id: 31
+        port: xe6
+        outer_l2:
+          framesize: *uplink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *uplink_precedence
+downlink_15:
+      ipv4:
+        id: 32
+        port: xe7
+        outer_l2:
+          framesize: *downlink_framesize
+
+        outer_l3v4:
+            priority:
+              tos:
+                precedence: *downlink_precedence
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng-4.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_scale_up.yaml
index e65876c30..4f427b76a 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng-4.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vbng_scale_up.yaml
@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # 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"
 
 # This file is a template, it will be filled with values from tc.yaml before passing to the traffic generator
@@ -19,14 +22,15 @@ schema: "nsb:traffic_profile:0.1"
 name:            rfc2544
 description:     Traffic profile to run RFC2544 latency
 traffic_profile:
-  traffic_type : IXIARFC2544Profile # defines traffic behavior - constant or look for highest possible throughput
-  frame_rate : 25%  # pc of linerate
+  traffic_type : IXIARFC2544PppoeScenarioProfile # defines traffic behavior - constant or look for highest possible throughput
+  frame_rate : 12.5%  # pc of linerate
   duration: {{ duration }}
   enable_latency: True
 
-uplink_0:
+{% for i in range(svlan_per_port|int * ports|int) %}
+uplink_{{ i }}:
       ipv4:
-        id: 1
+        id: {{ (i * 2) + 1 }}
         outer_l2:
           framesize:
             64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
@@ -34,7 +38,7 @@ uplink_0:
             70B: "{{get(imix, 'imix.uplink.70B', '0') }}"
             128B: "{{get(imix, 'imix.uplink.128B', '0') }}"
             256B: "{{get(imix, 'imix.uplink.256B', '0') }}"
-            373b: "{{get(imix, 'imix.uplink.373B', '0') }}"
+            373B: "{{get(imix, 'imix.uplink.373B', '0') }}"
             512B: "{{get(imix, 'imix.uplink.512B', '0') }}"
             570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
             932B: "{{get(imix, 'imix.uplink.932B', '0') }}"
@@ -49,19 +53,10 @@ uplink_0:
         outer_l3v4:
             priority:
               tos:
-                # Precedence values:
-                # 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
                 precedence: [0, 4, 7]
-downlink_0:
+downlink_{{ i }}:
       ipv4:
-        id: 2
+        id: {{ (i * 2) + 2 }}
         outer_l2:
           framesize:
             64B: "{{get(imix, 'imix.downlink.64B', '0') }}"
@@ -69,59 +64,7 @@ downlink_0:
             70B: "{{get(imix, 'imix.downlink.70B', '0') }}"
             128B: "{{get(imix, 'imix.downlink.128B', '0') }}"
             256B: "{{get(imix, 'imix.downlink.256B', '0') }}"
-            373b: "{{get(imix, 'imix.downlink.373B', '0') }}"
-            512B: "{{get(imix, 'imix.downlink.512B', '0') }}"
-            570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
-            932B: "{{get(imix, 'imix.downlink.932B', '0') }}"
-            940B: "{{get(imix, 'imix.downlink.940B', '0') }}"
-            1024B: "{{get(imix, 'imix.downlink.1024B', '0') }}"
-            1280B: "{{get(imix, 'imix.downlink.1280B', '0') }}"
-            1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
-            1470B: "{{get(imix, 'imix.downlink.1470B', '0') }}"
-            1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
-            1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
-
-        outer_l3v4:
-            priority:
-              tos:
-                precedence: [0, 4, 7]
-uplink_1:
-      ipv4:
-        id: 3
-        outer_l2:
-          framesize:
-            64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
-            68B: "{{get(imix, 'imix.uplink.68B', '0') }}"
-            70B: "{{get(imix, 'imix.uplink.70B', '0') }}"
-            128B: "{{get(imix, 'imix.uplink.128B', '0') }}"
-            256B: "{{get(imix, 'imix.uplink.256B', '0') }}"
-            373b: "{{get(imix, 'imix.uplink.373B', '0') }}"
-            512B: "{{get(imix, 'imix.uplink.512B', '0') }}"
-            570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
-            932B: "{{get(imix, 'imix.uplink.932B', '0') }}"
-            940B: "{{get(imix, 'imix.uplink.940B', '0') }}"
-            1024B: "{{get(imix, 'imix.uplink.1024B', '0') }}"
-            1280B: "{{get(imix, 'imix.uplink.1280B', '0') }}"
-            1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
-            1470B: "{{get(imix, 'imix.uplink.1470B', '0') }}"
-            1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
-            1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
-
-        outer_l3v4:
-            priority:
-              tos:
-                precedence: [0, 4, 7]
-downlink_1:
-      ipv4:
-        id: 4
-        outer_l2:
-          framesize:
-            64B: "{{get(imix, 'imix.downlink.64B', '0') }}"
-            68B: "{{get(imix, 'imix.downlink.68B', '0') }}"
-            70B: "{{get(imix, 'imix.downlink.70B', '0') }}"
-            128B: "{{get(imix, 'imix.downlink.128B', '0') }}"
-            256B: "{{get(imix, 'imix.downlink.256B', '0') }}"
-            373b: "{{get(imix, 'imix.downlink.373B', '0') }}"
+            373B: "{{get(imix, 'imix.downlink.373B', '0') }}"
             512B: "{{get(imix, 'imix.downlink.512B', '0') }}"
             570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
             932B: "{{get(imix, 'imix.downlink.932B', '0') }}"
@@ -137,3 +80,4 @@ downlink_1:
             priority:
               tos:
                 precedence: [0, 4, 7]
+{% endfor %}