Migrate Trex TG to use new NSPerf-RFC2544 scenario

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

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml
index f7f962f..46226bf 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_multiflow-2.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,18 +22,22 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      collectd:
+        interval: 1
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd_multiflow-2.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      collectd:
+        interval: 1
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd_multiflow-2.cfg"
       prox_args:
         "-e": ""
@@ -61,26 +65,23 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
 
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
-      cidr: '152.16.100.0/24'
-      vld_id: downlink
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-    xe1:
-      cidr: '152.16.40.0/24'
-      vld_id: uplink
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+    uplink_0:
+      cidr: '10.0.2.0/24'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
+    downlink_0:
+      cidr: '10.0.3.0/24'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'