Fixing novaclient_converter NameError

bug 909772

Change-Id: Iac7b45648cd1c85fdc3c8febbd0ef69b63a70c92

nova/api/openstack/v2/servers.py

@@ -41,14 +41,6 @@
 FLAGS = flags.FLAGS
 
 
-class ConvertedException(exc.WSGIHTTPException):
-    def __init__(self, code, title, explanation):
-        self.code = code
-        self.title = title
-        self.explanation = explanation
-        super(ConvertedException, self).__init__()
-
-
 class Controller(wsgi.Controller):
     """ The Server API base controller class for the OpenStack API """
 

nova/exception.py

@@ -28,12 +28,21 @@
 import sys
 
 from novaclient import exceptions as novaclient_exceptions
+import webob.exc
 
 from nova import log as logging
 
 LOG = logging.getLogger('nova.exception')
 
 
+class ConvertedException(webob.exc.WSGIHTTPException):
+    def __init__(self, code=0, title="", explanation=""):
+        self.code = code
+        self.title = title
+        self.explanation = explanation
+        super(ConvertedException, self).__init__()
+
+
 def novaclient_converter(f):
     """Convert novaclient ClientException HTTP codes to webob exceptions.
     Has to be the outer-most decorator.