Merge "prox: fix TG KPIs"

[yardstick.git] / samples / vnf_samples / nsut / prox / tc_prox_heat_context_l3fwd-2.yaml

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 068f0a2..0731be5 100644 (file)
--- 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,11 +22,11 @@ scenarios:
   topology: prox-tg-topology-2.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.1/build/prox
       prox_config: "configs/handle_l3fwd-2.cfg"
       prox_args:
@@ -34,7 +34,7 @@ scenarios:
       prox_files:
         "configs/ipv4.lua" : ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037.1/build/prox
       prox_config: "configs/gen_l3fwd-2.cfg"
       prox_args:
@@ -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: 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'
\ No newline at end of file