Merge "prox testcases: private -> uplink,public -> downlink, vnf_0, tg_0"

22 files changed, 346 insertions, 258 deletions

diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
index ee7909b3b..10902a7b8 100644
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
@@ -26,7 +26,7 @@ nsd:nsd-catalog:
             vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/prox_vnf-1.yaml
         vld:
-        -   id: uplink
+        -   id: uplink_0
             name: tg__0 to vnf__0 link 1
             type: ELAN
             vnfd-connection-point-ref:
@@ -37,7 +37,7 @@ nsd:nsd-catalog:
                 vnfd-connection-point-ref: xe0
                 vnfd-id-ref: vnf__0
 
-        -   id: downlink
+        -   id: downlink_0
             name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
index 9421935a9..11eed52fc 100644
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
@@ -26,7 +26,7 @@ nsd:nsd-catalog:
             vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/prox_vnf-2.yaml
         vld:
-        -   id: uplink
+        -   id: uplink_0
             name: tg__0 to vnf__0 link 1
             type: ELAN
             vnfd-connection-point-ref:
@@ -37,7 +37,7 @@ nsd:nsd-catalog:
                 vnfd-connection-point-ref: xe0
                 vnfd-id-ref: vnf__0
 
-        -   id: downlink
+        -   id: downlink_0
             name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
index 7834a5c9b..1307b6870 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -46,7 +46,7 @@ scenarios:
 
 context:
   name: yardstick
-  image: yardstick-image-prox-dpdk1702
+  image: yardstick-samplevnfs
   user: ubuntu
   flavor:
 #    name: yardstick-dpdk-flavor
@@ -63,20 +63,17 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
index 123cec976..b23517366 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -47,44 +47,42 @@ scenarios:
 
 context:
   name: yardstick
-  image: yardstick-image-prox-dpdk1702
+  image: yardstick-samplevnfs
   user: ubuntu
-  flavor:
-    name: yardstick-dpdk-flavor
-    vcpus: 3
-    ram: 20480
-    disk: 4
-    extra_specs:
-      hw:cpu_sockets: 1
-      hw:cpu_cores: 3
-      hw:cpu_threads: 1
+  flavor: yardstick-dpdk-flavor
+#  flavor:
+#    name: yardstick-dpdk-flavor
+#    vcpus: 10
+#    ram: 20480
+#    disk: 6
+#    extra_specs:
+#      hw:cpu_sockets: 1
+#      hw:cpu_cores: 10
+#      hw:cpu_threads: 1
 #      hw:mem_page_size: large
   placement_groups:
     pgrp1:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-    xe1:
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
 
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
index 9ede5a060..125d463aa 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -47,7 +47,7 @@ scenarios:
 
 context:
   name: yardstick
-  image: yardstick-image-prox-dpdk1702
+  image: yardstick-samplevnfs
   user: ubuntu
   flavor:
     name: yardstick-dpdk-flavor
@@ -64,38 +64,33 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe2:
+    uplink_1:
       cidr: '10.0.4.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe3:
+    downlink_1:
       cidr: '10.0.5.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
index a62fa5f2c..ab4c3a913 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-1.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -61,20 +61,18 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml
new file mode 100644
index 000000000..af98984b6
--- /dev/null
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml
@@ -0,0 +1,115 @@
+# 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/prox_binsearch.yaml
+  topology: prox-tg-topology-2.yaml
+
+  nodes:
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
+
+  options:
+    vnf__0:
+      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_config: "configs/handle_l2fwd-2.cfg"
+      prox_args:
+        "-t": ""
+
+    tg__0:
+      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_config: "configs/gen_l2fwd-2.cfg"
+      prox_args:
+        "-e": ""
+        "-t": ""
+
+  runner:
+    type: Search
+    # we kill after duration, independent of test duration, so set this high
+    interval: 5
+    timeout: 300
+-
+  type: NSPerf
+  traffic_profile: ../../traffic_profiles/prox_binsearch.yaml
+  topology: prox-tg-topology-2.yaml
+
+  nodes:
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
+
+  options:
+    vnf__0:
+      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_config: "configs/handle_l3fwd-2.cfg"
+      prox_args:
+        "-t": ""
+      prox_files:
+        "configs/ipv4-2.lua" : ""
+
+    tg__0:
+      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_config: "configs/gen_l3fwd-2.cfg"
+      prox_args:
+        "-e": ""
+        "-t": ""
+
+  runner:
+    type: Search
+    # we kill after duration, independent of test duration, so set this high
+    interval: 5
+    timeout: 300
+
+context:
+  name: yardstick
+  image: yardstick-samplevnfs
+  user: ubuntu
+  flavor: yardstick-dpdk-flavor
+#  flavor:
+#    vcpus: 10
+#    ram: 12288
+#    disk: 6
+#    extra_specs:
+#      hw:cpu_sockets: 1
+#      hw:cpu_cores: 10
+#      hw:cpu_threads: 1
+  placement_groups:
+    pgrp1:
+      policy: "availability"
+
+  servers:
+    vnf_0:
+      floating_ip: true
+      placement: "pgrp1"
+    tg_0:
+      floating_ip: true
+      placement: "pgrp1"
+
+  networks:
+    mgmt:
+      cidr: '10.0.1.0/24'
+    uplink_0:
+      cidr: '10.1.1.0/24'
+      allowed_address_pairs:
+        - ip_address:
+            '0.0.0.0/0'
+    downlink_0:
+      cidr: '10.1.1.0/24'
+      allowed_address_pairs:
+        - ip_address:
+            '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
index 6193fd3fb..2080935de 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -61,21 +61,24 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-    xe0:
+    uplink_0:
       cidr: '10.1.1.0/24'
       gateway_ip: 'null'
       port_security_enabled: False
-    xe1:
+      enable_dhcp: 'false'
+    downlink_0:
       cidr: '10.1.1.0/24'
       gateway_ip: 'null'
       port_security_enabled: False
+      enable_dhcp: 'false'
+
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml
new file mode 100644
index 000000000..b5b98eae0
--- /dev/null
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml
@@ -0,0 +1,124 @@
+# 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/prox_binsearch.yaml
+  topology: prox-tg-topology-4.yaml
+
+  nodes:
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
+
+  options:
+    vnf__0:
+      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_config: "configs/handle_l3fwd-4.cfg"
+      prox_args:
+        "-t": ""
+      prox_files:
+        "configs/ipv4.lua" : ""
+
+    tg__0:
+      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_config: "configs/gen_l3fwd-4.cfg"
+      prox_args:
+        "-e": ""
+        "-t": ""
+
+  runner:
+    type: Search
+    interval: 5
+    timeout: 300
+
+-
+  type: NSPerf
+  traffic_profile: ../../traffic_profiles/prox_binsearch.yaml
+  topology: prox-tg-topology-4.yaml
+
+  nodes:
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
+
+  options:
+    vnf__0:
+      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_config: "configs/handle_l2fwd-4.cfg"
+      prox_args:
+        "-t": ""
+
+    tg__0:
+      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_config: "configs/gen_l2fwd-4.cfg"
+      prox_args:
+        "-e": ""
+        "-t": ""
+
+  runner:
+    type: Search
+    interval: 5
+    timeout: 300
+
+context:
+  name: yardstick
+  image: yardstick-samplevnfs
+  user: ubuntu
+  flavor: yardstick-dpdk-flavor
+#  flavor:
+#    vcpus: 10
+#    ram: 20480
+#    disk: 4
+#    extra_specs:
+#      hw:cpu_sockets: 1
+#      hw:cpu_cores: 10
+#      hw:cpu_threads: 1
+  placement_groups:
+    pgrp1:
+      policy: "availability"
+
+  servers:
+    vnf_0:
+      floating_ip: true
+      placement: "pgrp1"
+    tg_0:
+      floating_ip: true
+      placement: "pgrp1"
+
+  networks:
+    mgmt:
+      cidr: '10.0.1.0/24'
+    uplink_0:
+      cidr: '10.0.2.0/24'
+      allowed_address_pairs:
+        - ip_address:
+            '0.0.0.0/0'
+    downlink_0:
+      cidr: '10.0.3.0/24'
+      allowed_address_pairs:
+        - ip_address:
+            '0.0.0.0/0'
+    uplink_1:
+      cidr: '10.0.4.0/24'
+      allowed_address_pairs:
+        - ip_address:
+            '0.0.0.0/0'
+    downlink_1:
+      cidr: '10.0.5.0/24'
+      allowed_address_pairs:
+        - ip_address:
+            '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
index 881bcfb0e..43006175e 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -61,37 +61,33 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe2:
+    uplink_1:
       cidr: '10.0.4.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe3:
+    downlink_1:
       cidr: '10.0.5.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
index 48a85d4f3..2ed7eeb77 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -61,25 +61,23 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
index 5bc06e8c2..e85a4111a 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -61,37 +61,33 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe2:
+    uplink_1:
       cidr: '10.0.4.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe3:
+    downlink_1:
       cidr: '10.0.5.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
index c7a7aa881..0731be5da 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -64,26 +64,23 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
\ No newline at end of file
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
index f5172d545..fc24db517 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -64,38 +64,33 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe2:
+    uplink_1:
       cidr: '10.0.4.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe3:
+    downlink_1:
       cidr: '10.0.5.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
\ No newline at end of file
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
index 10d0984c0..fe8237e2b 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -62,26 +62,23 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
index 75555ccc6..ca1b65cf2 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
@@ -62,38 +62,33 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe2:
+    uplink_1:
       cidr: '10.0.4.0/24'
-      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe3:
+    downlink_1:
       cidr: '10.0.5.0/24'
-      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/vnf_descriptors/prox_vnf-1.yaml b/samples/vnf_samples/vnf_descriptors/prox_vnf-1.yaml
index 3b3739fc5..13c4e9db7 100644
--- a/samples/vnf_samples/vnf_descriptors/prox_vnf-1.yaml
+++ b/samples/vnf_samples/vnf_descriptors/prox_vnf-1.yaml
@@ -32,9 +32,6 @@ vnfd:vnfd-catalog:
             {% if key_filename is defined %}
             key_filename: '{{key_filename}}'  # Value filled by vnfdgen
             {% endif %}
-        connection-point:
-        -   name: xe0
-            type: VPORT
         vdu:
         -   id: proxvnf-baremetal
             name: proxvnf-baremetal
diff --git a/samples/vnf_samples/vnf_descriptors/prox_vnf-2.yaml b/samples/vnf_samples/vnf_descriptors/prox_vnf-2.yaml
index 75c16ba5a..13c4e9db7 100644
--- a/samples/vnf_samples/vnf_descriptors/prox_vnf-2.yaml
+++ b/samples/vnf_samples/vnf_descriptors/prox_vnf-2.yaml
@@ -32,11 +32,6 @@ vnfd:vnfd-catalog:
             {% if key_filename is defined %}
             key_filename: '{{key_filename}}'  # Value filled by vnfdgen
             {% endif %}
-        connection-point:
-        -   name: xe0
-            type: VPORT
-        -   name: xe1
-            type: VPORT
         vdu:
         -   id: proxvnf-baremetal
             name: proxvnf-baremetal
diff --git a/samples/vnf_samples/vnf_descriptors/prox_vnf-4.yaml b/samples/vnf_samples/vnf_descriptors/prox_vnf-4.yaml
index 75c16ba5a..13c4e9db7 100644
--- a/samples/vnf_samples/vnf_descriptors/prox_vnf-4.yaml
+++ b/samples/vnf_samples/vnf_descriptors/prox_vnf-4.yaml
@@ -32,11 +32,6 @@ vnfd:vnfd-catalog:
             {% if key_filename is defined %}
             key_filename: '{{key_filename}}'  # Value filled by vnfdgen
             {% endif %}
-        connection-point:
-        -   name: xe0
-            type: VPORT
-        -   name: xe1
-            type: VPORT
         vdu:
         -   id: proxvnf-baremetal
             name: proxvnf-baremetal
diff --git a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-1.yaml b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-1.yaml
index b186b4cb0..730143972 100644
--- a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-1.yaml
+++ b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-1.yaml
@@ -32,27 +32,10 @@ vnfd:vnfd-catalog:
             {% if key_filename is defined %}
             key_filename: '{{key_filename}}'  # Value filled by vnfdgen
             {% endif %}
-        connection-point:
-        -   name: xe0
-            type: VPORT
         vdu:
         -   id: proxgen-baremetal
             name: proxgen-baremetal
             description: prox stateless traffic verifier
-            external-interface:
-            -   name: xe0
-                virtual-interface:
-                    type: PCI-PASSTHROUGH
-                    # Substitution variables MUST be quoted. Otherwise Python can misinterpet them.
-                    vpci: '{{ interfaces.xe0.vpci }}' # Value filled by vnfdgen
-                    local_iface_name: '{{ interfaces.xe0.local_iface_name }}' # Value filled by vnfdgen
-                    local_ip: '{{ interfaces.xe0.local_ip }}' # Value filled by vnfdgen
-                    driver: '{{ interfaces.xe0.driver}}' # Value filled by vnfdgen
-                    dst_ip: '{{ interfaces.xe0.dst_ip }}' # Value filled by vnfdgen
-                    local_mac: '{{ interfaces.xe0.local_mac }}' # Value filled by vnfdgen
-                    dst_mac: '{{ interfaces.xe0.dst_mac }}' # Value filled by vnfdgen
-                    bandwidth: 10 Gbps
-                vnfd-connection-point-ref: xe0
         benchmark:
             kpi:
                 - rx_throughput_fps
diff --git a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-2.yaml b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-2.yaml
index e90a8d684..20bd12ca2 100644
--- a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-2.yaml
+++ b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-2.yaml
@@ -32,41 +32,10 @@ vnfd:vnfd-catalog:
             {% if key_filename is defined %}
             key_filename: '{{key_filename}}'  # Value filled by vnfdgen
             {% endif %}
-        connection-point:
-        -   name: xe0
-            type: VPORT
-        -   name: xe1
-            type: VPORT
         vdu:
         -   id: proxgen-baremetal
             name: proxgen-baremetal
             description: prox stateless traffic verifier
-            external-interface:
-            -   name: xe0
-                virtual-interface:
-                    type: PCI-PASSTHROUGH
-                    # Substitution variables MUST be quoted. Otherwise Python can misinterpet them.
-                    vpci: '{{ interfaces.xe0.vpci }}' # Value filled by vnfdgen
-                    local_iface_name: '{{ interfaces.xe0.local_iface_name }}' # Value filled by vnfdgen
-                    local_ip: '{{ interfaces.xe0.local_ip }}' # Value filled by vnfdgen
-                    driver: '{{ interfaces.xe0.driver}}' # Value filled by vnfdgen
-                    dst_ip: '{{ interfaces.xe0.dst_ip }}' # Value filled by vnfdgen
-                    local_mac: '{{ interfaces.xe0.local_mac }}' # Value filled by vnfdgen
-                    dst_mac: '{{ interfaces.xe0.dst_mac }}' # Value filled by vnfdgen
-                    bandwidth: 10 Gbps
-                vnfd-connection-point-ref: xe0
-            -   name: xe1
-                virtual-interface:
-                    type: PCI-PASSTHROUGH
-                    vpci: '{{ interfaces.xe1.vpci }}' # Value filled by vnfdgen
-                    local_iface_name: '{{ interfaces.xe1.local_iface_name }}' # Value filled by vnfdgen
-                    local_ip: '{{ interfaces.xe1.local_ip }}' # Value filled by vnfdgen
-                    driver: '{{ interfaces.xe1.driver}}' # Value filled by vnfdgen
-                    dst_ip: '{{ interfaces.xe1.dst_ip }}' # Value filled by vnfdgen
-                    local_mac: '{{ interfaces.xe1.local_mac }}' # Value filled by vnfdgen
-                    dst_mac: '{{ interfaces.xe1.dst_mac }}' # Value filled by vnfdgen
-                    bandwidth: 10 Gbps
-                vnfd-connection-point-ref: xe1
 
         benchmark:
             kpi:
diff --git a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-4.yaml b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-4.yaml
index afea337af..20bd12ca2 100644
--- a/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-4.yaml
+++ b/samples/vnf_samples/vnf_descriptors/tg_prox_tpl-4.yaml
@@ -32,65 +32,10 @@ vnfd:vnfd-catalog:
             {% if key_filename is defined %}
             key_filename: '{{key_filename}}'  # Value filled by vnfdgen
             {% endif %}
-        connection-point:
-        -   name: xe0
-            type: VPORT
-        -   name: xe1
-            type: VPORT
         vdu:
         -   id: proxgen-baremetal
             name: proxgen-baremetal
             description: prox stateless traffic verifier
-            external-interface:
-            -   name: xe0
-                virtual-interface:
-                    type: PCI-PASSTHROUGH
-                    # Substitution variables MUST be quoted. Otherwise Python can misinterpet them.
-                    vpci: '{{ interfaces.xe0.vpci }}' # Value filled by vnfdgen
-                    local_iface_name: '{{ interfaces.xe0.local_iface_name }}' # Value filled by vnfdgen
-                    local_ip: '{{ interfaces.xe0.local_ip }}' # Value filled by vnfdgen
-                    driver: '{{ interfaces.xe0.driver}}' # Value filled by vnfdgen
-                    dst_ip: '{{ interfaces.xe0.dst_ip }}' # Value filled by vnfdgen
-                    local_mac: '{{ interfaces.xe0.local_mac }}' # Value filled by vnfdgen
-                    dst_mac: '{{ interfaces.xe0.dst_mac }}' # Value filled by vnfdgen
-                    bandwidth: 10 Gbps
-                vnfd-connection-point-ref: xe0
-            -   name: xe1
-                virtual-interface:
-                    type: PCI-PASSTHROUGH
-                    vpci: '{{ interfaces.xe1.vpci }}' # Value filled by vnfdgen
-                    local_iface_name: '{{ interfaces.xe1.local_iface_name }}' # Value filled by vnfdgen
-                    local_ip: '{{ interfaces.xe1.local_ip }}' # Value filled by vnfdgen
-                    driver: '{{ interfaces.xe1.driver}}' # Value filled by vnfdgen
-                    dst_ip: '{{ interfaces.xe1.dst_ip }}' # Value filled by vnfdgen
-                    local_mac: '{{ interfaces.xe1.local_mac }}' # Value filled by vnfdgen
-                    dst_mac: '{{ interfaces.xe1.dst_mac }}' # Value filled by vnfdgen
-                    bandwidth: 10 Gbps
-                vnfd-connection-point-ref: xe1
-            -   name: xe2
-                virtual-interface:
-                    type: PCI-PASSTHROUGH
-                    vpci: '{{ interfaces.xe2.vpci }}' # Value filled by vnfdgen
-                    local_iface_name: '{{ interfaces.xe2.local_iface_name }}' # Value filled by vnfdgen
-                    local_ip: '{{ interfaces.xe2.local_ip }}' # Value filled by vnfdgen
-                    driver: '{{ interfaces.xe2.driver}}' # Value filled by vnfdgen
-                    dst_ip: '{{ interfaces.xe2.dst_ip }}' # Value filled by vnfdgen
-                    local_mac: '{{ interfaces.xe2.local_mac }}' # Value filled by vnfdgen
-                    dst_mac: '{{ interfaces.xe2.dst_mac }}' # Value filled by vnfdgen
-                    bandwidth: 10 Gbps
-                vnfd-connection-point-ref: xe2
-            -   name: xe3
-                virtual-interface:
-                    type: PCI-PASSTHROUGH
-                    vpci: '{{ interfaces.xe3.vpci }}' # Value filled by vnfdgen
-                    local_iface_name: '{{ interfaces.xe3.local_iface_name }}' # Value filled by vnfdgen
-                    local_ip: '{{ interfaces.xe3.local_ip }}' # Value filled by vnfdgen
-                    driver: '{{ interfaces.xe3.driver}}' # Value filled by vnfdgen
-                    dst_ip: '{{ interfaces.xe3.dst_ip }}' # Value filled by vnfdgen
-                    local_mac: '{{ interfaces.xe3.local_mac }}' # Value filled by vnfdgen
-                    dst_mac: '{{ interfaces.xe3.dst_mac }}' # Value filled by vnfdgen
-                    bandwidth: 10 Gbps
-                vnfd-connection-point-ref: xe3
 
         benchmark:
             kpi: