Description: Revert upstream ad18daae7570f296acb8aa2cd0d4896c552fed10
Author: Julien Danjou <acid@debian.org>

---
Origin: upstream
Forwarded: not-needed

--- openstackx-0~dev20111128.orig/extensions/admin.py
+++ openstackx-0~dev20111128/extensions/admin.py
@@ -38,10 +38,10 @@ from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy import api as sqlalchemy_api
 
 
-from nova.api.openstack import wsgi
-import nova.api.openstack.v2 as openstack_api
-from nova.api.openstack.v2 import extensions
-from nova.api.openstack.v2 import views
+import nova.api.openstack as openstack_api
+from nova.api.openstack import extensions
+from nova.api.openstack import faults
+from nova.api.openstack import views
 
 from nova.compute import instance_types
 from nova.scheduler import api as scheduler_api
@@ -239,7 +239,7 @@ class PrivilegedServerController(opensta
             raise exc.HTTPUnprocessableEntity()
 
         if not body:
-            return wsgi.Fault(exc.HTTPUnprocessableEntity())
+            return faults.Fault(exc.HTTPUnprocessableEntity())
 
         ctxt = req.environ['nova.context']
         update_dict = {}
@@ -258,7 +258,7 @@ class PrivilegedServerController(opensta
         try:
             self.compute_api.update(ctxt, id, **update_dict)
         except exception.NotFound:
-            return wsgi.Fault(exc.HTTPNotFound())
+            return faults.Fault(exc.HTTPNotFound())
 
         return exc.HTTPNoContent()
 
