Unify PROX testcases TG and VNF names

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

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml
index 25d5092..69f9da2 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,22 +22,30 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__0: tg_0.yardstick
+    tg__0: trafficgen_0.yardstick
     vnf__0: vnf_0.yardstick
 
   options:
+
+    interface_speed_gbps: 10
+
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      collectd:
+        interval: 1
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_bng_qos-4.cfg"
       prox_args:
         "-t": ""
       prox_files:
         "configs/gre_table.lua" : ""
-        "configs/ipv4.lua" : ""
+        "configs/ipv4_bng.lua" : ""
         "configs/dscp.lua" : ""
+      prox_generate_parameter: True
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      collectd:
+        interval: 1
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_bng_qos-4.cfg"
       prox_args:
         "-e": ""
@@ -46,7 +54,7 @@ scenarios:
   runner:
     type: Duration
     # we kill after duration, independent of test duration, so set this high
-    duration: 300
+    duration: 1600
 
 context:
   name: yardstick
@@ -69,7 +77,7 @@ context:
     vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    tg_0:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
 
@@ -86,12 +94,12 @@ context:
       gateway_ip: 'null'
       port_security_enabled: False
       enable_dhcp: 'false'
-    downlink_1:
+    uplink_1:
       cidr: '10.0.4.0/24'
       gateway_ip: 'null'
       port_security_enabled: False
       enable_dhcp: 'false'
-    downlink_2:
+    downlink_1:
       cidr: '10.0.5.0/24'
       gateway_ip: 'null'
       port_security_enabled: False