Cleanup of ixia_profile attribute for IxNetwork TG

[yardstick.git] / samples / vnf_samples / nsut / vfw / tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml

diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
index 06b19eb..042eb24 100644 (file)
--- a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,30 +19,29 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ixia_ipv4_latency.yaml
   topology: vfw_vnf_topology_ixia.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick1
-    vnf__1: vnf.yardstick
+    tg__0: tg_0.traffic_gen
+    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:
     type: Iteration
     iterations: 10
     interval: 35
-  ixia_profile: ../../traffic_profiles/vfw/vfw_ipv4_profile_1flows.ixncfg
 contexts:
   # put node context first, so we don't HEAT deploy if node has errors
-  - name: yardstick1
+  - name: traffic_gen
     type: Node
     file: ixia.yml
   - name: yardstick
@@ -50,7 +49,7 @@ contexts:
     flavor:
       vcpus: 10
       ram: 20480
-      disk: 4
+      disk: 6
       extra_specs:
         hw:cpu_sockets: 1
         hw:cpu_cores: 10
@@ -66,17 +65,17 @@ contexts:
     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'
         provider: true
         physical_network: phystenant1
-        port_security_enabled: False
-      xe1:
-        cidr: '10.0.3.0/24'
-        vld_id: private_1
+        port_security_enabled: false
+        enable_dhcp: 'false'
+      downlink_0:
+        cidr: '10.2.0.0/24'
         gateway_ip: 'null'
         provider: true
         physical_network: phystenant2
-        port_security_enabled: False
+        port_security_enabled: false
+        enable_dhcp: 'false'