X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=samples%2Fvnf_samples%2Fnsut%2Facl%2Ftc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml;h=015c20eca4ef90b20b230a2a4315583baa95bf5f;hb=2ebe6693b09a221de154a697ba24817a61e8548d;hp=3344a1de124ca1d0b0d7fc7e3ea33521a394a958;hpb=89fe59588ec6bf7da5df53cbab61731e476912c3;p=yardstick.git

diff --git a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
index 3344a1de1..015c20eca 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -19,40 +19,42 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.baremetal
-    vnf__1: vnf.yardstick
-  tc_options:
+    tg__0: trafficgen_1.baremetal
+    vnf__0: vnf.yardstick
+  options:
+    framesize:
+      uplink: {64B: 100}
+      downlink: {64B: 100}
+    flow:
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
+      count: 1
+    traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-  vnf_options:
-    acl:
+    vnf__0:
       rules: acl_1rule.yaml
-      cfg: acl_config
+      vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
+      nfvi_enable: True
   runner:
-    type: Duration
-    duration: 400
+    type: Iteration
+    iterations: 10
     interval: 35
-  traffic_options:
-    flow: ../../traffic_profiles/ipv4_1flow_Packets.yaml
-    imix: ../../traffic_profiles/imix_voice.yaml
 contexts:
   # put node context first, so we don't HEAT deploy if node has errors
   - name: baremetal
     type: Node
     file: trex-baremetal.yml
   - name: yardstick
-    image: yardstick-acl
-    flavor: yardstick-flavor
-#    flavor:
-#  #    name: yardstick-dpdk-flavor
-#      vcpus: 6
-#      ram: 20480
-#      disk: 4
-#      extra_specs:
-#        hw:cpu_sockets: 1
-#        hw:cpu_cores: 6
-#        hw:cpu_threads: 1
-#  #      hw:mem_page_size: large
+    image: yardstick-samplevnfs
+    flavor:
+      vcpus: 10
+      ram: 20480
+      disk: 6
+      extra_specs:
+        hw:cpu_sockets: 1
+        hw:cpu_cores: 10
+        hw:cpu_threads: 1
     user: ubuntu
     placement_groups:
       pgrp1:
@@ -64,11 +66,15 @@ contexts:
     networks:
       mgmt:
         cidr: '10.0.1.0/24'
-        external_network: "yardstick-public"
       xe0:
         cidr: '10.0.2.0/24'
-        vld_id: public
+        gateway_ip: 'null'
+        provider: true
+        physical_network: phystenant1
+        port_security_enabled: False
       xe1:
         cidr: '10.0.3.0/24'
-        vld_id: private
-
+        gateway_ip: 'null'
+        provider: true
+        physical_network: phystenant2
+        port_security_enabled: False