Merge "ansible: resize VNF image"

[yardstick.git] / samples / vnf_samples / nsut / prox / tc_prox_heat_context_l2fwd-4.yaml

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 0650a09..4300617 100644 (file)
--- 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,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l2fwd-4.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l2fwd-4.cfg"
       prox_args:
@@ -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: public
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe1:
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: private
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe2:
+    uplink_1:
       cidr: '10.0.4.0/24'
-      vld_id: public
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
-    xe3:
+    downlink_1:
       cidr: '10.0.5.0/24'
-      vld_id: private
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'