X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=samples%2Fvnf_samples%2Fnsut%2Facl%2Ftc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml;h=9c6cd7fc4c6b2e2a0717bc5911241815f568ce8e;hb=01711acbd1a8b9f5bcf20073f33ad6cc83ede970;hp=6fe826642e06e64884d50d6e6954eec9d06efb1a;hpb=564496eae84e4b8916d2102222eb95877a338b20;p=yardstick.git

diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 6fe826642..9c6cd7fc4 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: tg_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
   runner:
@@ -44,10 +44,9 @@ context:
   name: yardstick
   image: yardstick-samplevnfs
   flavor:
-    name: yardstick-dpdk-flavor
     vcpus: 10
     ram: 20480
-    disk: 4
+    disk: 6
     extra_specs:
       hw:cpu_sockets: 1
       hw:cpu_cores: 10
@@ -57,31 +56,37 @@ context:
     pgrp1:
       policy: "availability"
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-      image: yardstick-vnfs
-    trafficgen_1:
+      network_ports:
+        mgmt:
+          - mgmt
+        uplink_0:
+          - xe0
+        downlink_0:
+          - xe1
+    tg_0:
       floating_ip: true
       placement: "pgrp1"
-      image: yardstick-trex
+      network_ports:
+        mgmt:
+          - mgmt
+        uplink_0:
+          - xe0
+        downlink_0:
+          - xe1
   networks:
     mgmt:
       cidr: '10.0.1.0/24'
-    xe0:
-      cidr: '10.0.2.0/24'
-      vld_id: public_1
+    uplink_0:
+      cidr: '10.1.0.0/24'
       gateway_ip: 'null'
-#      port_security_enabled: False
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-    xe1:
-      cidr: '10.0.3.0/24'
-      vld_id: private_1
+      port_security_enabled: False
+      enable_dhcp: 'false'
+    downlink_0:
+      cidr: '10.1.1.0/24'
       gateway_ip: 'null'
-#      port_security_enabled: False
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      port_security_enabled: False
+      enable_dhcp: 'false'