Unify PROX testcases TG and VNF names

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

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
index 4b3bd78..811f5be 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-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,18 +22,22 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
-    vnf__1:
-      prox_path: /root/dppd-PROX-v037/build/prox
+    vnf__0:
+      collectd:
+        interval: 1
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_mpls_tag_untag-4.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
-      prox_path: /root/dppd-PROX-v037/build/prox
+    tg__0:
+      collectd:
+        interval: 1
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_mpls_tag_untag-4.cfg"
       prox_args:
         "-e": ""
@@ -51,50 +55,44 @@ context:
   flavor:
     vcpus: 10
     ram: 20480
-    disk: 4
+    disk: 6
     extra_specs:
       hw:cpu_sockets: 1
       hw:cpu_cores: 10
       hw:cpu_threads: 1
-#      hw:mem_page_size: large
+
   placement_groups:
     pgrp1:
       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:
+    uplink_0:
       cidr: '10.0.2.0/24'
-      vld_id: public
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-    xe1:
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
+    downlink_0:
       cidr: '10.0.3.0/24'
-      vld_id: private
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-    xe2:
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
+    uplink_1:
       cidr: '10.0.4.0/24'
-      vld_id: public
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-    xe3:
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
+    downlink_1:
       cidr: '10.0.5.0/24'
-      vld_id: private
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'