Add OpenStack test cases

Add OpenStack test cases with different framesize and IMIX

JIRA: YARDSTICK-1608

Change-Id: Ia7231dab8d2ff405cbf7794b7e7843763970998a
Signed-off-by: Myron Sosyak <myronx.sosyak@intel.com>
Signed-off-by: Oleksandr Naumets <oleksandrx.naumets@intel.com>

10 files changed, 709 insertions, 17 deletions

diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-scale-up.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-scale-up.yaml
new file mode 100644
index 000000000..1805f6aa0
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-scale-up.yaml
@@ -0,0 +1,52 @@
+# Copyright (c) 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+{% set vports = get(extra_args, 'vports', 2) %}
+nsd:nsd-catalog:
+    nsd:
+    -   id: vFW
+        name: vFW
+        short-name: vFW
+        description: scenario with vFW VNF
+        constituent-vnfd:
+        -   member-vnf-index: '1'
+            vnfd-id-ref: tg__0
+            VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml      #VNF type
+        -   member-vnf-index: '2'
+            vnfd-id-ref: vnf__0
+            VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
+
+        vld:
+{% for vport in range(0,vports,2|int) %}
+        -   id: uplink_{{loop.index0}}
+            name: tg__0 to vnf__0 link {{vport + 1}}
+            type: ELAN
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{vport}}
+                vnfd-id-ref: tg__0
+            -   member-vnf-index-ref: '2'
+                vnfd-connection-point-ref: xe{{vport}}
+                vnfd-id-ref: vnf__0
+        -   id: downlink_{{loop.index0}}
+            name: vnf__0 to tg__0 link {{vport + 2}}
+            type: ELAN
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '2'
+                vnfd-connection-point-ref: xe{{vport+1}}
+                vnfd-id-ref: vnf__0
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{vport+1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_ixia_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_ixia_scale_up.yaml
new file mode 100644
index 000000000..fa9f24a3f
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_ixia_scale_up.yaml
@@ -0,0 +1,124 @@
+# Copyright (c) 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{% set image = image or "yardstick-samplevnfs" %}
+{% set mem = mem or 20480 %}
+{% set vcpus = vcpus or 10 %}
+{% set vports = vports or 2 %}
+{% set public_ip = public_ip or {0: "10.0.3.33",
+                                 1: "10.0.5.55"} %}
+{% set phynet_map = phynet_map or {'uplink_0': 'prov0',
+                                   'downlink_0': 'prov1',
+                                   'uplink_1': 'prov2',
+                                   'downlink_1': 'prov3'} %}
+---
+schema: yardstick:task:0.1
+scenarios:
+- type: NSPerf-RFC2544
+  traffic_profile: ../../traffic_profiles/ixia_ipv4_latency_scale_up.yaml
+  topology: cgnapt-tg-topology-ixia-scale-up.yaml
+  extra_args:
+    vports: {{ vports }}
+  nodes:
+    tg__0: trafficgen_0.barametal
+    vnf__0: vnf_0.yardstick
+  options:
+    framesize:
+    flow:
+      src_ip: [
+{% for vport in range(0,vports,2|int) %}
+       {'tg__0': 'xe{{vport}}'},
+{% endfor %}  ]
+      dst_ip: [
+{% for vport in range(1,vports,2|int) %}
+      {'tg__0': 'xe{{vport}}'},
+{% endfor %}  ]
+      public_ip:
+{% for port_num in range((vports/2)|int) %}
+        - {{ public_ip[port_num] }}
+{% endfor %}
+      count: 1
+    traffic_type: 4
+    rfc2544:
+      resolution: 0.01
+      allowed_drop_rate: 0.005 - 0.01
+    vnf__0:
+      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
+  runner:
+    type: Sequence
+    scenario_option_name: framesize
+    sequence:
+    - uplink: {64B: 100}
+      downlink: {64B: 100}
+    - uplink: {128B: 100}
+      downlink: {128B: 100}
+    - uplink: {256B: 100}
+      downlink: {256B: 100}
+    - uplink: {512B: 100}
+      downlink: {512B: 100}
+    - uplink: {1024B: 100}
+      downlink: {1024B: 100}
+    - uplink: {1518B: 100}
+      downlink: {1518B: 100}
+    - uplink: {64B: 25, 128B: 25, 512B: 25, 1024B: 25}
+      downlink: {64B: 25, 128B: 25, 512B: 25, 1024B: 25}
+contexts:
+  - name: barametal
+    type: Node
+    file: /etc/yardstick/nodes/pod_ixia.yaml
+  - name: yardstick
+    image: {{ image }}
+    flavor:
+      vcpus: {{ vcpus }}
+      ram: {{ mem }}
+      disk: 6
+      extra_specs:
+        hw:cpu_sockets: 1
+        hw:cpu_cores: {{ vcpus }}
+        hw:cpu_threads: 1
+    user: ubuntu
+    placement_groups:
+      pgrp1:
+        policy: "availability"
+    servers:
+      vnf_0:
+        floating_ip: true
+        placement: "pgrp1"
+        network_ports:
+          mgmt:
+            - mgmt
+{% for vport in range(0,vports,2|int) %}
+          uplink_{{loop.index0}}:
+            - xe{{vport}}
+          downlink_{{loop.index0}}:
+            - xe{{vport + 1}}
+{% endfor %}
+    networks:
+      mgmt:
+        cidr: '10.0.1.0/24'
+{% for vport in range(1,vports,2|int) %}
+      uplink_{{loop.index0}}:
+        cidr: '10.0.{{vport + 1}}.0/24'
+        gateway_ip: 'null'
+        provider: true
+        physical_network: {{phynet_map['uplink_' + loop.index0|string] }}
+        port_security_enabled: False
+        enable_dhcp: 'false'
+      downlink_{{loop.index0}}:
+        cidr: '10.0.{{vport + 2}}.0/24'
+        gateway_ip: 'null'
+        provider: true
+        physical_network: {{phynet_map['downlink_' + loop.index0|string] }}
+        port_security_enabled: False
+        enable_dhcp: 'false'
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_trex_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_trex_scale_up.yaml
new file mode 100644
index 000000000..aa9807003
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_trex_scale_up.yaml
@@ -0,0 +1,124 @@
+# Copyright (c) 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{% set image = image or "yardstick-samplevnfs" %}
+{% set mem = mem or 20480 %}
+{% set vcpus = vcpus or 10 %}
+{% set vports = vports or 2 %}
+{% set public_ip = public_ip or {0: "10.0.3.50",
+                                 1: "10.0.5.50"} %}
+{% set phynet_map = phynet_map or {'uplink_0': 'prov6',
+                                   'downlink_0': 'prov7',
+                                   'uplink_1': 'prov4',
+                                   'downlink_1': 'prov5'} %}
+---
+schema: yardstick:task:0.1
+scenarios:
+- type: NSPerf-RFC2544
+  traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt-scale-up.yaml
+  topology: cgnapt-tg-topology-scale-up.yaml
+  extra_args:
+    vports: {{ vports }}
+  nodes:
+    tg__0: trafficgen_0.barametal
+    vnf__0: vnf_0.yardstick
+  options:
+    framesize:
+    flow:
+      src_ip: [
+{% for vport in range(0,vports,2|int) %}
+       {'tg__0': 'xe{{vport}}'},
+{% endfor %}  ]
+      dst_ip: [
+{% for vport in range(1,vports,2|int) %}
+      {'tg__0': 'xe{{vport}}'},
+{% endfor %}  ]
+      public_ip:
+{% for port_num in range((vports/2)|int) %}
+        - {{ public_ip[port_num] }}
+{% endfor %}
+      count: 1
+    traffic_type: 4
+    rfc2544:
+      resolution: 0.01
+      allowed_drop_rate: 0.005 - 0.01
+    vnf__0:
+      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
+  runner:
+    type: Sequence
+    scenario_option_name: framesize
+    sequence:
+    - uplink: {64B: 100}
+      downlink: {64B: 100}
+    - uplink: {128B: 100}
+      downlink: {128B: 100}
+    - uplink: {256B: 100}
+      downlink: {256B: 100}
+    - uplink: {512B: 100}
+      downlink: {512B: 100}
+    - uplink: {1024B: 100}
+      downlink: {1024B: 100}
+    - uplink: {1518B: 100}
+      downlink: {1518B: 100}
+    - uplink: {64B: 25, 128B: 25, 512B: 25, 1024B: 25}
+      downlink: {64B: 25, 128B: 25, 512B: 25, 1024B: 25}
+contexts:
+  - name: barametal
+    type: Node
+    file: /etc/yardstick/nodes/pod_trex.yaml
+  - name: yardstick
+    image: {{ image }}
+    flavor:
+      vcpus: {{ vcpus }}
+      ram: {{ mem }}
+      disk: 6
+      extra_specs:
+        hw:cpu_sockets: 1
+        hw:cpu_cores: {{ vcpus }}
+        hw:cpu_threads: 1
+    user: ubuntu
+    placement_groups:
+      pgrp1:
+        policy: "availability"
+    servers:
+      vnf_0:
+        floating_ip: true
+        placement: "pgrp1"
+        network_ports:
+          mgmt:
+            - mgmt
+{% for vport in range(0,vports,2|int) %}
+          uplink_{{loop.index0}}:
+            - xe{{vport}}
+          downlink_{{loop.index0}}:
+            - xe{{vport + 1}}
+{% endfor %}
+    networks:
+      mgmt:
+        cidr: '10.0.1.0/24'
+{% for vport in range(1,vports,2|int) %}
+      uplink_{{loop.index0}}:
+        cidr: '10.0.{{vport + 1}}.0/24'
+        gateway_ip: 'null'
+        provider: true
+        physical_network: {{phynet_map['uplink_' + loop.index0|string] }}
+        port_security_enabled: False
+        enable_dhcp: 'false'
+      downlink_{{loop.index0}}:
+        cidr: '10.0.{{vport + 2}}.0/24'
+        gateway_ip: 'null'
+        provider: true
+        physical_network: {{phynet_map['downlink_' + loop.index0|string] }}
+        port_security_enabled: False
+        enable_dhcp: 'false'
+{% endfor %}
\ No newline at end of file
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_ixia_scale_up.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_ixia_scale_up.yaml
new file mode 100644
index 000000000..47f3e01fa
--- /dev/null
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_ixia_scale_up.yaml
@@ -0,0 +1,122 @@
+# Copyright (c) 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{% set image = image or "yardstick-samplevnfs" %}
+{% set mem = mem or 20480 %}
+{% set vcpus = vcpus or 10 %}
+{% set vports = vports or 2 %}
+{% set phynet_map = phynet_map or {'uplink_0': 'prov0',
+                                   'downlink_0': 'prov1',
+                                   'uplink_1': 'prov2',
+                                   'downlink_1': 'prov3'} %}
+
+---
+schema: yardstick:task:0.1
+scenarios:
+- type: NSPerf-RFC2544
+  traffic_profile: ../../traffic_profiles/ixia_ipv4_latency_scale_up.yaml
+  topology: vfw-tg-topology-ixia-scale-up.yaml
+  extra_args:
+    vports: {{ vports }}
+  nodes:
+    tg__0: trafficgen_0.barametal
+    vnf__0: vnf_0.yardstick
+  options:
+    framesize:
+    flow:
+      src_ip: [
+{% for vport in range(0,vports,2|int) %}
+       {'tg__0': 'xe{{vport}}'},
+{% endfor %}  ]
+      dst_ip: [
+{% for vport in range(1,vports,2|int) %}
+      {'tg__0': 'xe{{vport}}'},
+{% endfor %}  ]
+      count: 1
+    traffic_type: 4
+    rfc2544:
+      resolution: 0.01
+      allowed_drop_rate: 0.005 - 0.01
+    vnf__0:
+      rules: acl_1rule.yaml
+      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
+  runner:
+    type: Sequence
+    scenario_option_name: framesize
+    sequence:
+    - uplink: {64B: 100}
+      downlink: {64B: 100}
+    - uplink: {128B: 100}
+      downlink: {128B: 100}
+    - uplink: {256B: 100}
+      downlink: {256B: 100}
+    - uplink: {512B: 100}
+      downlink: {512B: 100}
+    - uplink: {1024B: 100}
+      downlink: {1024B: 100}
+    - uplink: {1518B: 100}
+      downlink: {1518B: 100}
+    - uplink: {64B: 25, 128B: 25, 512B: 25, 1024B: 25}
+      downlink: {64B: 25, 128B: 25, 512B: 25, 1024B: 25}
+
+contexts:
+  - name: barametal
+    type: Node
+    file: /etc/yardstick/nodes/pod_ixia.yaml
+  - name: yardstick
+    image: {{ image }}
+    flavor:
+      vcpus: {{ vcpus }}
+      ram: {{ mem }}
+      disk: 6
+      extra_specs:
+        hw:cpu_sockets: 1
+        hw:cpu_cores: {{ vcpus }}
+        hw:cpu_threads: 1
+    user: ubuntu
+    placement_groups:
+      pgrp1:
+        policy: "availability"
+    servers:
+      vnf_0:
+        floating_ip: true
+        placement: "pgrp1"
+        network_ports:
+          mgmt:
+            - mgmt
+{% for vport in range(0,vports,2|int) %}
+          uplink_{{loop.index0}}:
+            - xe{{vport}}
+          downlink_{{loop.index0}}:
+            - xe{{vport + 1}}
+{% endfor %}
+    networks:
+      mgmt:
+        cidr: '10.0.1.0/24'
+{% for vport in range(1,vports,2|int) %}
+      uplink_{{loop.index0}}:
+        cidr: '10.0.{{vport + 1}}.0/24'
+        gateway_ip: 'null'
+        provider: true
+        physical_network: {{phynet_map['uplink_' + loop.index0|string] }}
+        port_security_enabled: False
+        enable_dhcp: 'false'
+      downlink_{{loop.index0}}:
+        cidr: '10.0.{{vport + 2}}.0/24'
+        gateway_ip: 'null'
+        provider: true
+        physical_network: {{phynet_map['downlink_' + loop.index0|string] }}
+        port_security_enabled: False
+        enable_dhcp: 'false'
+{% endfor %}
+
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_trex_scale_up.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_trex_scale_up.yaml
new file mode 100644
index 000000000..2e66778f9
--- /dev/null
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_trex_scale_up.yaml
@@ -0,0 +1,122 @@
+# Copyright (c) 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{% set image = image or "yardstick-samplevnfs" %}
+{% set mem = mem or 20480 %}
+{% set vcpus = vcpus or 10 %}
+{% set vports = vports or 2 %}
+{% set phynet_map = phynet_map or {'uplink_0': 'prov6',
+                                   'downlink_0': 'prov7',
+                                   'uplink_1': 'prov4',
+                                   'downlink_1': 'prov5'} %}
+
+---
+schema: yardstick:task:0.1
+scenarios:
+- type: NSPerf-RFC2544
+  traffic_profile: ../../traffic_profiles/ipv4_throughput-scale-up.yaml
+  topology: vfw-tg-topology-scale-up.yaml
+  extra_args:
+    vports: {{ vports }}
+  nodes:
+    tg__0: trafficgen_0.barametal
+    vnf__0: vnf_0.yardstick
+  options:
+    framesize:
+    flow:
+      src_ip: [
+{% for vport in range(0,vports,2|int) %}
+       {'tg__0': 'xe{{vport}}'},
+{% endfor %}  ]
+      dst_ip: [
+{% for vport in range(1,vports,2|int) %}
+      {'tg__0': 'xe{{vport}}'},
+{% endfor %}  ]
+      count: 1
+    traffic_type: 4
+    rfc2544:
+      resolution: 0.01
+      allowed_drop_rate: 0.005 - 0.01
+    vnf__0:
+      rules: acl_1rule.yaml
+      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
+  runner:
+    type: Sequence
+    scenario_option_name: framesize
+    sequence:
+    - uplink: {64B: 100}
+      downlink: {64B: 100}
+    - uplink: {128B: 100}
+      downlink: {128B: 100}
+    - uplink: {256B: 100}
+      downlink: {256B: 100}
+    - uplink: {512B: 100}
+      downlink: {512B: 100}
+    - uplink: {1024B: 100}
+      downlink: {1024B: 100}
+    - uplink: {1518B: 100}
+      downlink: {1518B: 100}
+    - uplink: {64B: 25, 128B: 25, 512B: 25, 1024B: 25}
+      downlink: {64B: 25, 128B: 25, 512B: 25, 1024B: 25}
+
+contexts:
+  - name: barametal
+    type: Node
+    file: /etc/yardstick/nodes/pod_trex.yaml
+  - name: yardstick
+    image: {{ image }}
+    flavor:
+      vcpus: {{ vcpus }}
+      ram: {{ mem }}
+      disk: 6
+      extra_specs:
+        hw:cpu_sockets: 1
+        hw:cpu_cores: {{ vcpus }}
+        hw:cpu_threads: 1
+    user: ubuntu
+    placement_groups:
+      pgrp1:
+        policy: "availability"
+    servers:
+      vnf_0:
+        floating_ip: true
+        placement: "pgrp1"
+        network_ports:
+          mgmt:
+            - mgmt
+{% for vport in range(0,vports,2|int) %}
+          uplink_{{loop.index0}}:
+            - xe{{vport}}
+          downlink_{{loop.index0}}:
+            - xe{{vport + 1}}
+{% endfor %}
+    networks:
+      mgmt:
+        cidr: '10.0.1.0/24'
+{% for vport in range(1,vports,2|int) %}
+      uplink_{{loop.index0}}:
+        cidr: '10.0.{{vport + 1}}.0/24'
+        gateway_ip: 'null'
+        provider: true
+        physical_network: {{phynet_map['uplink_' + loop.index0|string] }}
+        port_security_enabled: False
+        enable_dhcp: 'false'
+      downlink_{{loop.index0}}:
+        cidr: '10.0.{{vport + 2}}.0/24'
+        gateway_ip: 'null'
+        provider: true
+        physical_network: {{phynet_map['downlink_' + loop.index0|string] }}
+        port_security_enabled: False
+        enable_dhcp: 'false'
+{% endfor %}
+
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-scale-up.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-scale-up.yaml
new file mode 100644
index 000000000..3d29d3e67
--- /dev/null
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-scale-up.yaml
@@ -0,0 +1,53 @@
+# Copyright (c) 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+{% set vports = get(extra_args, 'vports', 2) %}
+nsd:nsd-catalog:
+    nsd:
+    -   id: vFW
+        name: vFW
+        short-name: vFW
+        description: scenario with vFW VNF
+        constituent-vnfd:
+        -   member-vnf-index: '1'
+            vnfd-id-ref: tg__0
+            VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml      #VNF type
+        -   member-vnf-index: '2'
+            vnfd-id-ref: vnf__0
+            VNF model: ../../vnf_descriptors/vfw_vnf.yaml      #VNF type
+
+        vld:
+{% for vport in range(0,vports,2|int) %}
+        -   id: uplink_{{loop.index0}}
+            name: tg__0 to vnf__0 link {{vport + 1}}
+            type: ELAN
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{vport}}
+                vnfd-id-ref: tg__0
+            -   member-vnf-index-ref: '2'
+                vnfd-connection-point-ref: xe{{vport}}
+                vnfd-id-ref: vnf__0
+        -   id: downlink_{{loop.index0}}
+            name: vnf__0 to tg__0 link {{vport + 2}}
+            type: ELAN
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '2'
+                vnfd-connection-point-ref: xe{{vport+1}}
+                vnfd-id-ref: vnf__0
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{vport+1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
+
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-up.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-up.yaml
index fbfbbeb26..d0be9f4c0 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-up.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-up.yaml
@@ -33,7 +33,7 @@
 # the profile defines a public and private side to make limited traffic correlation
 # between private and public side same way as it is made by IXIA solution.
 #
-{% set vports = get(extra_args, 'vports', 2)|int / 2 %}
+{% set vports = get(extra_args, 'vports', 2) %}
 ---
 schema: "nsb:traffic_profile:0.1"
 
@@ -46,7 +46,7 @@ traffic_profile:
   frame_rate: 100  # pc of linerate
   duration: {{ duration }}
 
-{% for vport in range(vports|int) %}
+{% for vport in range((vports / 2)|int) %}
 uplink_{{vport}}:
   ipv4:
     id: {{ (vport * 2) + 1 }}
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-scale-up.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-scale-up.yaml
index c8b40c969..223eae4ef 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-scale-up.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-scale-up.yaml
@@ -33,7 +33,7 @@
 # the profile defines a public and private side to make limited traffic correlation
 # between private and public side same way as it is made by IXIA solution.
 #
-{% set vports = get(extra_args, 'vports', 2)|int / 2 %}
+{% set vports = get(extra_args, 'vports', 2) %}
 ---
 schema: "nsb:traffic_profile:0.1"
 
@@ -46,7 +46,7 @@ traffic_profile:
   frame_rate : 100  # pc of linerate
   duration: {{ duration }}
 
-{% for vport in range(vports|int) %}
+{% for vport in range((vports / 2)|int) %}
 uplink_{{vport}}:
       ipv4:
         id: {{ (vport * 2) + 1 }}
@@ -65,15 +65,15 @@ uplink_{{vport}}:
 
         outer_l3v4:
             proto: "udp"
-            srcip4: {{ get(flow, 'flow.src_ip_%s'| format(vport), '10.%s.2.1-10.%s.2.255'| format(vport, vport)) }}
-            dstip4: {{ get(flow, 'flow.dst_ip_%s'| format(vport), '10.%s.3.1-10.%s.3.255'| format(vport, vport)) }}
-            count: {{ get(flow, 'flow.count', '1') }}
+            srcip4: "{{ get(flow, 'flow.src_ip_%s'| format(vport), '10.%s.2.1-10.%s.2.255'| format(vport, vport)) }}"
+            dstip4: "{{ get(flow, 'flow.dst_ip_%s'| format(vport), '10.%s.3.1-10.%s.3.255'| format(vport, vport)) }}"
+            count: "{{ get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 0
         outer_l4:
-            srcport: {{ get(flow, 'flow.src_port_%s'| format(vport), '1234-4321') }}
-            dstport: {{ get(flow, 'flow.dst_port_%s'| format(vport), '2001-4001') }}
-            count: {{ get(flow, 'flow.count', '1') }}
+            srcport: "{{ get(flow, 'flow.src_port_%s'| format(vport), '1234-4321') }}"
+            dstport: "{{ get(flow, 'flow.dst_port_%s'| format(vport), '2001-4001') }}"
+            count: "{{ get(flow, 'flow.count', '1') }}"
 downlink_{{vport}}:
       ipv4:
         id: {{ (vport * 2) + 2}}
@@ -92,13 +92,13 @@ downlink_{{vport}}:
 
         outer_l3v4:
             proto: "udp"
-            srcip4: {{ get(flow, 'flow.dst_ip_%s'| format(vport), '10.%s.3.1-10.%s.3.255'| format(vport, vport)) }}
-            dstip4: {{ get(flow, 'flow.public_ip_%s'| format(vport), '10.%s.2.1-10.%s.2.255'| format(vport, vport)) }}
-            count: {{ get(flow, 'flow.count', '1') }}
+            srcip4: "{{ get(flow, 'flow.dst_ip_%s'| format(vport), '10.%s.3.1-10.%s.3.255'| format(vport, vport)) }}"
+            dstip4: "{{ get(flow, 'flow.public_ip_%s'| format(vport), '10.%s.2.1-10.%s.2.255'| format(vport, vport)) }}"
+            count: "{{ get(flow, 'flow.count', '1') }}"
             ttl: 32
             dscp: 0
         outer_l4:
-            srcport: {{ get(flow, 'flow.dst_port_%s'| format(vport), '1-65535') }}
-            dstport: {{ get(flow, 'flow.src_port_%s'| format(vport), '1-65535') }}
-            count: {{ get(flow, 'flow.count', '1') }}
+            srcport: "{{ get(flow, 'flow.dst_port_%s'| format(vport), '1-65535') }}"
+            dstport: "{{ get(flow, 'flow.src_port_%s'| format(vport), '1-65535') }}"
+            count: "{{ get(flow, 'flow.count', '1') }}"
 {% endfor %}
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
index 275509aa0..a6a36e02c 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
@@ -27,7 +27,7 @@ name:            rfc2544
 description:     Traffic profile to run RFC2544 latency
 traffic_profile:
   traffic_type : IXIARFC2544Profile # defines traffic behavior - constant or look for highest possible throughput
-  frame_rate : 100  # pc of linerate
+  frame_rate : 100%  # pc of linerate
   duration: {{ duration }}
   enable_latency: True
 
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_scale_up.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_scale_up.yaml
new file mode 100644
index 000000000..30675375b
--- /dev/null
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_scale_up.yaml
@@ -0,0 +1,95 @@
+# Copyright (c) 2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{% set vports = get(extra_args, 'vports', 2) %}
+---
+schema: "nsb:traffic_profile:0.1"
+
+# This file is a template, it will be filled with values from tc.yaml before passing to the traffic generator
+
+name:            rfc2544
+description:     Traffic profile to run RFC2544 latency
+traffic_profile:
+  traffic_type : IXIARFC2544Profile # defines traffic behavior - constant or look for highest possible throughput
+  frame_rate : 100%  # pc of linerate
+  duration: {{ duration }}
+  enable_latency: True
+
+{% for vport in range((vports / 2)|int) %}
+uplink_{{vport}}:
+      ipv4:
+        id: {{ (vport * 2) + 1 }}
+        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') }}"
+                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_ip_%s'| format(vport), '1.%s.1.1-1.%s.255.255'| format(vport, vport)) }}"
+            dstip4: "{{ get(flow, 'flow.dst_ip_%s'| format(vport), '90.%s.1.1-90.%s.255.255'| format(vport, vport)) }}"
+            count: "{{ get(flow, 'flow.count', '1') }}"
+            srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+            dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
+            ttl: 32
+            dscp: 0
+        outer_l4:
+            srcport: "{{ get(flow, 'flow.src_port_%s'| format(vport), '1234-4321') }}"
+            dstport: "{{ get(flow, 'flow.dst_port_%s'| format(vport), '2001-4001') }}"
+            count: "{{get(flow, 'flow.count', '1') }}"
+            seed: "{{get(flow, 'flow.seed', '1') }}"
+downlink_{{vport}}:
+      ipv4:
+        id: {{ (vport * 2) + 2 }}
+        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') }}"
+                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.src_ip_%s'| format(vport), '1.%s.1.1-1.%s.255.255'| format(vport, vport)) }}"
+            dstip4: "{{ get(flow, 'flow.dst_ip_%s'| format(vport), '90.%s.1.1-90.%s.255.255'| format(vport, vport)) }}"
+            {% if get(flow, 'flow.public_ip_%s'| format(vport)) is defined %}
+            dstip4: "{{get(flow, 'flow.public_ip_%s'| format(vport), '90.90.1.1-90.105.255.255') }}"
+            {% endif %}
+            count: "{{get(flow, 'flow.count', '1') }}"
+            srcseed: "{{get(flow, 'flow.srcseed', '1') }}"
+            dstseed: "{{get(flow, 'flow.dstseed', '1') }}"
+            ttl: 32
+            dscp: 0
+        outer_l4:
+            srcport: "{{ get(flow, 'flow.dst_port_%s'| format(vport), '1234-4321') }}"
+            dstport: "{{ get(flow, 'flow.src_port_%s'| format(vport), '2001-4001') }}"
+            count: "{{get(flow, 'flow.count', '1') }}"
+            seed: "{{get(flow, 'flow.seed', '1') }}"
+{% endfor %}