X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=samples%2Fvnf_samples%2Ftraffic_profiles%2Fixia_ipv4_latency.yaml;h=7b66d663b3c85c5195cc6f226ca9903825278000;hb=de8ce9889cfc9e9d62e26e53b5f27b2f4cd9ff06;hp=af74df2c9b58f5b6c365e10064c91246fe45987e;hpb=ae0cdbea1100a09d0c46191dd7e5d8d5eec8d484;p=yardstick.git

diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
index af74df2c9..7b66d663b 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
@@ -33,6 +33,7 @@ traffic_profile:
 
 uplink_0:
       ipv4:
+        id: 1
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
@@ -41,6 +42,8 @@ uplink_0:
                 373b: "{{get(imix, 'imix.uplink.373B', '0') }}"
                 512B: "{{get(imix, 'imix.uplink.512B', '0') }}"
                 570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+                1024B: "{{get(imix, 'imix.uplink.1024B', '0') }}"
+                1280B: "{{get(imix, 'imix.uplink.1280B', '0') }}"
                 1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
                 1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
                 1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
@@ -58,6 +61,7 @@ uplink_0:
             count: "{{get(flow, 'flow.count', '1') }}"
 downlink_0:
       ipv4:
+        id: 2
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.downlink.64B', '0') }}"
@@ -66,6 +70,8 @@ downlink_0:
                 373b: "{{get(imix, 'imix.downlink.373B', '0') }}"
                 512B: "{{get(imix, 'imix.downlink.512B', '0') }}"
                 570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+                1024B: "{{get(imix, 'imix.downlink.1024B', '0') }}"
+                1280B: "{{get(imix, 'imix.downlink.1280B', '0') }}"
                 1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
                 1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
                 1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
@@ -74,6 +80,9 @@ downlink_0:
             proto: "udp"
             srcip4: "{{get(flow, 'flow.dst_ip_0', '1.1.1.1-1.15.255.255') }}"
             dstip4: "{{get(flow, 'flow.src_ip_0', '90.90.1.1-90.105.255.255') }}"
+            {% if flow.flow.public_ip_0 is defined %}
+            dstip4: "{{get(flow, 'flow.public_ip_0', '90.90.1.1-90.105.255.255') }}"
+            {% endif %}
             count: "{{get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 0
@@ -83,6 +92,7 @@ downlink_0:
             count: "{{get(flow, 'flow.count', '1') }}"
 uplink_1:
       ipv4:
+        id: 3
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
@@ -91,23 +101,26 @@ uplink_1:
                 373b: "{{get(imix, 'imix.uplink.373B', '0') }}"
                 512B: "{{get(imix, 'imix.uplink.512B', '0') }}"
                 570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+                1024B: "{{get(imix, 'imix.uplink.1024B', '0') }}"
+                1280B: "{{get(imix, 'imix.uplink.1280B', '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_ip1', '1.1.1.1-1.15.255.255') }}"
-            dstip4: "{{get(flow, 'flow.dst_ip1', '90.90.1.1-90.105.255.255') }}"
+            srcip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.15.255.255') }}"
+            dstip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.105.255.255') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 0
         outer_l4:
-            srcport: "{{get(flow, 'flow.src_port1', '1234') }}"
-            dstport: "{{get(flow, 'flow.dst_port1', '2001') }}"
+            srcport: "{{get(flow, 'flow.src_port_1', '1234') }}"
+            dstport: "{{get(flow, 'flow.dst_port_1', '2001') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
 downlink_1:
       ipv4:
+        id: 4
         outer_l2:
             framesize:
                 64B: "{{get(imix, 'imix.downlink.64B', '0') }}"
@@ -116,18 +129,23 @@ downlink_1:
                 373b: "{{get(imix, 'imix.downlink.373B', '0') }}"
                 512B: "{{get(imix, 'imix.downlink.512B', '0') }}"
                 570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+                1024B: "{{get(imix, 'imix.downlink.1024B', '0') }}"
+                1280B: "{{get(imix, 'imix.downlink.1280B', '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_ip1', '1.1.1.1-1.15.255.255') }}"
-            dstip4: "{{get(flow, 'flow.src_ip1', '90.90.1.1-90.105.255.255') }}"
+            srcip4: "{{get(flow, 'flow.dst_ip_1', '1.1.1.1-1.15.255.255') }}"
+            dstip4: "{{get(flow, 'flow.src_ip_1', '90.90.1.1-90.105.255.255') }}"
+            {% if flow.public_ip_1 is defined %}
+            dstip4: "{{get(flow, 'flow.public_ip_1', '90.90.1.1-90.105.255.255') }}"
+            {% endif %}
             count: "{{get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 0
         outer_l4:
-            srcport: "{{get(flow, 'flow.dst_port1', '1234') }}"
-            dstport: "{{get(flow, 'flow.src_port1', '2001') }}"
+            srcport: "{{get(flow, 'flow.dst_port_1', '1234') }}"
+            dstport: "{{get(flow, 'flow.src_port_1', '2001') }}"
             count: "{{get(flow, 'flow.count', '1') }}"