Merge "bugfix: tc023 miss description and tc050-58 wrong description"

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

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml
index b5b98ea..4ea0b2e 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4-l3fwd-4.yaml
@@ -27,7 +27,7 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l3fwd-4.cfg"
       prox_args:
         "-t": ""
@@ -35,7 +35,7 @@ scenarios:
         "configs/ipv4.lua" : ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l3fwd-4.cfg"
       prox_args:
         "-e": ""
@@ -57,13 +57,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-4.cfg"
       prox_args:
         "-t": ""
 
     tg__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd-4.cfg"
       prox_args:
         "-e": ""
@@ -78,15 +78,14 @@ context:
   name: yardstick
   image: yardstick-samplevnfs
   user: ubuntu
-  flavor: yardstick-dpdk-flavor
-#  flavor:
-#    vcpus: 10
-#    ram: 20480
-#    disk: 4
-#    extra_specs:
-#      hw:cpu_sockets: 1
-#      hw:cpu_cores: 10
-#      hw:cpu_threads: 1
+  flavor:
+    vcpus: 10
+    ram: 20480
+    disk: 6
+    extra_specs:
+      hw:cpu_sockets: 1
+      hw:cpu_cores: 10
+      hw:cpu_threads: 1
   placement_groups:
     pgrp1:
       policy: "availability"
@@ -104,21 +103,21 @@ context:
       cidr: '10.0.1.0/24'
     uplink_0:
       cidr: '10.0.2.0/24'
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
     downlink_0:
       cidr: '10.0.3.0/24'
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
     uplink_1:
       cidr: '10.0.4.0/24'
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
     downlink_1:
       cidr: '10.0.5.0/24'
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'