From c11ad93486a89a29cf90bfeceb0e1da38c419799 Mon Sep 17 00:00:00 2001 From: spisarski Date: Wed, 14 Jun 2017 11:22:33 +0800 Subject: Need to move file resources required by tests. Functest was not installing the heat resource files required by the snaps tests being run by Functest as the heat template file used by the tests as it was under the repository's root directory which is causing tests to fail. Change-Id: I214d2e61e92f7dfa2e9859dded1e7ea08706314d Signed-off-by: spisarski --- examples/heat/__init__.py | 15 ------------- examples/heat/test_heat_template.yaml | 42 ----------------------------------- 2 files changed, 57 deletions(-) delete mode 100644 examples/heat/__init__.py delete mode 100644 examples/heat/test_heat_template.yaml (limited to 'examples/heat') diff --git a/examples/heat/__init__.py b/examples/heat/__init__.py deleted file mode 100644 index 271c742..0000000 --- a/examples/heat/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2017 Cable Television Laboratories, Inc. ("CableLabs") -# and others. All rights reserved. -# -# 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. -__author__ = 'spisarski' diff --git a/examples/heat/test_heat_template.yaml b/examples/heat/test_heat_template.yaml deleted file mode 100644 index d81a71c..0000000 --- a/examples/heat/test_heat_template.yaml +++ /dev/null @@ -1,42 +0,0 @@ -heat_template_version: 2015-04-30 - -description: Simple template to deploy a single compute instance - -parameters: - image_name: - type: string - label: Image ID - description: Image to be used for compute instance - default: heat_utils_tests - flavor_name: - type: string - label: Instance Type - description: Type of instance (flavor) to be used - default: m1.small - -resources: - private_net: - type: OS::Neutron::Net - properties: - name: test_net - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_net } - cidr: 10.0.0.0/24 - - server1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - - my_instance: - type: OS::Nova::Server - properties: - image: { get_param: image_name } - flavor: { get_param: flavor_name } - networks: - - port: { get_resource: server1_port } -- cgit 1.2.3-korg