From a4afc88b4c06028a3e8ed65b44e9463015c1edd6 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Fri, 13 Feb 2015 17:35:43 +0800 Subject: [PATCH] Move AWS::EC2::* resources to heat/engine/resources/aws/ec2 Change-Id: I06e875e09c1995362aac992d97bd3196f7b79ff9 Implements: blueprint reorganize-resources-code-structure --- heat/engine/resources/aws/ec2/__init__.py | 0 heat/engine/resources/{ => aws/ec2}/eip.py | 5 ++--- heat/engine/resources/aws/{ => ec2}/instance.py | 0 .../engine/resources/{ => aws/ec2}/internet_gateway.py | 2 +- .../resources/{ => aws/ec2}/network_interface.py | 0 heat/engine/resources/{ => aws/ec2}/route_table.py | 2 +- heat/engine/resources/{ => aws/ec2}/security_group.py | 0 heat/engine/resources/{ => aws/ec2}/subnet.py | 2 +- heat/engine/resources/aws/{ => ec2}/volume.py | 0 heat/engine/resources/{ => aws/ec2}/vpc.py | 0 heat/engine/resources/openstack/volume.py | 2 +- heat/tests/aws/test_volume.py | 4 ++-- heat/tests/test_eip.py | 2 +- heat/tests/test_engine_service.py | 2 +- heat/tests/test_environment.py | 2 +- heat/tests/test_instance.py | 2 +- heat/tests/test_instance_network.py | 10 +++++----- heat/tests/test_metadata_refresh.py | 2 +- heat/tests/test_nokey.py | 2 +- heat/tests/test_restarter.py | 2 +- heat/tests/test_server_tags.py | 2 +- heat/tests/test_sqlalchemy_api.py | 2 +- heat/tests/test_volume_utils.py | 2 +- heat/tests/test_vpc.py | 2 +- 24 files changed, 24 insertions(+), 25 deletions(-) create mode 100644 heat/engine/resources/aws/ec2/__init__.py rename heat/engine/resources/{ => aws/ec2}/eip.py (99%) rename heat/engine/resources/aws/{ => ec2}/instance.py (100%) rename heat/engine/resources/{ => aws/ec2}/internet_gateway.py (98%) rename heat/engine/resources/{ => aws/ec2}/network_interface.py (100%) rename heat/engine/resources/{ => aws/ec2}/route_table.py (99%) rename heat/engine/resources/{ => aws/ec2}/security_group.py (100%) rename heat/engine/resources/{ => aws/ec2}/subnet.py (98%) rename heat/engine/resources/aws/{ => ec2}/volume.py (100%) rename heat/engine/resources/{ => aws/ec2}/vpc.py (100%) diff --git a/heat/engine/resources/aws/ec2/__init__.py b/heat/engine/resources/aws/ec2/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/heat/engine/resources/eip.py b/heat/engine/resources/aws/ec2/eip.py similarity index 99% rename from heat/engine/resources/eip.py rename to heat/engine/resources/aws/ec2/eip.py index 5cc0dfcd5..8fa37fdd5 100644 --- a/heat/engine/resources/eip.py +++ b/heat/engine/resources/aws/ec2/eip.py @@ -24,7 +24,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 vpc +from heat.engine.resources.aws.ec2 import internet_gateway +from heat.engine.resources.aws.ec2 import vpc LOG = logging.getLogger(__name__) @@ -95,8 +96,6 @@ class ElasticIp(resource.Resource): """Allocate a floating IP for the current tenant.""" ips = None if self.properties[self.DOMAIN]: - from heat.engine.resources import internet_gateway - ext_net = internet_gateway.InternetGateway.get_external_network_id( self.neutron()) props = {'floating_network_id': ext_net} diff --git a/heat/engine/resources/aws/instance.py b/heat/engine/resources/aws/ec2/instance.py similarity index 100% rename from heat/engine/resources/aws/instance.py rename to heat/engine/resources/aws/ec2/instance.py diff --git a/heat/engine/resources/internet_gateway.py b/heat/engine/resources/aws/ec2/internet_gateway.py similarity index 98% rename from heat/engine/resources/internet_gateway.py rename to heat/engine/resources/aws/ec2/internet_gateway.py index 3e80b581d..902107aa8 100644 --- a/heat/engine/resources/internet_gateway.py +++ b/heat/engine/resources/aws/ec2/internet_gateway.py @@ -15,7 +15,7 @@ from heat.common import exception from heat.common.i18n import _ from heat.engine import properties from heat.engine import resource -from heat.engine.resources import route_table +from heat.engine.resources.aws.ec2 import route_table class InternetGateway(resource.Resource): diff --git a/heat/engine/resources/network_interface.py b/heat/engine/resources/aws/ec2/network_interface.py similarity index 100% rename from heat/engine/resources/network_interface.py rename to heat/engine/resources/aws/ec2/network_interface.py diff --git a/heat/engine/resources/route_table.py b/heat/engine/resources/aws/ec2/route_table.py similarity index 99% rename from heat/engine/resources/route_table.py rename to heat/engine/resources/aws/ec2/route_table.py index a0e91cfc3..463ff8168 100644 --- a/heat/engine/resources/route_table.py +++ b/heat/engine/resources/aws/ec2/route_table.py @@ -14,8 +14,8 @@ from heat.common.i18n import _ from heat.engine import properties from heat.engine import resource +from heat.engine.resources.aws.ec2 import vpc from heat.engine.resources.neutron import neutron -from heat.engine.resources import vpc from heat.engine import support diff --git a/heat/engine/resources/security_group.py b/heat/engine/resources/aws/ec2/security_group.py similarity index 100% rename from heat/engine/resources/security_group.py rename to heat/engine/resources/aws/ec2/security_group.py diff --git a/heat/engine/resources/subnet.py b/heat/engine/resources/aws/ec2/subnet.py similarity index 98% rename from heat/engine/resources/subnet.py rename to heat/engine/resources/aws/ec2/subnet.py index 363c6c818..f80d9290c 100644 --- a/heat/engine/resources/subnet.py +++ b/heat/engine/resources/aws/ec2/subnet.py @@ -15,7 +15,7 @@ from heat.common.i18n import _ from heat.engine import attributes from heat.engine import properties from heat.engine import resource -from heat.engine.resources import vpc +from heat.engine.resources.aws.ec2 import vpc class Subnet(resource.Resource): diff --git a/heat/engine/resources/aws/volume.py b/heat/engine/resources/aws/ec2/volume.py similarity index 100% rename from heat/engine/resources/aws/volume.py rename to heat/engine/resources/aws/ec2/volume.py diff --git a/heat/engine/resources/vpc.py b/heat/engine/resources/aws/ec2/vpc.py similarity index 100% rename from heat/engine/resources/vpc.py rename to heat/engine/resources/aws/ec2/vpc.py diff --git a/heat/engine/resources/openstack/volume.py b/heat/engine/resources/openstack/volume.py index dc56d173b..0c114c6bb 100644 --- a/heat/engine/resources/openstack/volume.py +++ b/heat/engine/resources/openstack/volume.py @@ -22,7 +22,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.resources.aws import volume as aws_vol +from heat.engine.resources.aws.ec2 import volume as aws_vol from heat.engine import scheduler from heat.engine import support from heat.engine import volume_tasks as vol_task diff --git a/heat/tests/aws/test_volume.py b/heat/tests/aws/test_volume.py index 64e6fc443..b89d6ac5c 100644 --- a/heat/tests/aws/test_volume.py +++ b/heat/tests/aws/test_volume.py @@ -23,8 +23,8 @@ from heat.common import exception from heat.common import template_format from heat.engine.clients.os import cinder from heat.engine.clients.os import nova -from heat.engine.resources.aws import instance -from heat.engine.resources.aws import volume as aws_vol +from heat.engine.resources.aws.ec2 import instance +from heat.engine.resources.aws.ec2 import volume as aws_vol from heat.engine import rsrc_defn from heat.engine import scheduler from heat.tests import test_volume_utils as vt_base diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py index 2fb775be6..d9b7b310c 100644 --- a/heat/tests/test_eip.py +++ b/heat/tests/test_eip.py @@ -22,7 +22,7 @@ from heat.common import exception from heat.common import template_format from heat.engine.clients.os import nova from heat.engine import parser -from heat.engine.resources import eip +from heat.engine.resources.aws.ec2 import eip from heat.engine import rsrc_defn from heat.engine import scheduler from heat.tests import common diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index b27eddb56..8cf2a0c1a 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -40,7 +40,7 @@ from heat.engine import dependencies from heat.engine import environment from heat.engine import properties from heat.engine import resource as res -from heat.engine.resources.aws import instance as instances +from heat.engine.resources.aws.ec2 import instance as instances from heat.engine import service from heat.engine import service_software_config from heat.engine import service_stack_watch diff --git a/heat/tests/test_environment.py b/heat/tests/test_environment.py index 375ce79d8..a59e50326 100644 --- a/heat/tests/test_environment.py +++ b/heat/tests/test_environment.py @@ -22,7 +22,7 @@ import six from heat.common import environment_format from heat.engine import environment from heat.engine import resources -from heat.engine.resources.aws import instance +from heat.engine.resources.aws.ec2 import instance from heat.tests import common from heat.tests import generic_resource diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py index 017af05f3..819337b85 100644 --- a/heat/tests/test_instance.py +++ b/heat/tests/test_instance.py @@ -29,7 +29,7 @@ from heat.engine.clients.os import nova from heat.engine import environment from heat.engine import parser from heat.engine import resource -from heat.engine.resources.aws import instance as instances +from heat.engine.resources.aws.ec2 import instance as instances from heat.engine import scheduler from heat.tests import common from heat.tests import utils diff --git a/heat/tests/test_instance_network.py b/heat/tests/test_instance_network.py index d839ce7d0..84c6c006c 100644 --- a/heat/tests/test_instance_network.py +++ b/heat/tests/test_instance_network.py @@ -20,8 +20,8 @@ from heat.engine.clients.os import neutron from heat.engine.clients.os import nova from heat.engine import environment from heat.engine import parser -from heat.engine.resources.aws import instance as instances -from heat.engine.resources import network_interface as network_interfaces +from heat.engine.resources.aws.ec2 import instance as instances +from heat.engine.resources.aws.ec2 import network_interface as net_interfaces from heat.engine import scheduler from heat.tests import common from heat.tests import utils @@ -264,9 +264,9 @@ class instancesTest(common.HeatTestCase): t['Resources']['WebServer']['Properties']['ImageId'] = image_id resource_defns = stack.t.resource_definitions(stack) - nic = network_interfaces.NetworkInterface('%s_nic' % name, - resource_defns['nic1'], - stack) + nic = net_interfaces.NetworkInterface('%s_nic' % name, + resource_defns['nic1'], + stack) instance = instances.Instance('%s_name' % name, resource_defns['WebServer'], stack) diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py index 61718966d..42aac8310 100644 --- a/heat/tests/test_metadata_refresh.py +++ b/heat/tests/test_metadata_refresh.py @@ -19,7 +19,7 @@ from heat.common import identifier from heat.common import template_format from heat.engine import environment from heat.engine import parser -from heat.engine.resources.aws import instance +from heat.engine.resources.aws.ec2 import instance from heat.engine.resources.aws import wait_condition_handle as aws_wch from heat.engine.resources import server from heat.engine import scheduler diff --git a/heat/tests/test_nokey.py b/heat/tests/test_nokey.py index abc7d0010..f25590b86 100644 --- a/heat/tests/test_nokey.py +++ b/heat/tests/test_nokey.py @@ -14,7 +14,7 @@ from heat.common import template_format from heat.engine.clients.os import glance from heat.engine.clients.os import nova -from heat.engine.resources.aws import instance as instances +from heat.engine.resources.aws.ec2 import instance as instances from heat.engine import scheduler from heat.tests import common from heat.tests import utils diff --git a/heat/tests/test_restarter.py b/heat/tests/test_restarter.py index d8718bfd6..f65b12b42 100644 --- a/heat/tests/test_restarter.py +++ b/heat/tests/test_restarter.py @@ -15,7 +15,7 @@ import mock from heat.common import template_format from heat.engine.clients.os import nova -from heat.engine.resources.aws import instance +from heat.engine.resources.aws.ec2 import instance from heat.engine.resources.openstack import ha_restarter from heat.engine import scheduler from heat.tests import common diff --git a/heat/tests/test_server_tags.py b/heat/tests/test_server_tags.py index 628158f43..e1ab392a8 100644 --- a/heat/tests/test_server_tags.py +++ b/heat/tests/test_server_tags.py @@ -19,7 +19,7 @@ from heat.engine.clients.os import glance from heat.engine.clients.os import nova from heat.engine import environment from heat.engine import parser -from heat.engine.resources.aws import instance as instances +from heat.engine.resources.aws.ec2 import instance as instances from heat.engine import scheduler from heat.tests import common from heat.tests import utils diff --git a/heat/tests/test_sqlalchemy_api.py b/heat/tests/test_sqlalchemy_api.py index df94996fd..e300a3036 100644 --- a/heat/tests/test_sqlalchemy_api.py +++ b/heat/tests/test_sqlalchemy_api.py @@ -29,7 +29,7 @@ from heat.engine.clients.os import nova from heat.engine import environment from heat.engine import parser from heat.engine import resource as rsrc -from heat.engine.resources.aws import instance as instances +from heat.engine.resources.aws.ec2 import instance as instances from heat.engine import scheduler from heat.tests import common from heat.tests import utils diff --git a/heat/tests/test_volume_utils.py b/heat/tests/test_volume_utils.py index 8c44ded67..b1885bd21 100644 --- a/heat/tests/test_volume_utils.py +++ b/heat/tests/test_volume_utils.py @@ -17,7 +17,7 @@ import six from heat.engine.clients.os import cinder from heat.engine.clients.os import nova -from heat.engine.resources.aws import volume as aws_vol +from heat.engine.resources.aws.ec2 import volume as aws_vol from heat.engine.resources.openstack import volume as os_vol from heat.engine import scheduler from heat.tests import common diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py index 27f308ace..b20c00e80 100644 --- a/heat/tests/test_vpc.py +++ b/heat/tests/test_vpc.py @@ -16,7 +16,7 @@ import uuid from heat.common import exception from heat.common import template_format from heat.engine import parser -from heat.engine.resources import subnet as sn +from heat.engine.resources.aws.ec2 import subnet as sn from heat.engine import scheduler from heat.engine import template from heat.tests import common