Move neutron resources to /engine/resources/openstack/neutron

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

contrib/extraroute/extraroute/resources/extraroute.py

@@ -15,7 +15,7 @@
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 
 
 class ExtraRoute(neutron.NeutronResource):

heat/engine/resources/aws/ec2/route_table.py

@@ -15,7 +15,7 @@ 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.openstack.neutron import neutron
 from heat.engine import support
 
 

heat/engine/resources/aws/ec2/vpc.py

@@ -16,7 +16,7 @@ from heat.common.i18n import _
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 
 
 class VPC(resource.Resource):

heat/engine/resources/openstack/neutron/firewall.py

@@ -15,7 +15,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 

heat/engine/resources/openstack/neutron/floatingip.py

@@ -17,9 +17,9 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
-from heat.engine.resources.neutron import port
-from heat.engine.resources.neutron import router
+from heat.engine.resources.openstack.neutron import neutron
+from heat.engine.resources.openstack.neutron import port
+from heat.engine.resources.openstack.neutron import router
 from heat.engine import support
 
 

heat/engine/resources/openstack/neutron/loadbalancer.py

@@ -17,7 +17,7 @@ from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 

heat/engine/resources/openstack/neutron/metering.py

@@ -15,7 +15,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 

heat/engine/resources/openstack/neutron/net.py

@@ -14,7 +14,7 @@
 from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 
 
 class Net(neutron.NeutronResource):

heat/engine/resources/openstack/neutron/network_gateway.py

@@ -19,7 +19,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 

heat/engine/resources/openstack/neutron/port.py

@@ -19,8 +19,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.neutron import neutron
-from heat.engine.resources.neutron import subnet
+from heat.engine.resources.openstack.neutron import neutron
+from heat.engine.resources.openstack.neutron import subnet
 from heat.engine import support
 
 LOG = logging.getLogger(__name__)

heat/engine/resources/openstack/neutron/provider_net.py

@@ -16,7 +16,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import net
+from heat.engine.resources.openstack.neutron import net
 from heat.engine import support
 
 

heat/engine/resources/openstack/neutron/router.py

@@ -16,8 +16,8 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
-from heat.engine.resources.neutron import subnet
+from heat.engine.resources.openstack.neutron import neutron
+from heat.engine.resources.openstack.neutron import subnet
 from heat.engine import support
 
 

heat/engine/resources/openstack/neutron/security_group.py

@@ -15,7 +15,7 @@ from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 

heat/engine/resources/openstack/neutron/subnet.py

@@ -16,7 +16,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 

heat/engine/resources/openstack/neutron/vpnservice.py

@@ -15,7 +15,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 

heat/engine/resources/openstack/nova/server.py

@@ -27,7 +27,7 @@ from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.neutron import subnet
+from heat.engine.resources.openstack.neutron import subnet
 from heat.engine import scheduler
 from heat.engine import stack_user
 from heat.engine import support

heat/tests/test_neutron.py

@@ -27,11 +27,11 @@ from heat.engine.clients.os import neutron
 from heat.engine.hot import functions
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.neutron import net
-from heat.engine.resources.neutron import neutron as nr
-from heat.engine.resources.neutron import provider_net
-from heat.engine.resources.neutron import router
-from heat.engine.resources.neutron import subnet
+from heat.engine.resources.openstack.neutron import net
+from heat.engine.resources.openstack.neutron import neutron as nr
+from heat.engine.resources.openstack.neutron import provider_net
+from heat.engine.resources.openstack.neutron import router
+from heat.engine.resources.openstack.neutron import subnet
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests import common

heat/tests/test_neutron_firewall.py

@@ -19,7 +19,7 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.neutron import firewall
+from heat.engine.resources.openstack.neutron import firewall
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_neutron_loadbalancer.py

@@ -24,7 +24,7 @@ from heat.common import exception
 from heat.common.i18n import _
 from heat.common import template_format
 from heat.engine.clients.os import nova
-from heat.engine.resources.neutron import loadbalancer
+from heat.engine.resources.openstack.neutron import loadbalancer
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_neutron_metering.py

@@ -17,7 +17,7 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.neutron import metering
+from heat.engine.resources.openstack.neutron import metering
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_neutron_network_gateway.py

@@ -22,7 +22,7 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.neutron import network_gateway
+from heat.engine.resources.openstack.neutron import network_gateway
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests import common

heat/tests/test_neutron_vpnservice.py

@@ -21,7 +21,7 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.neutron import vpnservice
+from heat.engine.resources.openstack.neutron import vpnservice
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils