From a1336e2527669da0f61ef2d8e7fc7d10b4410035 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Sun, 15 Feb 2015 16:25:30 +0800 Subject: [PATCH] Move resource inheritance class to engine/resources Move the resources which inherit from 'Resource' to engine/resources, such as stack_resource, stack_user and signal_responder, and move non-resources to engine/, such as iso_8601.py module. Change-Id: Ic26c34cc8d34ca03ce674dc8c6ac32c10885b75f Implements: blueprint reorganize-resources-code-structure --- heat/engine/{resources => }/iso_8601.py | 0 heat/engine/{resources => }/nova_utils.py | 0 .../resources/aws/autoscaling/scaling_policy.py | 2 +- heat/engine/resources/aws/cfn/stack.py | 2 +- .../resources/aws/cfn/wait_condition_handle.py | 2 +- heat/engine/resources/aws/iam/user.py | 2 +- heat/engine/resources/aws/lb/loadbalancer.py | 2 +- heat/engine/resources/openstack/heat/ha_restarter.py | 2 +- .../resources/openstack/heat/instance_group.py | 2 +- .../resources/openstack/heat/resource_group.py | 2 +- .../resources/openstack/heat/scaling_policy.py | 2 +- .../resources/openstack/heat/software_deployment.py | 2 +- heat/engine/resources/openstack/nova/server.py | 2 +- heat/engine/{ => resources}/signal_responder.py | 2 +- heat/engine/{ => resources}/stack_resource.py | 0 heat/engine/{ => resources}/stack_user.py | 0 heat/engine/resources/template_resource.py | 2 +- heat/engine/resources/wait_condition.py | 2 +- heat/tests/generic_resource.py | 4 ++-- heat/tests/test_iso_8601.py | 2 +- heat/tests/test_nova_client.py | 2 +- heat/tests/test_nova_utils.py | 12 ++++++------ heat/tests/test_signal.py | 2 +- heat/tests/test_stack_resource.py | 2 +- heat/tests/test_stack_user.py | 2 +- setup.cfg | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) rename heat/engine/{resources => }/iso_8601.py (100%) rename heat/engine/{resources => }/nova_utils.py (100%) rename heat/engine/{ => resources}/signal_responder.py (98%) rename heat/engine/{ => resources}/stack_resource.py (100%) rename heat/engine/{ => resources}/stack_user.py (100%) diff --git a/heat/engine/resources/iso_8601.py b/heat/engine/iso_8601.py similarity index 100% rename from heat/engine/resources/iso_8601.py rename to heat/engine/iso_8601.py diff --git a/heat/engine/resources/nova_utils.py b/heat/engine/nova_utils.py similarity index 100% rename from heat/engine/resources/nova_utils.py rename to heat/engine/nova_utils.py diff --git a/heat/engine/resources/aws/autoscaling/scaling_policy.py b/heat/engine/resources/aws/autoscaling/scaling_policy.py index 7cb314a24f..57f3707093 100644 --- a/heat/engine/resources/aws/autoscaling/scaling_policy.py +++ b/heat/engine/resources/aws/autoscaling/scaling_policy.py @@ -20,7 +20,7 @@ from heat.common.i18n import _LI from heat.engine import attributes from heat.engine import constraints from heat.engine import properties -from heat.engine import signal_responder +from heat.engine.resources import signal_responder from heat.scaling import cooldown LOG = logging.getLogger(__name__) diff --git a/heat/engine/resources/aws/cfn/stack.py b/heat/engine/resources/aws/cfn/stack.py index cfc5ee401a..c1ec832318 100644 --- a/heat/engine/resources/aws/cfn/stack.py +++ b/heat/engine/resources/aws/cfn/stack.py @@ -19,7 +19,7 @@ from heat.common import template_format from heat.common import urlfetch from heat.engine import attributes from heat.engine import properties -from heat.engine import stack_resource +from heat.engine.resources import stack_resource class NestedStack(stack_resource.StackResource): diff --git a/heat/engine/resources/aws/cfn/wait_condition_handle.py b/heat/engine/resources/aws/cfn/wait_condition_handle.py index 24bb26e01e..0811a068cb 100644 --- a/heat/engine/resources/aws/cfn/wait_condition_handle.py +++ b/heat/engine/resources/aws/cfn/wait_condition_handle.py @@ -13,8 +13,8 @@ import six +from heat.engine.resources import signal_responder from heat.engine.resources import wait_condition as wc_base -from heat.engine import signal_responder from heat.engine import support diff --git a/heat/engine/resources/aws/iam/user.py b/heat/engine/resources/aws/iam/user.py index 8aee97753e..53fd453ba7 100644 --- a/heat/engine/resources/aws/iam/user.py +++ b/heat/engine/resources/aws/iam/user.py @@ -21,7 +21,7 @@ from heat.engine import attributes from heat.engine import constraints from heat.engine import properties from heat.engine import resource -from heat.engine import stack_user +from heat.engine.resources import stack_user LOG = logging.getLogger(__name__) diff --git a/heat/engine/resources/aws/lb/loadbalancer.py b/heat/engine/resources/aws/lb/loadbalancer.py index 2a79a63293..e642360473 100644 --- a/heat/engine/resources/aws/lb/loadbalancer.py +++ b/heat/engine/resources/aws/lb/loadbalancer.py @@ -23,7 +23,7 @@ from heat.common import template_format from heat.engine import attributes from heat.engine import constraints from heat.engine import properties -from heat.engine import stack_resource +from heat.engine.resources import stack_resource LOG = logging.getLogger(__name__) diff --git a/heat/engine/resources/openstack/heat/ha_restarter.py b/heat/engine/resources/openstack/heat/ha_restarter.py index aeb6bc9e0a..190d1352a5 100644 --- a/heat/engine/resources/openstack/heat/ha_restarter.py +++ b/heat/engine/resources/openstack/heat/ha_restarter.py @@ -19,7 +19,7 @@ from heat.common.i18n import _LI from heat.engine import attributes from heat.engine import constraints from heat.engine import properties -from heat.engine import signal_responder +from heat.engine.resources import signal_responder from heat.engine import support LOG = logging.getLogger(__name__) diff --git a/heat/engine/resources/openstack/heat/instance_group.py b/heat/engine/resources/openstack/heat/instance_group.py index 5082efe73b..913b583cf1 100644 --- a/heat/engine/resources/openstack/heat/instance_group.py +++ b/heat/engine/resources/openstack/heat/instance_group.py @@ -18,9 +18,9 @@ from heat.common import timeutils as iso8601utils from heat.engine import attributes from heat.engine import function from heat.engine import properties +from heat.engine.resources import stack_resource from heat.engine import rsrc_defn from heat.engine import scheduler -from heat.engine import stack_resource from heat.scaling import lbutils from heat.scaling import template diff --git a/heat/engine/resources/openstack/heat/resource_group.py b/heat/engine/resources/openstack/heat/resource_group.py index ce5f087fb9..4125c2d5f2 100644 --- a/heat/engine/resources/openstack/heat/resource_group.py +++ b/heat/engine/resources/openstack/heat/resource_group.py @@ -22,7 +22,7 @@ from heat.common.i18n import _ from heat.engine import attributes from heat.engine import constraints from heat.engine import properties -from heat.engine import stack_resource +from heat.engine.resources import stack_resource from heat.engine import support from heat.engine import template diff --git a/heat/engine/resources/openstack/heat/scaling_policy.py b/heat/engine/resources/openstack/heat/scaling_policy.py index 6fc9b35533..b267f7e042 100644 --- a/heat/engine/resources/openstack/heat/scaling_policy.py +++ b/heat/engine/resources/openstack/heat/scaling_policy.py @@ -21,7 +21,7 @@ from heat.engine import attributes from heat.engine import constraints from heat.engine import properties from heat.engine import resource -from heat.engine import signal_responder +from heat.engine.resources import signal_responder from heat.scaling import cooldown LOG = logging.getLogger(__name__) diff --git a/heat/engine/resources/openstack/heat/software_deployment.py b/heat/engine/resources/openstack/heat/software_deployment.py index c74653475d..a171772afe 100644 --- a/heat/engine/resources/openstack/heat/software_deployment.py +++ b/heat/engine/resources/openstack/heat/software_deployment.py @@ -25,7 +25,7 @@ from heat.engine import properties from heat.engine import resource 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.resources import signal_responder from heat.engine import support from heat.rpc import api as rpc_api diff --git a/heat/engine/resources/openstack/nova/server.py b/heat/engine/resources/openstack/nova/server.py index 1efb9a638c..472c3701bc 100644 --- a/heat/engine/resources/openstack/nova/server.py +++ b/heat/engine/resources/openstack/nova/server.py @@ -28,8 +28,8 @@ from heat.engine import constraints from heat.engine import properties from heat.engine import resource from heat.engine.resources.openstack.neutron import subnet +from heat.engine.resources import stack_user from heat.engine import scheduler -from heat.engine import stack_user from heat.engine import support from heat.rpc import api as rpc_api diff --git a/heat/engine/signal_responder.py b/heat/engine/resources/signal_responder.py similarity index 98% rename from heat/engine/signal_responder.py rename to heat/engine/resources/signal_responder.py index f4d3ad58d5..ac1100cf3e 100644 --- a/heat/engine/signal_responder.py +++ b/heat/engine/resources/signal_responder.py @@ -17,7 +17,7 @@ from oslo_log import log as logging from six.moves.urllib import parse as urlparse from heat.common.i18n import _LW -from heat.engine import stack_user +from heat.engine.resources import stack_user LOG = logging.getLogger(__name__) diff --git a/heat/engine/stack_resource.py b/heat/engine/resources/stack_resource.py similarity index 100% rename from heat/engine/stack_resource.py rename to heat/engine/resources/stack_resource.py diff --git a/heat/engine/stack_user.py b/heat/engine/resources/stack_user.py similarity index 100% rename from heat/engine/stack_user.py rename to heat/engine/resources/stack_user.py diff --git a/heat/engine/resources/template_resource.py b/heat/engine/resources/template_resource.py index e45d2538ec..4e9877dff6 100644 --- a/heat/engine/resources/template_resource.py +++ b/heat/engine/resources/template_resource.py @@ -22,7 +22,7 @@ from heat.common import urlfetch from heat.engine import attributes from heat.engine import environment from heat.engine import properties -from heat.engine import stack_resource +from heat.engine.resources import stack_resource from heat.engine import template diff --git a/heat/engine/resources/wait_condition.py b/heat/engine/resources/wait_condition.py index 3920419ae7..704ea05d6e 100644 --- a/heat/engine/resources/wait_condition.py +++ b/heat/engine/resources/wait_condition.py @@ -17,7 +17,7 @@ from heat.common import exception from heat.common.i18n import _ from heat.common.i18n import _LE from heat.common.i18n import _LW -from heat.engine import signal_responder +from heat.engine.resources import signal_responder LOG = logging.getLogger(__name__) diff --git a/heat/tests/generic_resource.py b/heat/tests/generic_resource.py index bf336b5fa0..a78d330faf 100644 --- a/heat/tests/generic_resource.py +++ b/heat/tests/generic_resource.py @@ -20,8 +20,8 @@ from heat.engine import attributes from heat.engine import constraints from heat.engine import properties from heat.engine import resource -from heat.engine import signal_responder -from heat.engine import stack_user +from heat.engine.resources import signal_responder +from heat.engine.resources import stack_user LOG = logging.getLogger(__name__) diff --git a/heat/tests/test_iso_8601.py b/heat/tests/test_iso_8601.py index 530727faee..7a5bec3412 100644 --- a/heat/tests/test_iso_8601.py +++ b/heat/tests/test_iso_8601.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -from heat.engine.resources import iso_8601 +from heat.engine import iso_8601 from heat.tests import common diff --git a/heat/tests/test_nova_client.py b/heat/tests/test_nova_client.py index 8d6942a74c..d950dddb23 100644 --- a/heat/tests/test_nova_client.py +++ b/heat/tests/test_nova_client.py @@ -40,7 +40,7 @@ class NovaClientPluginTestCase(common.HeatTestCase): class NovaClientPluginTests(NovaClientPluginTestCase): """ Basic tests for the helper methods in - :module:'heat.engine.resources.nova_utils'. + :module:'heat.engine.nova_utils'. """ def test_get_ip(self): diff --git a/heat/tests/test_nova_utils.py b/heat/tests/test_nova_utils.py index 9d9706dfe2..eb0abb2efb 100644 --- a/heat/tests/test_nova_utils.py +++ b/heat/tests/test_nova_utils.py @@ -20,7 +20,7 @@ from novaclient import exceptions as nova_exceptions import six from heat.common import exception -from heat.engine.resources import nova_utils +from heat.engine import nova_utils from heat.engine import scheduler from heat.tests import common from heat.tests.v1_1 import fakes as fakes_v1_1 @@ -29,14 +29,14 @@ from heat.tests.v1_1 import fakes as fakes_v1_1 class NovaUtilsTests(common.HeatTestCase): """ Basic tests for the helper methods in - :module:'heat.engine.resources.nova_utils'. + :module:'heat.engine.nova_utils'. """ def setUp(self): super(NovaUtilsTests, self).setUp() self.nova_client = self.m.CreateMockAnything() self.mock_warnings = mock.patch( - 'heat.engine.resources.nova_utils.warnings') + 'heat.engine.nova_utils.warnings') self.mock_warnings.start() self.addCleanup(self.mock_warnings.stop) @@ -133,7 +133,7 @@ class NovaUtilsRefreshServerTests(common.HeatTestCase): def setUp(self): super(NovaUtilsRefreshServerTests, self).setUp() self.mock_warnings = mock.patch( - 'heat.engine.resources.nova_utils.warnings') + 'heat.engine.nova_utils.warnings') self.mock_warnings.start() self.addCleanup(self.mock_warnings.stop) @@ -182,7 +182,7 @@ class NovaUtilsUserdataTests(common.HeatTestCase): super(NovaUtilsUserdataTests, self).setUp() self.nova_client = self.m.CreateMockAnything() self.mock_warnings = mock.patch( - 'heat.engine.resources.nova_utils.warnings') + 'heat.engine.nova_utils.warnings') self.mock_warnings.start() self.addCleanup(self.mock_warnings.stop) @@ -246,7 +246,7 @@ class NovaUtilsMetadataTests(common.HeatTestCase): def setUp(self): super(NovaUtilsMetadataTests, self).setUp() self.mock_warnings = mock.patch( - 'heat.engine.resources.nova_utils.warnings') + 'heat.engine.nova_utils.warnings') self.mock_warnings.start() self.addCleanup(self.mock_warnings.stop) diff --git a/heat/tests/test_signal.py b/heat/tests/test_signal.py index a4a1156c77..b2743901a9 100644 --- a/heat/tests/test_signal.py +++ b/heat/tests/test_signal.py @@ -21,8 +21,8 @@ from heat.common import template_format from heat.db import api as db_api from heat.engine import parser from heat.engine import resource +from heat.engine.resources import stack_user from heat.engine import scheduler -from heat.engine import stack_user from heat.engine import template from heat.tests import common from heat.tests import fakes diff --git a/heat/tests/test_stack_resource.py b/heat/tests/test_stack_resource.py index d82a3f6b72..d7bdedcba4 100644 --- a/heat/tests/test_stack_resource.py +++ b/heat/tests/test_stack_resource.py @@ -20,9 +20,9 @@ import six from heat.common import exception from heat.common import template_format from heat.engine import resource +from heat.engine.resources import stack_resource from heat.engine import scheduler from heat.engine import stack as parser -from heat.engine import stack_resource from heat.engine import template as templatem from heat.tests import common from heat.tests import generic_resource as generic_rsrc diff --git a/heat/tests/test_stack_user.py b/heat/tests/test_stack_user.py index 35c8e5ade0..91fc62902a 100644 --- a/heat/tests/test_stack_user.py +++ b/heat/tests/test_stack_user.py @@ -19,8 +19,8 @@ from heat.common import short_id from heat.common import template_format from heat.db import api as db_api from heat.engine import resource +from heat.engine.resources import stack_user from heat.engine import scheduler -from heat.engine import stack_user from heat.tests import common from heat.tests import fakes from heat.tests import generic_resource diff --git a/setup.cfg b/setup.cfg index 46b5091af7..68af52d71a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -64,7 +64,7 @@ heat.constraints = neutron.router = heat.engine.clients.os.neutron:RouterConstraint neutron.subnet = heat.engine.clients.os.neutron:SubnetConstraint glance.image = heat.engine.clients.os.glance:ImageConstraint - iso_8601 = heat.engine.resources.iso_8601:ISO8601Constraint + iso_8601 = heat.engine.iso_8601:ISO8601Constraint nova.server = heat.engine.clients.os.nova:ServerConstraint nova.keypair = heat.engine.clients.os.nova:KeypairConstraint cinder.volume = heat.engine.clients.os.cinder:VolumeConstraint