Move AWS::EC2::* resources to heat/engine/resources/aws/ec2

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

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}

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):

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
 
 

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):

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

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

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

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

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
 

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

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,7 +264,7 @@ 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,
+        nic = net_interfaces.NetworkInterface('%s_nic' % name,
                                               resource_defns['nic1'],
                                               stack)
 

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

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

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

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

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

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

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