nsb: update HEAT testcases

use yardstick-samplevnfs image name
always create DPDK flavor, we require 1 socket, 10 cores
remove hardcoded external network
add gateway_ip: null to prevent multiple default gateways ssh bug with Heat
add enable_dhcp: false

Change-Id: I85787b72bf6ebf1c330f20f50f7a7a2b12aa995e
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

1 files changed, 0 insertions, 87 deletions

diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
deleted file mode 100644
index 355b67187..000000000
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the License);
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: acl-tg-topology.yaml
-  nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-  options:
-    framesize:
-      private: {64B: 100}
-      public: {64B: 100}
-    flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
-      count: 1
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
-      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
-context:
-  # put node context first, so we don't HEAT deploy if node has errors
-  name: yardstick
-  flavor: yardstick-dpdk-flavor
-#  flavor:
-#    name: yardstick-dpdk-flavor
-#    vcpus: 10
-#    ram: 20480
-#    disk: 4
-#    extra_specs:
-#      hw:cpu_sockets: 1
-#      hw:cpu_cores: 10
-#      hw:cpu_threads: 1
-#  #      hw:mem_page_size: large
-  user: ubuntu
-  placement_groups:
-    pgrp1:
-      policy: "availability"
-  servers:
-    vnf:
-      floating_ip: true
-      placement: "pgrp1"
-      image: yardstick-vnfs
-    trafficgen_1:
-      floating_ip: true
-      placement: "pgrp1"
-      image: yardstick-trex
-  networks:
-    mgmt:
-      cidr: '10.0.1.0/24'
-      external_network: "yardstick-public"
-    xe0:
-      cidr: '10.0.2.0/24'
-      vld_id: public
-#      port_security_enabled: False
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-    xe1:
-      cidr: '10.0.3.0/24'
-      vld_id: private
-#      port_security_enabled: False
-      allowed_address_pairs:
-        - ip_address:
-            '0.0.0.0/0'
-