Merge "Adding support for updating the count/packetsize for given testcase"

2 files changed, 41 insertions, 33 deletions

diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
index 7283b6377..0758cf3a8 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
@@ -49,11 +49,11 @@ private_1:
       ipv4:
         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') }}"
+                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') }}"
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
index d7531fcdb..c53b4fad4 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
@@ -35,13 +35,15 @@ private_1:
       ipv4:
         outer_l2:
             framesize:
-                64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
-                128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
-                256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
-                373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
-                570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
-                1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
-                1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+                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') }}"
 
         outer_l3v4:
             proto: "udp"
@@ -58,13 +60,15 @@ public_1:
       ipv4:
         outer_l2:
             framesize:
-                64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
-                128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
-                256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
-                373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
-                570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
-                1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
-                1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+                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') }}"
 
         outer_l3v4:
             proto: "udp"
@@ -81,13 +85,15 @@ private_2:
       ipv4:
         outer_l2:
             framesize:
-                64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
-                128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
-                256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
-                373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
-                570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
-                1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
-                1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+                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') }}"
 
         outer_l3v4:
             proto: "udp"
@@ -104,13 +110,15 @@ public_2:
       ipv4:
         outer_l2:
             framesize:
-                64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
-                128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
-                256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
-                373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
-                570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
-                1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
-                1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+                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') }}"
 
         outer_l3v4:
             proto: "udp"