Update the traffic profile to support sample multi-port

Change-Id: Iaf8b3e0aa3855443b0628573a1df98d177f27c76
Signed-off-by: Deepak S <deepak.s@linux.intel.com>

5 files changed, 62 insertions, 0 deletions

diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml
index 215433b54..75927d40d 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml
@@ -50,6 +50,7 @@ traffic_profile:
 [% for vnf_num in range(num_vnfs|int) %]
 uplink_[[ vnf_num ]]:
   ipv4:
+    id: [[vnf_num * 2 + 1]]
     outer_l2:
       framesize:
         64B: "{{ get(imix, 'imix.uplink.64B', '0') }}"
@@ -74,6 +75,7 @@ uplink_[[ vnf_num ]]:
       count: "{{get(flow, 'flow.count', '1') }}"
 downlink_[[ vnf_num ]]:
   ipv4:
+    id: [[vnf_num * 2 + 2]]
     outer_l2:
       framesize:
         64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml
index 821c3c830..dbf366f75 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml
@@ -50,6 +50,7 @@ traffic_profile:
 [% for vnf_num in range(num_vnfs|int) %]
 uplink_[[ vnf_num ]]:
   ipv4:
+    id: [[vnf_num * 2 + 1]]
     outer_l2:
       framesize:
         64B: "{{ get(imix, 'imix.uplink.64B', '0') }}"
@@ -74,6 +75,7 @@ uplink_[[ vnf_num ]]:
       count: "{{get(flow, 'flow.count', '1') }}"
 downlink_[[ vnf_num ]]:
   ipv4:
+    id: [[vnf_num * 2 + 2]]
     outer_l2:
       framesize:
         64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml
index 7d51122f4..4e72fde1a 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml
@@ -47,6 +47,7 @@ traffic_profile:
 
 uplink_0:
       ipv4:
+        id: 1
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
@@ -72,6 +73,7 @@ uplink_0:
             count: "{{get(flow, 'flow.count', '1') }}"
 downlink_0:
       ipv4:
+        id: 2
         outer_l2:
             framesize:
                 64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
@@ -95,3 +97,55 @@ downlink_0:
             srcport: "{{get(flow, 'flow.dst_port_0', '1234-4321') }}"
             dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
+uplink_1:
+      ipv4:
+        id: 3
+        outer_l2:
+            framesize:
+                64B: "{{get(imix, 'imix.uplink.64B', '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') }}"
+                1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
+                1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
+                1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
+
+        outer_l3v4:
+            proto: "udp"
+            srcip4: "{{get(flow, 'flow.src_ip_1', '10.0.2.1-10.0.2.255') }}"
+            dstip4: "{{get(flow, 'flow.dst_ip_1', '10.0.3.1-10.0.3.255') }}"
+            count: "{{get(flow, 'flow.count', '1') }}"
+            ttl: 32
+            dscp: 0
+        outer_l4:
+            srcport: "{{get(flow, 'flow.src_port_1', '1234-4321') }}"
+            dstport: "{{get(flow, 'flow.dst_port_1', '2001-4001') }}"
+            count: "{{get(flow, 'flow.count', '1') }}"
+downlink_1:
+      ipv4:
+        id: 4
+        outer_l2:
+            framesize:
+                64B: "{{ get(imix, 'imix.downlink.64B', '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') }}"
+                1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
+                1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
+                1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
+
+        outer_l3v4:
+            proto: "udp"
+            srcip4: "{{get(flow, 'flow.dst_ip_1', '10.0.3.1-10.0.3.255') }}"
+            dstip4: "{{get(flow, 'flow.src_ip_1', '10.0.2.1-10.0.2.255') }}"
+            count: "{{get(flow, 'flow.count', '1') }}"
+            ttl: 32
+            dscp: 0
+        outer_l4:
+            srcport: "{{get(flow, 'flow.dst_port_1', '1234-4321') }}"
+            dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}"
+            count: "{{get(flow, 'flow.count', '1') }}"
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
index 60a78a0c6..4aa78e713 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
@@ -47,6 +47,7 @@ traffic_profile:
 
 uplink_0:
       ipv4:
+        id: 1
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
@@ -72,6 +73,7 @@ uplink_0:
             count: "{{get(flow, 'flow.count', '1') }}"
 downlink_0:
       ipv4:
+        id: 2
         outer_l2:
             framesize:
                 64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
index 8bac32404..20bc6568d 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
@@ -47,6 +47,7 @@ traffic_profile:
 
 uplink_0:
       ipv4:
+        id: 1
         outer_l2:
             framesize:
                 64B: "{{ get(imix, 'imix.uplink.64B', '0') }}"
@@ -83,6 +84,7 @@ uplink_0:
             count: "{{get(flow, 'flow.count', '1') }}"
 downlink_0:
       ipv4:
+        id: 2
         outer_l2:
             framesize:
                 64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"