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 <s.pisarski@cablelabs.com>

7 files changed, 6 insertions, 33 deletions

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/snaps/openstack/tests/create_stack_tests.py b/snaps/openstack/tests/create_stack_tests.py
index 42d74d8..e665f82 100644
--- a/snaps/openstack/tests/create_stack_tests.py
+++ b/snaps/openstack/tests/create_stack_tests.py
@@ -146,7 +146,8 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
         self.env_values = {'image_name': self.image_creator.image_settings.name,
                            'flavor_name': self.flavor_creator.flavor_settings.name}
 
-        self.heat_tmplt_path = pkg_resources.resource_filename('examples.heat', 'test_heat_template.yaml')
+        self.heat_tmplt_path = pkg_resources.resource_filename(
+            'snaps.openstack.tests.heat', 'test_heat_template.yaml')
 
     def tearDown(self):
         """
@@ -289,7 +290,8 @@ class CreateStackNegativeTests(OSIntegrationTestCase):
 
         self.stack_name = self.__class__.__name__ + '-' + str(uuid.uuid4())
         self.stack_creator = None
-        self.heat_tmplt_path = pkg_resources.resource_filename('examples.heat', 'test_heat_template.yaml')
+        self.heat_tmplt_path = pkg_resources.resource_filename(
+            'snaps.openstack.tests.heat', 'test_heat_template.yaml')
 
     def tearDown(self):
         if self.stack_creator:
diff --git a/snaps/openstack/tests/heat/__init__.py b/snaps/openstack/tests/heat/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/snaps/openstack/tests/heat/__init__.py
diff --git a/examples/heat/test_heat_template.yaml b/snaps/openstack/tests/heat/test_heat_template.yaml
index d81a71c..d81a71c 100644
--- a/examples/heat/test_heat_template.yaml
+++ b/snaps/openstack/tests/heat/test_heat_template.yaml
diff --git a/snaps/openstack/utils/tests/heat_utils_tests.py b/snaps/openstack/utils/tests/heat_utils_tests.py
index 95f83ce..eefc1bf 100644
--- a/snaps/openstack/utils/tests/heat_utils_tests.py
+++ b/snaps/openstack/utils/tests/heat_utils_tests.py
@@ -87,7 +87,8 @@ class HeatUtilsCreateStackTests(OSComponentTestCase):
 
         env_values = {'image_name': self.image_creator.image_settings.name,
                       'flavor_name': self.flavor_creator.flavor_settings.name}
-        heat_tmplt_path = pkg_resources.resource_filename('examples.heat', 'test_heat_template.yaml')
+        heat_tmplt_path = pkg_resources.resource_filename(
+            'snaps.openstack.tests.heat', 'test_heat_template.yaml')
         self.stack_settings = StackSettings(name=stack_name, template_path=heat_tmplt_path, env_values=env_values)
         self.stack = None
         self.heat_client = heat_utils.heat_client(self.os_creds)
diff --git a/snaps/provisioning/heat/__init__.py b/snaps/provisioning/heat/__init__.py
deleted file mode 100644
index 271c742..0000000
--- a/snaps/provisioning/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/__init__.py b/snaps/provisioning/tests/scripts/__init__.py
index 271c742..271c742 100644
--- a/examples/__init__.py
+++ b/snaps/provisioning/tests/scripts/__init__.py