Move heat resources

Change-Id: I5017bcca71b626e424b5df6d4433a5ca7b75ebc6
Implements: blueprint reorganize-resources-code-structure

heat/engine/resources/aws/autoscaling/autoscaling_group.py

@@ -28,7 +28,7 @@ from heat.engine import function
 from heat.engine.notification import autoscaling as notification
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources import instance_group as instgrp
+from heat.engine.resources.openstack.heat import instance_group as instgrp
 from heat.engine import rsrc_defn
 from heat.engine import support
 from heat.scaling import cooldown

heat/engine/resources/aws/cfn/wait_condition.py

@@ -17,7 +17,7 @@ from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine.resources.aws.cfn import wait_condition_handle as aws_wch
-from heat.engine.resources.openstack import wait_condition as heat_wc
+from heat.engine.resources.openstack.heat import wait_condition as heat_wc
 from heat.engine import support
 
 

heat/engine/resources/openstack/heat/cloud_config.py

@@ -14,7 +14,7 @@
 from heat.common.i18n import _
 from heat.common import template_format
 from heat.engine import properties
-from heat.engine.resources.software_config import software_config
+from heat.engine.resources.openstack.heat import software_config
 from heat.engine import support
 from heat.rpc import api as rpc_api
 

heat/engine/resources/openstack/heat/multi_part.py

@@ -19,7 +19,7 @@ import os
 from heat.common.i18n import _
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.software_config import software_config
+from heat.engine.resources.openstack.heat import software_config
 from heat.engine import support
 from heat.rpc import api as rpc_api
 

heat/engine/resources/openstack/heat/software_component.py

@@ -16,7 +16,7 @@ from heat.common.i18n import _
 from heat.engine import constraints as constr
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.software_config import software_config as sc
+from heat.engine.resources.openstack.heat import software_config as sc
 from heat.engine import support
 from heat.rpc import api as rpc_api
 

heat/engine/resources/openstack/heat/software_deployment.py

@@ -23,8 +23,8 @@ from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources import resource_group
-from heat.engine.resources.software_config import software_config as sc
+from heat.engine.resources.openstack.heat import resource_group
+from heat.engine.resources.openstack.heat import software_config as sc
 from heat.engine import signal_responder
 from heat.engine import support
 from heat.rpc import api as rpc_api

heat/engine/resources/openstack/heat/structured_config.py

@@ -20,8 +20,8 @@ from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.software_config import software_config as sc
-from heat.engine.resources.software_config import software_deployment as sd
+from heat.engine.resources.openstack.heat import software_config as sc
+from heat.engine.resources.openstack.heat import software_deployment as sd
 from heat.engine import support
 
 

heat/tests/openstack/test_waitcondition.py

@@ -24,7 +24,7 @@ from heat.engine.clients.os import heat_plugin
 from heat.engine import environment
 from heat.engine import parser
 from heat.engine import resource
-from heat.engine.resources.openstack import wait_condition_handle as heat_wch
+from heat.engine.resources.openstack.heat import wait_condition_handle as h_wch
 from heat.tests import common
 from heat.tests import utils
 
@@ -97,25 +97,25 @@ class HeatWaitConditionTest(common.HeatTestCase):
         if stub:
             id = identifier.ResourceIdentifier('test_tenant', stack.name,
                                                stack.id, '', 'wait_handle')
-            self.m.StubOutWithMock(heat_wch.HeatWaitConditionHandle,
+            self.m.StubOutWithMock(h_wch.HeatWaitConditionHandle,
                                    'identifier')
-            heat_wch.HeatWaitConditionHandle.identifier(
+            h_wch.HeatWaitConditionHandle.identifier(
             ).MultipleTimes().AndReturn(id)
 
         if stub_status:
-            self.m.StubOutWithMock(heat_wch.HeatWaitConditionHandle,
+            self.m.StubOutWithMock(h_wch.HeatWaitConditionHandle,
                                    'get_status')
 
         return stack
 
     def test_post_complete_to_handle(self):
         self.stack = self.create_stack()
-        heat_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS'])
-        heat_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS',
-                                                                 'SUCCESS'])
-        heat_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS',
-                                                                 'SUCCESS',
-                                                                 'SUCCESS'])
+        h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS'])
+        h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS',
+                                                              'SUCCESS'])
+        h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS',
+                                                              'SUCCESS',
+                                                              'SUCCESS'])
 
         self.m.ReplayAll()
 
@@ -132,12 +132,12 @@ class HeatWaitConditionTest(common.HeatTestCase):
 
     def test_post_failed_to_handle(self):
         self.stack = self.create_stack()
-        heat_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS'])
-        heat_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS',
-                                                                 'SUCCESS'])
-        heat_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS',
-                                                                 'SUCCESS',
-                                                                 'FAILURE'])
+        h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS'])
+        h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS',
+                                                              'SUCCESS'])
+        h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS',
+                                                              'SUCCESS',
+                                                              'FAILURE'])
 
         self.m.ReplayAll()
 
@@ -167,7 +167,7 @@ class HeatWaitConditionTest(common.HeatTestCase):
         timeutils.set_time_override(fake_clock)
         self.addCleanup(timeutils.clear_time_override)
 
-        heat_wch.HeatWaitConditionHandle.get_status(
+        h_wch.HeatWaitConditionHandle.get_status(
         ).MultipleTimes().AndReturn([])
 
         self.m.ReplayAll()
@@ -185,7 +185,7 @@ class HeatWaitConditionTest(common.HeatTestCase):
     def _create_heat_wc_and_handle(self):
         self.stack = self.create_stack(
             template=test_template_heat_waitcondition)
-        heat_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS'])
+        h_wch.HeatWaitConditionHandle.get_status().AndReturn(['SUCCESS'])
 
         self.m.ReplayAll()
         self.stack.create()

heat/tests/test_cloud_config.py

@@ -16,7 +16,7 @@ import uuid
 import mock
 
 from heat.engine import parser
-from heat.engine.resources.software_config import cloud_config as cc
+from heat.engine.resources.openstack.heat import cloud_config
 from heat.engine import template
 from heat.tests import common
 from heat.tests import utils
@@ -44,11 +44,11 @@ class CloudConfigTest(common.HeatTestCase):
         self.config._rpc_client = self.rpc_client
 
     def test_resource_mapping(self):
-        mapping = cc.resource_mapping()
+        mapping = cloud_config.resource_mapping()
         self.assertEqual(1, len(mapping))
-        self.assertEqual(cc.CloudConfig,
+        self.assertEqual(cloud_config.CloudConfig,
                          mapping['OS::Heat::CloudConfig'])
-        self.assertIsInstance(self.config, cc.CloudConfig)
+        self.assertIsInstance(self.config, cloud_config.CloudConfig)
 
     def test_handle_create(self):
         config_id = 'c8a19429-7fde-47ea-a42f-40045488226c'

heat/tests/test_cloudwatch.py

@@ -15,7 +15,7 @@ import mock
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources import cloud_watch
+from heat.engine.resources.openstack.heat import cloud_watch
 from heat.engine import scheduler
 from heat.engine import watchrule
 from heat.tests import common

heat/tests/test_cw_alarm.py

@@ -16,7 +16,7 @@ import copy
 
 from heat.common import template_format
 from heat.engine import resource
-from heat.engine.resources import cloud_watch
+from heat.engine.resources.openstack.heat import cloud_watch
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.engine import watchrule

heat/tests/test_instance_group.py

@@ -20,7 +20,7 @@ from heat.common import exception
 from heat.common import grouputils
 from heat.common import template_format
 from heat.engine import resource
-from heat.engine.resources import instance_group as instgrp
+from heat.engine.resources.openstack.heat import instance_group as instgrp
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.engine import stack as parser

heat/tests/test_instance_group_update_policy.py

@@ -18,7 +18,7 @@ import mock
 from heat.common import exception
 from heat.common import template_format
 from heat.engine import function
-from heat.engine.resources import instance_group as instgrp
+from heat.engine.resources.openstack.heat import instance_group as instgrp
 from heat.engine import rsrc_defn
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_multi_part.py

@@ -18,7 +18,7 @@ import mock
 
 from heat.common import exception as exc
 from heat.engine import parser
-from heat.engine.resources.software_config import multi_part as mp
+from heat.engine.resources.openstack.heat import multi_part as mp
 from heat.engine import template
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_random_string.py

@@ -19,7 +19,7 @@ from testtools import matchers
 from heat.common import exception
 from heat.common import template_format
 from heat.engine import parser
-from heat.engine.resources import random_string as rs
+from heat.engine.resources.openstack.heat import random_string as rs
 from heat.engine import template
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_remote_stack.py

@@ -25,7 +25,7 @@ from heat.common import template_format
 from heat.engine import environment
 from heat.engine import parser
 from heat.engine import resource
-from heat.engine.resources import remote_stack
+from heat.engine.resources.openstack.heat import remote_stack
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests import common as tests_common

heat/tests/test_resource_group.py

@@ -19,7 +19,7 @@ import six
 from heat.common import exception
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources import resource_group
+from heat.engine.resources.openstack.heat import resource_group
 from heat.engine import stack as stackm
 from heat.tests import common
 from heat.tests import generic_resource

heat/tests/test_restarter.py

@@ -16,7 +16,7 @@ import mock
 from heat.common import template_format
 from heat.engine.clients.os import nova
 from heat.engine.resources.aws.ec2 import instance
-from heat.engine.resources.openstack import ha_restarter
+from heat.engine.resources.openstack.heat import ha_restarter
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_software_component.py

@@ -16,7 +16,7 @@ import six
 
 from heat.common import exception as exc
 from heat.common import template_format
-from heat.engine.resources.software_config import software_component as sc
+from heat.engine.resources.openstack.heat import software_component as sc
 from heat.engine import stack
 from heat.engine import template
 from heat.tests import common

heat/tests/test_software_config.py

@@ -15,7 +15,7 @@ import mock
 
 from heat.common import exception as exc
 from heat.engine import parser
-from heat.engine.resources.software_config import software_config as sc
+from heat.engine.resources.openstack.heat import software_config as sc
 from heat.engine import template
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_software_deployment.py

@@ -23,7 +23,7 @@ from heat.common.i18n import _
 from heat.engine.clients.os import nova
 from heat.engine.clients.os import swift
 from heat.engine import parser
-from heat.engine.resources.software_config import software_deployment as sd
+from heat.engine.resources.openstack.heat import software_deployment as sd
 from heat.engine import rsrc_defn
 from heat.engine import template
 from heat.tests import common

heat/tests/test_structured_config.py

@@ -15,7 +15,7 @@ import mock
 
 from heat.common import exception
 from heat.engine import parser
-from heat.engine.resources.software_config import structured_config as sc
+from heat.engine.resources.openstack.heat import structured_config as sc
 from heat.engine import template
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_user.py

@@ -18,7 +18,7 @@ from heat.common import short_id
 from heat.common import template_format
 from heat.db import api as db_api
 from heat.engine.resources.aws.iam import user
-from heat.engine.resources.openstack import access_policy as ap
+from heat.engine.resources.openstack.heat import access_policy as ap
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import fakes