Extend vBNG PPPoE test cases functionality

Extended Ixia traffic generator with functionality to
create traffic flows between device groups.

JIRA: YARDSTICK-1521

Change-Id: Iaaa822f2f3da876629576d4101be29c9a65296d0
Signed-off-by: Oleksandr Naumets <oleksandrx.naumets@intel.com>

2 files changed, 55 insertions, 22 deletions

diff --git a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_4port_IMIX.yaml b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.yaml
index 14aa97a4a..2c2010a11 100644
--- a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_4port_IMIX.yaml
+++ b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.yaml
@@ -13,29 +13,37 @@
 # limitations under the License.
 
 ---
+{% set sessions_per_port = sessions_per_port or 4000 %}
+{% set sessions_per_svlan = sessions_per_svlan or 1000 %}
 schema: yardstick:task:0.1
+description: >
+  vBNG RFC2544 test case with QoS base line with link congestion.
+  Test case creates PPPoE sessions, runs traffic from two core ports
+  to one access port causing congestion of that port (traffic from
+  other access ports are splitting between remaining core ports)
+  and measures packets drop rate on all ports for each priority flow.
 scenarios:
 - type: NSPerf
-  traffic_profile: "../../traffic_profiles/ixia_ipv4_latency_vbng-4.yaml"
-  topology: "../agnostic/agnostic_vnf_topology_ixia_4ports.yaml"
+  traffic_profile: "../../traffic_profiles/ixia_ipv4_latency_vbng_1port_congested-8.yaml"
+  topology: "../agnostic/agnostic_vnf_topology_ixia_8ports.yaml"
   ixia_config: IxiaPppoeClient
   nodes:
     tg__0: tg_0.yardstick
     vnf__0: vnf_0.yardstick
   options:
     pppoe_client: # access network
-      sessions_per_port: 4000
-      sessions_per_svlan: 1000
+      sessions_per_port: {{ sessions_per_port }}
+      sessions_per_svlan: {{ sessions_per_svlan }}
       pap_user: 'wfnos'
       pap_password: ''
-      ip: [{'tg__0': 'xe0'}, {'tg__0': 'xe2'}]
+      ip: [{'tg__0': 'xe0'}, {'tg__0': 'xe2'}, {'tg__0': 'xe4'}, {'tg__0': 'xe6'}]
       s_vlan: 100  # s-vlan applies per device group
       c_vlan: 1000  # c-vlan applies per subscriber
     ipv4_client: # core network
       sessions_per_port: 1
       sessions_per_vlan: 1
-      ip: [{'tg__0': 'xe1'}, {'tg__0': 'xe3'}]
-      gateway_ip: [{'vnf__0': 'xe1'}, {'vnf__0': 'xe3'}]
+      ip: [{'tg__0': 'xe1'}, {'tg__0': 'xe3'}, {'tg__0': 'xe5'}, {'tg__0': 'xe7'}]
+      gateway_ip: [{'vnf__0': 'xe1'}, {'vnf__0': 'xe3'}, {'vnf__0': 'xe5'}, {'vnf__0': 'xe7'}]
       vlan: 101
       bgp:
         bgp_type: external
@@ -45,8 +53,8 @@ scenarios:
       uplink: {70B: 33, 940B: 33, 1470B: 34}
       downlink: {68B: 3, 932B: 1, 1470B: 96}
     flow:
-      src_ip: [{'tg__0': 'xe0'}, {'tg__0': 'xe2'}]
-      dst_ip: [{'tg__0': 'xe1'}, {'tg__0': 'xe3'}]
+      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:
@@ -59,4 +67,4 @@ context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/pod_ixia_4port.yaml
+  file: /etc/yardstick/nodes/pod_ixia.yaml
diff --git a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX.yaml b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.yaml
index 5fbe0c70a..f0696ab24 100644
--- a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX.yaml
+++ b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.yaml
@@ -13,41 +13,66 @@
 # limitations under the License.
 
 ---
+{% set sessions_per_port = sessions_per_port or 4000 %}
+{% set sessions_per_svlan = sessions_per_svlan or 1000 %}
+{% set vports = vports or 2 %}
+{% set svlans_per_port = sessions_per_port / sessions_per_svlan %}
 schema: yardstick:task:0.1
+description: >
+  vBNG RFC2544 test case with QoS base line without link congestion.
+  Test case creates PPPoE sessions, runs traffic on maximum throughput
+  and measures packets drop rate on all ports for each priority flow.
 scenarios:
 - type: NSPerf
-  traffic_profile: "../../traffic_profiles/ixia_ipv4_latency_vbng-4.yaml"
-  topology: "../agnostic/agnostic_vnf_topology_ixia_2ports.yaml"
+  traffic_profile: "../../traffic_profiles/ixia_ipv4_latency_vbng_scale_up.yaml"
+  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:
     pppoe_client: # access network
-      sessions_per_port: 4000
-      sessions_per_svlan: 1000
+      sessions_per_port: {{ sessions_per_port }}
+      sessions_per_svlan: {{ sessions_per_svlan }}
       pap_user: 'wfnos'
       pap_password: ''
-      ip: [{'tg__0': 'xe0'}]
+      ip:
+{% for vnf_num in range(0, vports|int, 2) %}
+        - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
       s_vlan: 100  # s-vlan applies per device group
       c_vlan: 1000  # c-vlan applies per subscriber
     ipv4_client: # core network
       sessions_per_port: 1
       sessions_per_vlan: 1
-      ip: [{'tg__0': 'xe1'}]
-      gateway_ip: [{'vnf__0': 'xe1'}]
-      prefix: '24'
+      ip:
+{% for vnf_num in range(1, vports|int, 2) %}
+        - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+      gateway_ip:
+{% for vnf_num in range(1, vports|int, 2) %}
+        - {'vnf__0': 'xe{{ vnf_num }}'}
+{% endfor %}
       vlan: 101
       bgp:
         bgp_type: external
         dut_ip: 10.0.0.3
         as_number: 65000
     framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
+      uplink: {70B: 33, 940B: 33, 1470B: 34}
+      downlink: {68B: 3, 932B: 1, 1470B: 96}
     flow:
-      src_ip: [{'tg__0': 'xe0'}]
-      dst_ip: [{'tg__0': 'xe1'}]
+      src_ip:
+{% for vnf_num in range(0, vports|int, 2) %}
+        - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+      dst_ip:
+{% for vnf_num in range(1, vports|int, 2) %}
+        - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
       count: 1
     traffic_type: 4
     rfc2544: