X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=samples%2Fvnf_samples%2Fnsut%2Fprox%2Ftc_prox_heat_context_acl-2.yaml;h=a1f61a479ae903be87cdffe442e8fc4abfb872bc;hb=1a35633a44079ddfd40044ca38144c73988d302a;hp=44a086e0f9798e448d810b406549277698b76feb;hpb=4f842b4a7cedcc5ba89542955bf2b64c3451361d;p=yardstick.git

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
index 44a086e0f..a1f61a479 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
@@ -18,23 +18,36 @@ schema: "yardstick:task:0.1"
 scenarios:
 -
   type: NSPerf
-  traffic_profile: ../../traffic_profiles/prox_binsearch.yaml
+  #
+  # In case where we know that all the packets generated by the generator
+  # will bw received. Then use prox_binsearch.
+  #
+  # In the case where some or all the packets generated by the generator may
+  # not be received. Please use prox_heat_acl .. (This generates packets at
+  # a specific rate and does not change rate.
+  #
+  traffic_profile: ../../traffic_profiles/prox_heat_acl.yaml
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
 
-  vnf_options:
-    vnf__1:
-      prox_path: /root/dppd-PROX-v037/build/prox
+  options:
+    vnf__0:
+      collectd:
+        interval: 1
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_acl-2.cfg"
       prox_args:
         "-t": ""
-      prox_files: "configs/acl_rules-2.lua"
+      prox_files:
+        "configs/acl_rules-2.lua" : ""
 
-    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_acl-2.cfg"
       prox_args:
         "-e": ""
@@ -43,48 +56,43 @@ scenarios:
   runner:
     type: Duration
     # we kill after duration, independent of test duration, so set this high
-    duration: 100
+    duration: 300
 
 context:
   name: yardstick
-  image: yardstick-image-prox-dpdk1702
+  image: yardstick-samplevnfs
   user: ubuntu
   flavor:
-    name: yardstick-dpdk-flavor
-    vcpus: 3
+    vcpus: 10
     ram: 20480
-    disk: 4
+    disk: 6
     extra_specs:
       hw:cpu_sockets: 1
-      hw:cpu_cores: 3
+      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:
+    tg_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'
+      gateway_ip: 'null'
+      port_security_enabled: False
+      enable_dhcp: 'false'