NSB: count from 0, vnf_0, tg_9, private->uplink, public->downlink

Also rename private to uplink, public to downlink

for scale-out template we need to count from 0
so we can use range() without +1/-1 errors

vnf_0, vnf_1
tg_0, tg_1

also fix Ixia defaults

Change-Id: I6aecfbb95f99af20f012a9df19c19be77d1b5b77
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com>

7 files changed, 168 insertions, 168 deletions

diff --git a/samples/vnf_samples/traffic_profiles/example.yaml b/samples/vnf_samples/traffic_profiles/example.yaml
index fc2501526..443fb88cf 100644
--- a/samples/vnf_samples/traffic_profiles/example.yaml
+++ b/samples/vnf_samples/traffic_profiles/example.yaml
@@ -150,8 +150,8 @@ public:
                 570B: {{get(imix_570B, 12) }}
                 1400B: {{get(imix_1400B, 12) }}
                 1518b: {{get(imix_1500B, 12) }}
-            srcmac: {{get(private.ipv4_1.dst_mac}} # xe0.local_mac
-            dstmac: {{get)private.ipv4_1.src_mac}} # xe0.dst_mac
+            srcmac: {{get(uplink.ipv4_1.dst_mac}} # xe0.local_mac
+            dstmac: {{get)uplink.ipv4_1.src_mac}} # xe0.dst_mac
             QinQ:
                 S-VLAN:
                     id: {{ get(flow.s_vlan_range, "0") }}
@@ -166,33 +166,33 @@ public:
 
         outer_l3v4:
             proto: {{ get(flow.outer_proto, "udp") }},
-            srcip4: {{ get(private.ipv4_1.outer_l3v4.dstip4) }}
-            dstip4: {{ get(private.ipv4_1.outer_l3v4.srcip4) }}
+            srcip4: {{ get(uplink.ipv4_1.outer_l3v4.dstip4) }}
+            dstip4: {{ get(uplink.ipv4_1.outer_l3v4.srcip4) }}
             ttl: 32
             dscp:  {{ get(flow.tos, 0) }}
 
         outer_l4:
-            srcport: {{ get(private.ipv4_1.outer_l4.dstport) }}
-            dstport: {{ get(private.ipv4_1.outer_l4.srcport) }}
+            srcport: {{ get(uplink.ipv4_1.outer_l4.dstport) }}
+            dstport: {{ get(uplink.ipv4_1.outer_l4.srcport) }}
             vni: {{ get(flow.vxlan_vni, "2345") }} #optional
             inner_l2: #optional
-                srcmac: {{ get(private.ipv4_1.outer_l4.inner_l2.dstmac) }}
-                dstmac: {{ get(private.ipv4_1.outer_l4.inner_l2.srcmac) }}
+                srcmac: {{ get(uplink.ipv4_1.outer_l4.inner_l2.dstmac) }}
+                dstmac: {{ get(uplink.ipv4_1.outer_l4.inner_l2.srcmac) }}
 
         inner_l3v4: #optional
             proto: {{ get(flow.inner_proto, "udp") }},
-            srcip4: {{ get(private.ipv4_1.inner_l3v4.dstip4) }}
-            dstip4: {{ get(private.ipv4_1.inner_l3v4.srcip4) }}
+            srcip4: {{ get(uplink.ipv4_1.inner_l3v4.dstip4) }}
+            dstip4: {{ get(uplink.ipv4_1.inner_l3v4.srcip4) }}
             ttl: 32
             dscp:  {{ get(flow.inner_tos, 0) }}
 
         inner_l3v6:
             proto: {{ get(flow.inner_proto, "udp") }},
-            srcip6: {{ get(private.ipv4_1.inner_l3v6.dstip6) }}
-            dstip6: {{ get(private.ipv4_1.inner_l3v6.srcip6) }}
+            srcip6: {{ get(uplink.ipv4_1.inner_l3v6.dstip6) }}
+            dstip6: {{ get(uplink.ipv4_1.inner_l3v6.srcip6) }}
             ttl: 32
             tc: {{ get(flow.inner_tos, 0) }}
 
         inner_l4:
-            srcport: {{ get(private.ipv4_1.inner_l4.dstport) }}
-            dstport: {{ get(private.ipv4_1.inner_l4.srcport) }}
+            srcport: {{ get(uplink.ipv4_1.inner_l4.dstport) }}
+            dstport: {{ get(uplink.ipv4_1.inner_l4.srcport) }}
diff --git a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml
index a7394abf1..5da20ffcc 100644
--- a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml
+++ b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml
@@ -6,7 +6,7 @@ traffic_profile:
   traffic_type: TrafficProfileGenericHTTP
 
 #http client specific values
-private_1:
+uplink_0:
     http_no_requests: "1000"                # number of http iterations
     http_concurency: "65000"                  # number of threads to be run
     http_locator:  "/1B.bin"              # http locator to be read
@@ -17,7 +17,7 @@ private_1:
     attacker_tests: "False"                 # True : If attacker Test, False : Otherwise
 
 #http server side
-public_1:
+downlink_0:
     http_locator_image_size: "1B"      # image size requested by http client
     http_bind_address: "152.40.40.20"   # where address is bound
     http_bind_port: "9004"              # when port is bound
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml
index 6e0c693a5..7d51122f4 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml
@@ -45,24 +45,24 @@ traffic_profile:
   # that specifies a range (e.g. ipv4 address, port)
 
 
-private_1:
+uplink_0:
       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') }}"
-                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_ip_0', '1.1.1.1-1.1.255.255') }}"
-            dstip4: "{{get(flow, 'flow.dst_ip_0', '90.90.1.1-90.90.255.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
@@ -70,24 +70,24 @@ private_1:
             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:
         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_ip_0', '90.90.1.1-90.90.255.255') }}"
-            dstip4: "{{get(flow, 'flow.src_ip_0', '1.1.1.1-1.1.255.255') }}"
+            srcip4: "{{get(flow, 'flow.dst_ip_0', '10.0.3.1-10.0.3.255') }}"
+            dstip4: "{{get(flow, 'flow.src_ip_0', '10.0.2.1-10.0.2.255') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 0
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
index df04a93e5..60a78a0c6 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
@@ -45,19 +45,19 @@ traffic_profile:
   # that specifies a range (e.g. ipv4 address, port)
 
 
-private_1:
+uplink_0:
       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') }}"
-                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"
@@ -70,19 +70,19 @@ private_1:
             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:
         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"
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
index da9bc40da..f42db932c 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
@@ -45,19 +45,19 @@ traffic_profile:
   # that specifies a range (e.g. ipv4 address, port)
 
 
-private_1:
+uplink_0:
       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') }}"
-                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') }}"
 
             QinQ:
                 S-VLAN:
@@ -81,17 +81,17 @@ private_1:
             srcport: "{{get(flow, 'flow.src_port_0', '0') }}"
             dstport: "{{get(flow, 'flow.dst_port_0', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-public_1:
+downlink_0:
       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.uplink.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
 
         outer_l3v4:
             proto: "tcp"
@@ -105,19 +105,19 @@ public_1:
             srcport: "{{get(flow, 'flow.dst_port_0', '0') }}"
             dstport: "{{get(flow, 'flow.src_port_0', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-private_2:
+uplink_1:
       ipv4:
         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') }}"
 
             QinQ:
                 S-VLAN:
@@ -141,17 +141,17 @@ private_2:
             srcport: "{{get(flow, 'flow.src_port1', '0') }}"
             dstport: "{{get(flow, 'flow.dst_port1', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-public_2:
+downlink_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.uplink.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
 
         outer_l3v4:
             proto: "tcp"
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
index a008eb353..af74df2c9 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
@@ -31,19 +31,19 @@ traffic_profile:
   # that specifies a range (e.g. ipv4 address, port)
 
 
-private_1:
+uplink_0:
       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') }}"
-                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"
@@ -56,19 +56,19 @@ private_1:
             srcport: "{{get(flow, 'flow.src_port_0', '1234') }}"
             dstport: "{{get(flow, 'flow.dst_port_0', '2001') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-public_1:
+downlink_0:
       ipv4:
         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"
@@ -81,19 +81,19 @@ public_1:
             srcport: "{{get(flow, 'flow.src_port_0', '1234') }}"
             dstport: "{{get(flow, 'flow.dst_port_0', '2001') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-private_2:
+uplink_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') }}"
-                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"
@@ -106,19 +106,19 @@ private_2:
             srcport: "{{get(flow, 'flow.src_port1', '1234') }}"
             dstport: "{{get(flow, 'flow.dst_port1', '2001') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-public_2:
+downlink_1:
       ipv4:
         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"
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
index 7ca2f1043..5cce5941e 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
@@ -44,17 +44,17 @@ traffic_profile:
   frame_rate : 100  # pc of linerate
   # that specifies a range (e.g. ipv4 address, port)
 
-private_1:
+uplink_0:
       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.uplink.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
 
             QinQ:
                 S-VLAN:
@@ -78,17 +78,17 @@ private_1:
             srcport: "{{get(flow, 'flow.src_port_0', '0') }}"
             dstport: "{{get(flow, 'flow.dst_port_0', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-public_1:
+downlink_0:
       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.uplink.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
 
         outer_l3v4:
             proto: "tcp"
@@ -102,17 +102,17 @@ public_1:
             srcport: "{{get(flow, 'flow.dst_port_0', '0') }}"
             dstport: "{{get(flow, 'flow.src_port_0', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-private_2:
+uplink_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.uplink.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
 
             QinQ:
                 S-VLAN:
@@ -135,17 +135,17 @@ private_2:
             srcport: "{{get(flow, 'flow.src_port1', '0') }}"
             dstport: "{{get(flow, 'flow.dst_port1', '0') }}"
             count: "{{get(flow, 'flow.count', '1') }}"
-public_2:
+downlink_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.uplink.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
 
         outer_l3v4:
             proto: "tcp"