Adding sample multi-port ansible script

- trex
- ixia
- ixia correlated

Change-Id: I7d1414227c27c2bb03454eac94592e07c434f070
Signed-off-by: Deepak S <deepak.s@linux.intel.com>

25 files changed, 1511 insertions, 0 deletions

diff --git a/ansible/multi_port_baremetal_ixia_correlated_test.yaml b/ansible/multi_port_baremetal_ixia_correlated_test.yaml
new file mode 100644
index 000000000..ba92b5cd3
--- /dev/null
+++ b/ansible/multi_port_baremetal_ixia_correlated_test.yaml
@@ -0,0 +1,133 @@
+# Copyright (c) 2017 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.
+---
+- hosts: localhost
+  connection: local
+  vars:
+    scale_out:
+      - 1
+      - 2
+    flow:
+      traffic_type: 4
+      pkt_size:
+         uplink: {64B: 100}
+         downlink: {64B: 100}
+      count: 10
+      rfc2544:
+        allowed_drop_rate: 0.0001 - 0.0001
+      vnf_config:
+        lb_config: 'SW'
+        lb_count: 1
+        worker_config: '1C/1T'
+        worker_threads: 1
+
+    # Environment variables
+    gen:
+      user: ""
+      password: ""
+      key_filename: ~
+      tg_config:
+        ixchassis: "1.1.1.127" #ixia chassis ip
+        tcl_port: "8009" # tcl server port
+        lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0"
+        root_dir: "/opt/ixia/ixos-api/8.01.0.2/"
+        py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/"
+        py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi"
+        dut_result_dir: "/mnt/results"
+        version: "8.01.106.3"
+      pcis:
+        uplink:
+          - "2:5" #Card:port
+          - "2:3" #Card:port
+        downlink:
+          - "2:6" #Card:port
+          - "2:5" #Card:port
+      ip:
+        mgmt:
+          - '1.2.1.6/24'
+        uplink:
+          - '152.16.100.20/24'
+          - '172.16.100.20/24'
+        downlink:
+          - '152.16.40.20/24'
+          - '172.16.40.20/24'
+      mac:
+        uplink:
+          - '00:98:10:64:14:00'
+          - '00:ac:10:64:14:0'
+        downlink:
+          - '00:98:10:28:14:00'
+          - '00:ac:10:28:14:00'
+
+    # Environment variables
+    gen_1:
+      user: ""
+      password: ""
+      key_filename: ~
+      pcis:
+        uplink:
+          - "0000:05:00.0"
+          - "0000:05:00.2"
+        downlink:
+          - "0000:05:00.1"
+          - "0000:05:00.3"
+      ip:
+        mgmt:
+          - '1.2.1.6/24'
+        uplink:
+          - '152.16.100.20/24'
+          - '172.16.100.20/24'
+        downlink:
+          - '152.16.40.20/24'
+          - '172.16.40.20/24'
+      mac:
+        uplink:
+          - '00:00:00:9e:00:f8'
+          - '00:00:00:9e:00:fa'
+        downlink:
+          - '00:00:00:9e:00:f9'
+          - '00:00:00:9e:00:fb'
+
+    vnf:
+      ip: "192.168.100.101/24"
+      user: root
+      password: ""
+      key_filename: /root/.ssh/id_rsa
+      pcis:
+        uplink:
+          - "0000:05:00.0"
+          - "0000:05:00.2"
+        downlink:
+          - "0000:05:00.1"
+          - "0000:05:00.3"
+      ip:
+        mgmt:
+          - '1.2.1.6/24'
+        uplink:
+          - '152.16.100.10/24'
+          - '172.16.100.10/24'
+        downlink:
+          - '152.16.40.10/24'
+          - '172.16.40.10/24'
+      mac:
+        uplink:
+          - '00:00:00:9e:00:f8'
+          - '00:00:00:9e:00:fa'
+        downlink:
+          - '00:00:00:9e:00:f9'
+          - '00:00:00:9e:00:fb'
+
+  tasks:
+    - include: multi_port_baremetal_ixia_correlated_test_templates.yml
+      with_items: "{{ scale_out }}"
+
diff --git a/ansible/multi_port_baremetal_ixia_correlated_test_templates.yml b/ansible/multi_port_baremetal_ixia_correlated_test_templates.yml
new file mode 100644
index 000000000..6f73d8c01
--- /dev/null
+++ b/ansible/multi_port_baremetal_ixia_correlated_test_templates.yml
@@ -0,0 +1,56 @@
+# Copyright (c) 2017 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_fact:
+    num_vnfs: "{{ item }}"
+
+- debug:
+    var: num_vnfs
+    verbosity: 2
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-correlated-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/ixia_template.yaml
+    dest: /etc/yardstick/nodes/ixia_{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/pod_bm_vnf.yaml
+    dest: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_template.yaml
+    dest: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port.yaml
+     dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml
+    dest: ../samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port.yaml
+     dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml
+    dest: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port.yaml
+     dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml
diff --git a/ansible/multi_port_baremetal_ixia_test.yaml b/ansible/multi_port_baremetal_ixia_test.yaml
new file mode 100644
index 000000000..52bc40b43
--- /dev/null
+++ b/ansible/multi_port_baremetal_ixia_test.yaml
@@ -0,0 +1,104 @@
+# Copyright (c) 2017 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.
+---
+- hosts: localhost
+  connection: local
+  vars:
+    scale_out:
+      - 1
+      - 2
+    flow:
+      traffic_type: 4
+      pkt_size:
+         uplink: {64B: 100}
+         downlink: {64B: 100}
+      count: 10
+      rfc2544:
+        allowed_drop_rate: 0.0001 - 0.0001
+      vnf_config:
+        lb_config: 'SW'
+        lb_count: 1
+        worker_config: '1C/1T'
+        worker_threads: 1
+
+    # Environment variables
+    gen:
+      user: ""
+      password: ""
+      key_filename: ~
+      tg_config:
+        ixchassis: "1.1.1.127" #ixia chassis ip
+        tcl_port: "8009" # tcl server port
+        lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0"
+        root_dir: "/opt/ixia/ixos-api/8.01.0.2/"
+        py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/"
+        py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi"
+        dut_result_dir: "/mnt/results"
+        version: "8.01.106.3"
+      pcis:
+        uplink:
+          - "2:5" #Card:port
+          - "2:3" #Card:port
+        downlink:
+          - "2:6" #Card:port
+          - "2:5" #Card:port
+      ip:
+        mgmt:
+          - '1.2.1.6/24'
+        uplink:
+          - '152.16.100.20/24'
+          - '172.16.100.20/24'
+        downlink:
+          - '152.16.40.20/24'
+          - '172.16.40.20/24'
+      mac:
+        uplink:
+          - '00:98:10:64:14:00'
+          - '00:ac:10:64:14:0'
+        downlink:
+          - '00:98:10:28:14:00'
+          - '00:ac:10:28:14:00'
+
+    vnf:
+      ip: "192.168.100.101/24"
+      user: root
+      password: ""
+      key_filename: /root/.ssh/id_rsa
+      pcis:
+        uplink:
+          - "0000:05:00.0"
+          - "0000:05:00.2"
+        downlink:
+          - "0000:05:00.1"
+          - "0000:05:00.3"
+      ip:
+        mgmt:
+          - '1.2.1.6/24'
+        uplink:
+          - '152.16.100.10/24'
+          - '172.16.100.10/24'
+        downlink:
+          - '152.16.40.10/24'
+          - '172.16.40.10/24'
+      mac:
+        uplink:
+          - '00:00:00:9e:00:f8'
+          - '00:00:00:9e:00:fa'
+        downlink:
+          - '00:00:00:9e:00:f9'
+          - '00:00:00:9e:00:fb'
+
+  tasks:
+    - include: multi_port_baremetal_ixia_test_templates.yml
+      with_items: "{{ scale_out }}"
+
diff --git a/ansible/multi_port_baremetal_ixia_test_templates.yml b/ansible/multi_port_baremetal_ixia_test_templates.yml
new file mode 100644
index 000000000..f2e04a2d1
--- /dev/null
+++ b/ansible/multi_port_baremetal_ixia_test_templates.yml
@@ -0,0 +1,60 @@
+# Copyright (c) 2017 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_fact:
+    num_vnfs: "{{ item }}"
+
+- debug:
+    var: num_vnfs
+    verbosity: 2
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/ixia_template.yaml
+    dest: /etc/yardstick/nodes/ixia_{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/pod_bm_vnf.yaml
+    dest: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml
+    dest: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-multi-port.yaml
+     dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-multi-port-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml
+    dest: ../samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-multi-port.yaml
+     dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port-ixia-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml
+    dest: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-multi-port.yaml
+     dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port-ixia-{{ num_vnfs }}.yaml
diff --git a/ansible/multi_port_baremetal_test.yaml b/ansible/multi_port_baremetal_test.yaml
new file mode 100644
index 000000000..fb12b1c64
--- /dev/null
+++ b/ansible/multi_port_baremetal_test.yaml
@@ -0,0 +1,95 @@
+# Copyright (c) 2017 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.
+---
+- hosts: localhost
+  connection: local
+  vars:
+    scale_out:
+      - 1
+      - 2
+    flow:
+      traffic_type: 4
+      pkt_size:
+         uplink: {64B: 100}
+         downlink: {64B: 100}
+      count: 10
+      rfc2544:
+        allowed_drop_rate: 0.0001 - 0.0001
+      vnf_config:
+        lb_config: 'SW'
+        lb_count: 1
+        worker_config: '1C/1T'
+        worker_threads: 1
+
+    # Environment variables
+    gen:
+      user: root
+      password: ""
+      key_filename: /root/.ssh/id_rsa
+      pcis:
+        uplink:
+          - "0000:05:00.0"
+          - "0000:05:00.2"
+        downlink:
+          - "0000:05:00.1"
+          - "0000:05:00.3"
+      ip:
+        mgmt:
+          - '1.2.1.6/24'
+        uplink:
+          - '152.16.100.20/24'
+          - '172.16.100.20/24'
+        downlink:
+          - '152.16.40.20/24'
+          - '172.16.40.20/24'
+      mac:
+        uplink:
+          - '00:00:00:9e:00:f8'
+          - '00:00:00:9e:00:fa'
+        downlink:
+          - '00:00:00:9e:00:f9'
+          - '00:00:00:9e:00:fb'
+
+    vnf:
+      ip: "192.168.100.101/24"
+      user: root
+      password: ""
+      key_filename: /root/.ssh/id_rsa
+      pcis:
+        uplink:
+          - "0000:05:00.0"
+          - "0000:05:00.2"
+        downlink:
+          - "0000:05:00.1"
+          - "0000:05:00.3"
+      ip:
+        mgmt:
+          - '1.2.1.6/24'
+        uplink:
+          - '152.16.100.10/24'
+          - '172.16.100.10/24'
+        downlink:
+          - '152.16.40.10/24'
+          - '172.16.40.10/24'
+      mac:
+        uplink:
+          - '00:00:00:9e:00:f8'
+          - '00:00:00:9e:00:fa'
+        downlink:
+          - '00:00:00:9e:00:f9'
+          - '00:00:00:9e:00:fb'
+
+  tasks:
+    - include: multi_port_baremetal_test_templates.yml
+      with_items: "{{ scale_out }}"
+
diff --git a/ansible/multi_port_baremetal_test_templates.yml b/ansible/multi_port_baremetal_test_templates.yml
new file mode 100644
index 000000000..4b905f8c7
--- /dev/null
+++ b/ansible/multi_port_baremetal_test_templates.yml
@@ -0,0 +1,60 @@
+# Copyright (c) 2017 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_fact:
+    num_vnfs: "{{ item }}"
+
+- debug:
+    var: num_vnfs
+    verbosity: 2
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/baremetal_trex.yaml
+    dest: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/pod_bm_vnf.yaml
+    dest: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml
+    dest: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-multi-port.yaml
+     dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-multi-port-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/acl/tc_baremetal_vfw_rfc2544_template.yaml
+    dest: ../samples/vnf_samples/nsut/acl/tc_baremetal_vfw_rfc2544_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port.yaml
+     dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_vfw_rfc2544_template.yaml
+    dest: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_vfw_rfc2544_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port.yaml
+     dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port-{{ num_vnfs }}.yaml
diff --git a/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml b/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml
new file mode 100644
index 000000000..b724cb09b
--- /dev/null
+++ b/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml
@@ -0,0 +1,37 @@
+# Copyright (c) 2016-2017 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.
+
+nodes:
+-
+    name: vnf__0
+    role: vnf__0
+    ip: {{vnf.ip.mgmt[0]| ipaddr('address')}}
+    user: {{vnf.user}}
+    password: {{vnf.password}}
+    key_filename: {{vnf.key_filename}}
+    interfaces:
+{% for num in range(num_vnfs|int) %}
+       xe{{num * 2}}:  # logical name from topology.yaml and vnfd.yaml
+           vpci:      "{{vnf.pcis.uplink[num]}}"
+           dpdk_port_num: {{num * 2}}
+           local_ip: "{{vnf.ip.uplink[num] | ipaddr('address')}}"
+           netmask: "{{vnf.ip.uplink[num] | ipaddr('netmask')}}"
+           local_mac:   "{{vnf.mac.uplink[num]}}"
+       xe{{(num * 2) + 1}}:  # logical name from topology.yaml and vnfd.yaml
+           vpci:      "{{vnf.pcis.downlink[num]}}"
+           dpdk_port_num: {{(num * 2) + 1}}
+           local_ip: "{{vnf.ip.downlink[num] | ipaddr('address') }}"
+           netmask: "{{vnf.ip.uplink[num] | ipaddr('netmask')}}"
+           local_mac:   "{{vnf.mac.downlink[num]}}"
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port.yaml
new file mode 100644
index 000000000..667d23e80
--- /dev/null
+++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port.yaml
@@ -0,0 +1,54 @@
+# Copyright (c) 2016-2017 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 3-tg_vnf-topology
+        name: 3-tg_vnf-topology
+        short-name: 3-tg_vnf-topology
+        description: 3-tg_vnf-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
+        - member-vnf-index: '1'
+          vnfd-id-ref: tg__1
+          VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
+        - member-vnf-index: '2'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/acl_vnf.yaml      #VNF type
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__0 link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2 }}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: 2
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: vnf__0
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__{{ vnf_num }} to tg__1 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: 2
+                vnfd-connection-point-ref: xe{{vnf_num * 2 + 1}}
+                vnfd-id-ref: vnf__0
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num }}
+                vnfd-id-ref: tg__1
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-multi-port.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-multi-port.yaml
new file mode 100644
index 000000000..00bf28231
--- /dev/null
+++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-multi-port.yaml
@@ -0,0 +1,51 @@
+# Copyright (c) 2016-2017 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 2tg-topology
+        name: 2tg-topology
+        short-name: 2tg-topology
+        description: 2tg-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
+        - member-vnf-index: '1'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/acl_vnf.yaml      #VNF type
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__0 link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: vnf__0
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: vnf__0
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port.yaml
new file mode 100644
index 000000000..18ae4aee9
--- /dev/null
+++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port.yaml
@@ -0,0 +1,51 @@
+# Copyright (c) 2016-2017 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 2tg-topology
+        name: 2tg-topology
+        short-name: 2tg-topology
+        description: 2tg-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
+        - member-vnf-index: '1'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/acl_vnf.yaml      #VNF type
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__0 link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: vnf__0
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: vnf__0
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml
new file mode 100644
index 000000000..17b918ce0
--- /dev/null
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml
@@ -0,0 +1,55 @@
+# Copyright (c) 2017 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.
+
+---
+schema: yardstick:task:0.1
+scenarios:
+  - type: NSPerf
+    traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+    topology: acl-tg-topology-ixia-multi-port-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      vnf__0: vnf__0.yardstick
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+      vnf__0:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+    ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs * 2}}_port.ixncfg
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml
new file mode 100644
index 000000000..1333b2721
--- /dev/null
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml
@@ -0,0 +1,54 @@
+# Copyright (c) 2017 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.
+
+---
+schema: yardstick:task:0.1
+scenarios:
+  - type: NSPerf
+    traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+    topology: acl-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      vnf__0: vnf__0.yardstick
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+      vnf__0:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml
new file mode 100644
index 000000000..fe7be9aba
--- /dev/null
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml
@@ -0,0 +1,57 @@
+# Copyright (c) 2016-2017 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.
+
+---
+schema: yardstick:task:0.1
+scenarios:
+  - type: NSPerf
+    traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
+    topology: acl-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      tg__1: tg__1.yardstick
+      vnf__0: vnf__0.yardstick
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+      vnf__0:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+    ixia_profile: ../../traffic_profiles/ixia/ixia_ipv4_profile_{{ num_vnfs }}_port.ixncfg
+
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml
+   - type: Node
+     file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
+     name: yardstick
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port.yaml
new file mode 100644
index 000000000..cf64d96ba
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port.yaml
@@ -0,0 +1,54 @@
+# Copyright (c) 2016-2017 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 3-tg_vnf-topology
+        name: 3-tg_vnf-topology
+        short-name: 3-tg_vnf-topology
+        description: 3-tg_vnf-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
+        - member-vnf-index: '1'
+          vnfd-id-ref: tg__1
+          VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
+        - member-vnf-index: '2'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__0 link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2 }}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: 2
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: vnf__0
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__{{ vnf_num }} to tg__1 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: 2
+                vnfd-connection-point-ref: xe{{vnf_num * 2 + 1}}
+                vnfd-id-ref: vnf__0
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num }}
+                vnfd-id-ref: tg__1
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-multi-port.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-multi-port.yaml
new file mode 100644
index 000000000..91d257fd4
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-multi-port.yaml
@@ -0,0 +1,51 @@
+# Copyright (c) 2016-2017 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 2tg-topology
+        name: 2tg-topology
+        short-name: 2tg-topology
+        description: 2tg-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
+        - member-vnf-index: '1'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__0 link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: vnf__0
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: vnf__0
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port.yaml
new file mode 100644
index 000000000..b96cd38d4
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port.yaml
@@ -0,0 +1,51 @@
+# Copyright (c) 2016-2017 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 2tg-topology
+        name: 2tg-topology
+        short-name: 2tg-topology
+        description: 2tg-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
+        - member-vnf-index: '1'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__0 link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: vnf__0
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: vnf__0
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml
new file mode 100644
index 000000000..3a1c1cb12
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml
@@ -0,0 +1,55 @@
+# Copyright (c) 2017 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.
+
+---
+schema: yardstick:task:0.1
+scenarios:
+  - type: NSPerf
+    traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+    topology: cgnapt-tg-topology-ixia-multi-port-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      vnf__0: vnf__0.yardstick
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+      vnf__0:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+    ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs * 2}}_port.ixncfg
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_template.yaml
new file mode 100644
index 000000000..81000a7a5
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_template.yaml
@@ -0,0 +1,54 @@
+# Copyright (c) 2017 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.
+
+---
+schema: yardstick:task:0.1
+scenarios:
+  - type: NSPerf
+    traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+    topology: cgnapt-tg-topology-multi-port-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      vnf__0: vnf__0.yardstick
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+      vnf__0:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml
new file mode 100644
index 000000000..879911f62
--- /dev/null
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml
@@ -0,0 +1,57 @@
+# Copyright (c) 2016-2017 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.
+
+---
+schema: yardstick:task:0.1
+scenarios:
+  - type: NSPerf
+    traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
+    topology: cgnapt-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      tg__1: tg__1.yardstick
+      vnf__0: vnf__0.yardstick
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+      vnf__0:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+    ixia_profile: ../../traffic_profiles/ixia/ixia_ipv4_profile_{{ num_vnfs }}_port.ixncfg
+
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml
+   - type: Node
+     file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
+     name: yardstick
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_ixia_template.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_ixia_template.yaml
new file mode 100644
index 000000000..f442c71d0
--- /dev/null
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_ixia_template.yaml
@@ -0,0 +1,55 @@
+# Copyright (c) 2017 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.
+
+---
+schema: yardstick:task:0.1
+scenarios:
+  - type: NSPerf
+    traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+    topology: vfw-tg-topology-ixia-multi-port-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      vnf__0: vnf__0.yardstick
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+      vnf__0:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+    ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs * 2}}_port.ixncfg
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml
new file mode 100644
index 000000000..6604e6451
--- /dev/null
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml
@@ -0,0 +1,54 @@
+# Copyright (c) 2017 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.
+
+---
+schema: yardstick:task:0.1
+scenarios:
+  - type: NSPerf
+    traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+    topology: vfw-tg-topology-multi-port-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      vnf__0: vnf__0.yardstick
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+      vnf__0:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_template.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_template.yaml
new file mode 100644
index 000000000..d00fe1dcf
--- /dev/null
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_template.yaml
@@ -0,0 +1,57 @@
+# Copyright (c) 2016-2017 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.
+
+---
+schema: yardstick:task:0.1
+scenarios:
+  - type: NSPerf
+    traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
+    topology: vfw-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      tg__1: tg__1.yardstick
+      vnf__0: vnf__0.yardstick
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+      vnf__0:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+    ixia_profile: ../../traffic_profiles/ixia/ixia_ipv4_profile_{{ num_vnfs }}_port.ixncfg
+
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml
+   - type: Node
+     file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml
+     name: yardstick
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port.yaml
new file mode 100644
index 000000000..2d950b305
--- /dev/null
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port.yaml
@@ -0,0 +1,54 @@
+# Copyright (c) 2016-2017 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 3-tg_vnf-topology
+        name: 3-tg_vnf-topology
+        short-name: 3-tg_vnf-topology
+        description: 3-tg_vnf-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
+        - member-vnf-index: '1'
+          vnfd-id-ref: tg__1
+          VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
+        - member-vnf-index: '2'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/vfw_vnf.yaml      #VNF type
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__0 link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2 }}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: 2
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: vnf__0
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__{{ vnf_num }} to tg__1 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: 2
+                vnfd-connection-point-ref: xe{{vnf_num * 2 + 1}}
+                vnfd-id-ref: vnf__0
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num }}
+                vnfd-id-ref: tg__1
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-multi-port.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-multi-port.yaml
new file mode 100644
index 000000000..6e2d360b9
--- /dev/null
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-multi-port.yaml
@@ -0,0 +1,51 @@
+# Copyright (c) 2016-2017 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 2tg-topology
+        name: 2tg-topology
+        short-name: 2tg-topology
+        description: 2tg-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
+        - member-vnf-index: '1'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/vfw_vnf.yaml      #VNF type
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__0 link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: vnf__0
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: vnf__0
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-multi-port.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-multi-port.yaml
new file mode 100644
index 000000000..b5ad71c92
--- /dev/null
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-multi-port.yaml
@@ -0,0 +1,51 @@
+# Copyright (c) 2016-2017 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 2tg-topology
+        name: 2tg-topology
+        short-name: 2tg-topology
+        description: 2tg-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
+        - member-vnf-index: '1'
+          vnfd-id-ref: vnf__0
+          VNF model: ../../vnf_descriptors/vfw_vnf.yaml      #VNF type
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__0 link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num * 2}}
+                vnfd-id-ref: vnf__0
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: vnf__0
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: tg__0
+{% endfor %}