Cleanup of ixia_profile attribute for IxNetwork TG

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

diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 16815bf..2e096a1 100644 (file)
--- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -13,6 +13,10 @@
 # limitations under the License.
 
 ---
+{% set provider = provider or none %}
+{% set physical_networks = physical_networks or ['physnet1', 'physnet2'] %}
+{% set segmentation_id = segmentation_id or none %}
+
 schema: yardstick:task:0.1
 scenarios:
 - type: NSPerf
@@ -23,8 +27,8 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      uplink: {64B: 100}
+      downlink: {64B: 100}
     flow:
       src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__0': 'xe1'}]
@@ -46,7 +50,7 @@ context:
   flavor:
     vcpus: 10
     ram: 20480
-    disk: 4
+    disk: 6
     extra_specs:
       hw:cpu_sockets: 1
       hw:cpu_cores: 10
@@ -68,15 +72,24 @@ context:
     xe0:
       cidr: '10.0.2.0/24'
       gateway_ip: 'null'
-#      port_security_enabled: False
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
+      {% if provider %}
+      provider: {{ provider }}
+      physical_network: {{ physical_networks[0] }}
+        {% if segmentation_id %}
+      segmentation_id: {{ segmentation_id }}
+        {% endif %}
+      {% endif %}
+      port_security_enabled: False
+      enable_dhcp: 'false'
     xe1:
       cidr: '10.0.3.0/24'
       gateway_ip: 'null'
-#      port_security_enabled: False
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-
+      {% if provider %}
+      provider: {{ provider }}
+      physical_network: {{ physical_networks[1] }}
+        {% if segmentation_id %}
+      segmentation_id: {{ segmentation_id }}
+        {% endif %}
+      {% endif %}
+      port_security_enabled: False
+      enable_dhcp: 'false'