Merge "HACKING fixes, all but sqlalchemy."

7 files changed, 20 insertions, 21 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index f42b1b4ac..87c71bedf 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -28,10 +28,11 @@ import time
 import urllib
 
 from nova.api.ec2 import ec2utils
-from nova.compute import instance_types
 from nova.api.ec2 import inst_state
+from nova.api import validator
 from nova import block_device
 from nova import compute
+from nova.compute import instance_types
 from nova.compute import vm_states
 from nova import crypto
 from nova import db
@@ -40,10 +41,9 @@ from nova import flags
 from nova.image import s3
 from nova import log as logging
 from nova import network
-from nova import rpc
+from nova.rpc import common as rpc_common
 from nova import utils
 from nova import volume
-from nova.api import validator
 
 
 FLAGS = flags.FLAGS
@@ -1215,7 +1215,7 @@ class CloudController(object):
         try:
             public_ip = self.network_api.allocate_floating_ip(context)
             return {'publicIp': public_ip}
-        except rpc.RemoteError as ex:
+        except rpc_common.RemoteError as ex:
             # NOTE(tr3buchet) - why does this block exist?
             if ex.exc_type == 'NoMoreFloatingIps':
                 raise exception.NoMoreFloatingIps()
diff --git a/nova/api/openstack/compute/consoles.py b/nova/api/openstack/compute/consoles.py
index e9eee4c75..19c7d6fa9 100644
--- a/nova/api/openstack/compute/consoles.py
+++ b/nova/api/openstack/compute/consoles.py
@@ -20,7 +20,7 @@ from webob import exc
 
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import console
+from nova.console import api as console_api
 from nova import exception
 
 
@@ -83,7 +83,7 @@ class Controller(object):
     """The Consoles controller for the Openstack API"""
 
     def __init__(self):
-        self.console_api = console.API()
+        self.console_api = console_api.API()
 
     @wsgi.serializers(xml=ConsolesTemplate)
     def index(self, req, server_id):
diff --git a/nova/api/openstack/compute/contrib/aggregates.py b/nova/api/openstack/compute/contrib/aggregates.py
index 583fe1b51..aa10fe532 100644
--- a/nova/api/openstack/compute/contrib/aggregates.py
+++ b/nova/api/openstack/compute/contrib/aggregates.py
@@ -18,11 +18,10 @@
 from webob import exc
 
 from nova.api.openstack import extensions
-from nova import compute
+from nova.compute import api as compute_api
 from nova import exception
 from nova import log as logging
 
-
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'aggregates')
 
@@ -45,7 +44,7 @@ def get_host_from_body(fn):
 class AggregateController(object):
     """The Host Aggregates API controller for the OpenStack API."""
     def __init__(self):
-        self.api = compute.AggregateAPI()
+        self.api = compute_api.AggregateAPI()
 
     def index(self, req):
         """Returns a list a host aggregate's id, name, availability_zone."""
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
index b026e6999..6b9e9e97c 100644
--- a/nova/api/openstack/compute/contrib/floating_ips.py
+++ b/nova/api/openstack/compute/contrib/floating_ips.py
@@ -26,7 +26,7 @@ from nova import compute
 from nova import exception
 from nova import log as logging
 from nova import network
-from nova import rpc
+from nova.rpc import common as rpc_common
 
 
 LOG = logging.getLogger(__name__)
@@ -152,7 +152,7 @@ class FloatingIPController(object):
         try:
             address = self.network_api.allocate_floating_ip(context, pool)
             ip = self.network_api.get_floating_ip_by_address(context, address)
-        except rpc.RemoteError as ex:
+        except rpc_common.RemoteError as ex:
             # NOTE(tr3buchet) - why does this block exist?
             if ex.exc_type == 'NoMoreFloatingIps':
                 if pool:
@@ -212,7 +212,7 @@ class FloatingIPActionController(wsgi.Controller):
         except exception.FixedIpNotFoundForInstance:
             msg = _("No fixed ips associated to instance")
             raise webob.exc.HTTPBadRequest(explanation=msg)
-        except rpc.RemoteError:
+        except rpc_common.RemoteError:
             msg = _("Associate floating ip failed")
             raise webob.exc.HTTPInternalServerError(explanation=msg)
 
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index a24b186c4..a44a56024 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -22,7 +22,7 @@ from xml.parsers import expat
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.api.openstack import extensions
-from nova import compute
+from nova.compute import api as compute_api
 from nova import db
 from nova import exception
 from nova import flags
@@ -120,7 +120,7 @@ def check_host(fn):
 class HostController(object):
     """The Hosts API controller for the OpenStack API."""
     def __init__(self):
-        self.api = compute.HostAPI()
+        self.api = compute_api.HostAPI()
         super(HostController, self).__init__()
 
     @wsgi.serializers(xml=HostIndexTemplate)
diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
index e0340d791..763133f6c 100644
--- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py
+++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
@@ -72,12 +72,12 @@ class SimpleTenantUsageController(object):
         terminated_at = instance['terminated_at']
         if terminated_at is not None:
             if not isinstance(terminated_at, datetime.datetime):
-                terminated_at = datetime.strptime(terminated_at,
+                terminated_at = datetime.datetime.strptime(terminated_at,
                                                   "%Y-%m-%d %H:%M:%S.%f")
 
         if launched_at is not None:
             if not isinstance(launched_at, datetime.datetime):
-                launched_at = datetime.strptime(launched_at,
+                launched_at = datetime.datetime.strptime(launched_at,
                                                 "%Y-%m-%d %H:%M:%S.%f")
 
         if terminated_at and terminated_at < period_start:
diff --git a/nova/api/openstack/compute/contrib/virtual_storage_arrays.py b/nova/api/openstack/compute/contrib/virtual_storage_arrays.py
index 7581fc82a..168f82605 100644
--- a/nova/api/openstack/compute/contrib/virtual_storage_arrays.py
+++ b/nova/api/openstack/compute/contrib/virtual_storage_arrays.py
@@ -33,7 +33,7 @@ from nova import network
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import vsa
+from nova.vsa import api as vsa_api
 from nova import volume
 
 
@@ -114,7 +114,7 @@ class VsaController(object):
     """The Virtual Storage Array API controller for the OpenStack API."""
 
     def __init__(self):
-        self.vsa_api = vsa.API()
+        self.vsa_api = vsa_api.API()
         self.compute_api = compute.API()
         self.network_api = network.API()
         super(VsaController, self).__init__()
@@ -271,7 +271,7 @@ class VsaVolumeDriveController(volumes.VolumeController):
 
     def __init__(self):
         self.volume_api = volume.API()
-        self.vsa_api = vsa.API()
+        self.vsa_api = vsa_api.API()
         super(VsaVolumeDriveController, self).__init__()
 
     def _translation(self, context, vol, vsa_id, details):
@@ -565,7 +565,7 @@ class VsaVPoolController(object):
     """The vPool VSA API controller for the OpenStack API."""
 
     def __init__(self):
-        self.vsa_api = vsa.API()
+        self.vsa_api = vsa_api.API()
         super(VsaVPoolController, self).__init__()
 
     @wsgi.serializers(xml=VsaVPoolsTemplate)
@@ -594,7 +594,7 @@ class VsaVCController(servers.Controller):
     """The VSA Virtual Controller API controller for the OpenStack API."""
 
     def __init__(self):
-        self.vsa_api = vsa.API()
+        self.vsa_api = vsa_api.API()
         self.compute_api = compute.API()
         self.vsa_id = None      # VP-TODO: temporary ugly hack
         super(VsaVCController, self).__init__()