Merge "support for Bottlenecks soak throughputs"

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

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 270ff04..68218f3 100644 (file)
--- 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,27 +22,27 @@ 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:
-      prox_path: /root/dppd-PROX-v037/build/prox
+    vnf__0:
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
-      prox_path: /root/dppd-PROX-v037/build/prox
+    tg__0:
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd-2.cfg"
       prox_args:
         "-e": ""
         "-t": ""
 
   runner:
-    type: Search
-    interval: 5
-    timeout: 1200
+    type: Duration
+    # we kill after duration, independent of test duration, so set this high
+    duration: 300
 
 context:
   name: yardstick
@@ -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:
-      cidr: '10.1.1.0/24'
+    uplink_0:
+      cidr: '10.0.2.0/24'
       gateway_ip: 'null'
       port_security_enabled: False
-    xe1:
-      cidr: '10.1.1.0/24'
+      enable_dhcp: 'false'
+    downlink_0:
+      cidr: '10.0.3.0/24'
       gateway_ip: 'null'
       port_security_enabled: False
+      enable_dhcp: 'false'
+