X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=samples%2Fvnf_samples%2Ftraffic_profiles%2Fipv4_throughput_cgnapt.yaml;h=809415a00043768d9a727c17d2b598dd04e689dd;hb=42d82c8766fc449e4f495ce0d727ea3499a8b6de;hp=7283b6377dfffe99b86c98a011a817b6d56e6cb6;hpb=faf7ef045dbb08d00e0a19374c6075d85ff5ad60;p=yardstick.git

diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
index 7283b6377..809415a00 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
@@ -42,56 +42,57 @@ description:     Traffic profile to run RFC2544 latency
 traffic_profile:
   traffic_type : RFC2544Profile # defines traffic behavior - constant or look for highest possible throughput
   frame_rate : 100  # pc of linerate
-  # that specifies a range (e.g. ipv4 address, port)
+  duration: {{ duration }}
 
-
-private_1:
+uplink_0:
       ipv4:
+        id: 1
         outer_l2:
             framesize:
-                64B: "{{ get(imix, 'imix.private.64B', '0') }}"
-                128B: "{{ get(imix, 'imix.private.128B', '0') }}"
-                256B: "{{ get(imix, 'imix.private.256B', '0') }}"
-                373b: "{{ get(imix, 'imix.private.373B', '0') }}"
-                512B: "{{ get(imix, 'imix.private.512B', '0') }}"
-                570B: "{{get(imix, 'imix.private.570B', '0') }}"
-                1400B: "{{get(imix, 'imix.private.1400B', '0') }}"
-                1500B: "{{get(imix, 'imix.private.1500B', '0') }}"
-                1518B: "{{get(imix, 'imix.private.1518B', '0') }}"
+                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_ip0', '10.0.2.1-10.0.2.255') }}"
-            dstip4: "{{get(flow, 'flow.dst_ip0', '10.0.3.1-10.0.3.255') }}"
+            srcip4: "{{get(flow, 'flow.src_ip_0', '10.0.2.1-10.0.2.255') }}"
+            dstip4: "{{get(flow, 'flow.dst_ip_0', '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_port0', '1234-4321') }}"
-            dstport: "{{get(flow, 'flow.dst_port0', '2001-4001') }}"
+            srcport: "{{get(flow, 'flow.src_port_0', '1234-4321') }}"
+            dstport: "{{get(flow, 'flow.dst_port_0', '2001-4001') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-public_1:
+downlink_0:
       ipv4:
+        id: 2
         outer_l2:
             framesize:
-                64B: "{{ get(imix, 'imix.public.64B', '0') }}"
-                128B: "{{ get(imix, 'imix.public.128B', '0') }}"
-                256B: "{{ get(imix, 'imix.public.256B', '0') }}"
-                373b: "{{ get(imix, 'imix.public.373B', '0') }}"
-                512B: "{{ get(imix, 'imix.public.512B', '0') }}"
-                570B: "{{get(imix, 'imix.public.570B', '0') }}"
-                1400B: "{{get(imix, 'imix.public.1400B', '0') }}"
-                1500B: "{{get(imix, 'imix.public.1500B', '0') }}"
-                1518B: "{{get(imix, 'imix.public.1518B', '0') }}"
+                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_ip0', '10.0.3.1-10.0.3.255') }}"
-            dstip4: "{{get(flow, 'flow.public_ip0', '10.0.2.1-10.0.2.255') }}"
+            srcip4: "{{get(flow, 'flow.dst_ip_0', '10.0.3.1-10.0.3.255') }}"
+            dstip4: "{{get(flow, 'flow.public_ip_0', '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_port0', '1234-4321') }}"
-            dstport: "{{get(flow, 'flow.src_port0', '2001-4001') }}"
+            srcport: "{{get(flow, 'flow.dst_port_0', '1-65535') }}"
+            dstport: "{{get(flow, 'flow.src_port_0', '1-65535') }}"
             count: "{{get(flow, 'flow.count', '1') }}"