X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=samples%2Fvnf_samples%2Fnsut%2Fprox%2Ftc_prox_heat_context_l2fwd-2-l3fwd-2.yaml;h=a42ca703dd6be4d6562fa285a184406a932c4f1c;hb=145b9b8e3b109f08ae2cfee6d0a81956ebd91860;hp=af98984b68a152be10b5aa2a018e76231b3bfb4e;hpb=2761306b3d9fa31b192a44129de5bb5d39279d73;p=yardstick.git

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml
index af98984b6..a42ca703d 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2-l3fwd-2.yaml
@@ -27,13 +27,13 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-2.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-2.cfg"
       prox_args:
         "-e": ""
@@ -44,6 +44,7 @@ scenarios:
     # we kill after duration, independent of test duration, so set this high
     interval: 5
     timeout: 300
+
 -
   type: NSPerf
   traffic_profile: ../../traffic_profiles/prox_binsearch.yaml
@@ -55,15 +56,15 @@ scenarios:
 
   options:
     vnf__0:
-      prox_path: /root/dppd-PROX-v037.1/build/prox
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l3fwd-2.cfg"
       prox_args:
         "-t": ""
       prox_files:
-        "configs/ipv4-2.lua" : ""
+        "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-2.cfg"
       prox_args:
         "-e": ""
@@ -79,15 +80,15 @@ context:
   name: yardstick
   image: yardstick-samplevnfs
   user: ubuntu
-  flavor: yardstick-dpdk-flavor
-#  flavor:
-#    vcpus: 10
-#    ram: 12288
-#    disk: 6
-#    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,12 +105,12 @@ context:
     mgmt:
       cidr: '10.0.1.0/24'
     uplink_0:
-      cidr: '10.1.1.0/24'
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      cidr: '10.0.2.0/24'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'
     downlink_0:
-      cidr: '10.1.1.0/24'
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      cidr: '10.0.3.0/24'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'