Merge "nova-net: Remove layer of indirection in 'nova.network'"

Author: Zuul

nova/api/metadata/base.py

@@ -32,7 +32,7 @@
 import nova.conf
 from nova import context
 from nova import exception
-from nova import network
+from nova.network import neutron
 from nova.network.security_group import openstack_driver
 from nova import objects
 from nova.objects import virt_device_metadata as metadata_obj
@@ -645,7 +645,7 @@ def handle_path(self, path_tokens):
 
 def get_metadata_by_address(address):
     ctxt = context.get_admin_context()
-    fixed_ip = network.API().get_fixed_ip_by_address(ctxt, address)
+    fixed_ip = neutron.API().get_fixed_ip_by_address(ctxt, address)
     LOG.info('Fixed IP %(ip)s translates to instance UUID %(uuid)s',
              {'ip': address, 'uuid': fixed_ip['instance_uuid']})
 

nova/api/metadata/handler.py

@@ -34,7 +34,7 @@
 from nova import context as nova_context
 from nova import exception
 from nova.i18n import _
-from nova.network.neutronv2 import api as neutronapi
+from nova.network import neutron as neutronapi
 
 CONF = nova.conf.CONF
 LOG = logging.getLogger(__name__)

nova/api/openstack/common.py

@@ -31,7 +31,7 @@
 from nova import context as nova_context
 from nova import exception
 from nova.i18n import _
-from nova.network.neutronv2 import constants
+from nova.network import constants
 from nova import objects
 from nova import quota
 from nova import utils

nova/api/openstack/compute/attach_interfaces.py

@@ -26,7 +26,7 @@
 from nova.compute import api as compute
 from nova import exception
 from nova.i18n import _
-from nova import network
+from nova.network import neutron
 from nova import objects
 from nova.policies import attach_interfaces as ai_policies
 
@@ -61,7 +61,7 @@ class InterfaceAttachmentController(wsgi.Controller):
     def __init__(self):
         super(InterfaceAttachmentController, self).__init__()
         self.compute_api = compute.API()
-        self.network_api = network.API()
+        self.network_api = neutron.API()
 
     @wsgi.expected_errors((404, 501))
     def index(self, req, server_id):

nova/api/openstack/compute/evacuate.py

@@ -25,7 +25,7 @@
 import nova.conf
 from nova import exception
 from nova.i18n import _
-from nova import network
+from nova.network import neutron
 from nova.policies import evacuate as evac_policies
 from nova import utils
 
@@ -37,7 +37,7 @@ def __init__(self):
         super(EvacuateController, self).__init__()
         self.compute_api = compute.API()
         self.host_api = compute.HostAPI()
-        self.network_api = network.API()
+        self.network_api = neutron.API()
 
     def _get_on_shared_storage(self, req, evacuate_body):
         if api_version_request.is_supported(req, min_version='2.14'):

nova/api/openstack/compute/floating_ip_pools.py

@@ -15,7 +15,7 @@
 from nova.api.openstack.api_version_request \
     import MAX_PROXY_API_SUPPORT_VERSION
 from nova.api.openstack import wsgi
-from nova import network
+from nova.network import neutron
 from nova.policies import floating_ip_pools as fip_policies
 
 
@@ -37,7 +37,7 @@ class FloatingIPPoolsController(wsgi.Controller):
 
     def __init__(self):
         super(FloatingIPPoolsController, self).__init__()
-        self.network_api = network.API()
+        self.network_api = neutron.API()
 
     @wsgi.Controller.api_version("2.1", MAX_PROXY_API_SUPPORT_VERSION)
     @wsgi.expected_errors(())

nova/api/openstack/compute/floating_ips.py

@@ -29,7 +29,7 @@
 from nova.compute import api as compute
 from nova import exception
 from nova.i18n import _
-from nova import network
+from nova.network import neutron
 from nova.policies import floating_ips as fi_policies
 
 
@@ -108,7 +108,7 @@ class FloatingIPController(wsgi.Controller):
     def __init__(self):
         super(FloatingIPController, self).__init__()
         self.compute_api = compute.API()
-        self.network_api = network.API()
+        self.network_api = neutron.API()
 
     @wsgi.Controller.api_version("2.1", MAX_PROXY_API_SUPPORT_VERSION)
     @wsgi.expected_errors((400, 404))
@@ -207,7 +207,7 @@ class FloatingIPActionController(wsgi.Controller):
     def __init__(self):
         super(FloatingIPActionController, self).__init__()
         self.compute_api = compute.API()
-        self.network_api = network.API()
+        self.network_api = neutron.API()
 
     @wsgi.Controller.api_version("2.1", "2.43")
     @wsgi.expected_errors((400, 403, 404))

nova/api/openstack/compute/migrate_server.py

@@ -26,7 +26,7 @@
 from nova.compute import api as compute
 from nova import exception
 from nova.i18n import _
-from nova import network
+from nova.network import neutron
 from nova import objects
 from nova.policies import migrate_server as ms_policies
 
@@ -39,7 +39,7 @@ class MigrateServerController(wsgi.Controller):
     def __init__(self):
         super(MigrateServerController, self).__init__()
         self.compute_api = compute.API()
-        self.network_api = network.API()
+        self.network_api = neutron.API()
 
     @wsgi.response(202)
     @wsgi.expected_errors((400, 403, 404, 409))

nova/api/openstack/compute/networks.py

@@ -21,7 +21,7 @@
 from nova.api.openstack import wsgi
 from nova import exception
 from nova.i18n import _
-from nova import network
+from nova.network import neutron
 from nova.objects import base as base_obj
 from nova.objects import fields as obj_fields
 from nova.policies import networks as net_policies
@@ -77,7 +77,7 @@ class NetworkController(wsgi.Controller):
     def __init__(self, network_api=None):
         super(NetworkController, self).__init__()
         # TODO(stephenfin): 'network_api' is only being passed for use by tests
-        self.network_api = network_api or network.API()
+        self.network_api = network_api or neutron.API()
 
     @wsgi.Controller.api_version("2.1", MAX_PROXY_API_SUPPORT_VERSION)
     @wsgi.expected_errors(())

nova/api/openstack/compute/schemas/servers.py

@@ -201,7 +201,7 @@
                         'type': 'object',
                         'properties': {
                             # NOTE(oomichi): allocate_for_instance() of
-                            # neutronv2/api.py gets security_group names
+                            # network/neutron.py gets security_group names
                             # or UUIDs from this parameter.
                             # parameter_types.name allows both format.
                             'name': parameter_types.name,