Refactor of QuotaError

moved QuotaError from quota.py to exception.py

Change-Id: Ic03301492a2df323074d73e8481e0e3aee89f74c

4 files changed, 8 insertions, 11 deletions

diff --git a/nova/api/openstack/contrib/flavorextraspecs.py b/nova/api/openstack/contrib/flavorextraspecs.py
index 8a756f04a..d71e9cf8b 100644
--- a/nova/api/openstack/contrib/flavorextraspecs.py
+++ b/nova/api/openstack/contrib/flavorextraspecs.py
@@ -20,7 +20,7 @@
 from webob import exc
 
 from nova import db
-from nova import quota
+from nova import exception
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 
@@ -53,7 +53,7 @@ class FlavorExtraSpecsController(object):
             db.instance_type_extra_specs_update_or_create(context,
                                                               flavor_id,
                                                               specs)
-        except quota.QuotaError as error:
+        except exception.QuotaError as error:
             self._handle_quota_error(error)
         return body
 
@@ -70,7 +70,7 @@ class FlavorExtraSpecsController(object):
             db.instance_type_extra_specs_update_or_create(context,
                                                                flavor_id,
                                                                body)
-        except quota.QuotaError as error:
+        except exception.QuotaError as error:
             self._handle_quota_error(error)
 
         return body
diff --git a/nova/api/openstack/contrib/volumetypes.py b/nova/api/openstack/contrib/volumetypes.py
index d63104a29..64a9e0f02 100644
--- a/nova/api/openstack/contrib/volumetypes.py
+++ b/nova/api/openstack/contrib/volumetypes.py
@@ -21,7 +21,6 @@ from webob import exc
 
 from nova import db
 from nova import exception
-from nova import quota
 from nova.volume import volume_types
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
@@ -55,7 +54,7 @@ class VolumeTypesController(object):
         try:
             volume_types.create(context, name, specs)
             vol_type = volume_types.get_volume_type_by_name(context, name)
-        except quota.QuotaError as error:
+        except exception.QuotaError as error:
             self._handle_quota_error(error)
         except exception.NotFound:
             raise exc.HTTPNotFound()
@@ -118,7 +117,7 @@ class VolumeTypeExtraSpecsController(object):
             db.volume_type_extra_specs_update_or_create(context,
                                                             vol_type_id,
                                                             specs)
-        except quota.QuotaError as error:
+        except exception.QuotaError as error:
             self._handle_quota_error(error)
         return body
 
@@ -135,7 +134,7 @@ class VolumeTypeExtraSpecsController(object):
             db.volume_type_extra_specs_update_or_create(context,
                                                             vol_type_id,
                                                             body)
-        except quota.QuotaError as error:
+        except exception.QuotaError as error:
             self._handle_quota_error(error)
 
         return body
diff --git a/nova/api/openstack/server_metadata.py b/nova/api/openstack/server_metadata.py
index d764075b7..2d156efbb 100644
--- a/nova/api/openstack/server_metadata.py
+++ b/nova/api/openstack/server_metadata.py
@@ -21,7 +21,6 @@ from nova import compute
 from nova.api.openstack import common
 from nova.api.openstack import wsgi
 from nova import exception
-from nova import quota
 
 
 class Controller(object):
@@ -120,7 +119,7 @@ class Controller(object):
             msg = _("Malformed request body")
             raise exc.HTTPBadRequest(explanation=msg)
 
-        except quota.QuotaError as error:
+        except exception.QuotaError as error:
             self._handle_quota_error(error)
 
     def show(self, req, server_id, id):
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index ba9dd4ec3..539fd8778 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -40,7 +40,6 @@ from nova import exception
 from nova import flags
 from nova import image
 from nova import log as logging
-from nova import quota
 from nova.rpc import common as rpc_common
 from nova.scheduler import api as scheduler_api
 from nova import utils
@@ -412,7 +411,7 @@ class Controller(object):
                             availability_zone=availability_zone,
                             config_drive=config_drive,
                             block_device_mapping=block_device_mapping)
-        except quota.QuotaError as error:
+        except exception.QuotaError as error:
             self._handle_quota_error(error)
         except exception.InstanceTypeMemoryTooSmall as error:
             raise exc.HTTPBadRequest(explanation=unicode(error))