From f5f1a152d6afe0e530ff2ccd78b15c8afb4c7b44 Mon Sep 17 00:00:00 2001
From: Sudarshan Acharya <sudarshan.acharya@rackspace.com>
Date: Mon, 23 Apr 2012 12:11:44 -0500
Subject: [PATCH] Extending mgmt api from core instancce api.

---
 reddwarf/extensions/mgmt.py         |  2 +-
 reddwarf/extensions/mgmt/service.py | 35 +++--------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/reddwarf/extensions/mgmt.py b/reddwarf/extensions/mgmt.py
index 6379744219..c16127ac86 100644
--- a/reddwarf/extensions/mgmt.py
+++ b/reddwarf/extensions/mgmt.py
@@ -48,7 +48,7 @@ class Mgmt(extensions.ExtensionsDescriptor):
             body_serializers={'application/xml':
                               wsgi.ReddwarfXMLDictSerializer()})
         resource = extensions.ResourceExtension('{tenant_id}/mgmt/instances',
-            service.InstanceController(),
+            service.MgmtInstanceController(),
             deserializer=wsgi.RequestDeserializer(),
             serializer=serializer)
         resources.append(resource)
diff --git a/reddwarf/extensions/mgmt/service.py b/reddwarf/extensions/mgmt/service.py
index 3e12e78d52..6adbdb2526 100644
--- a/reddwarf/extensions/mgmt/service.py
+++ b/reddwarf/extensions/mgmt/service.py
@@ -18,45 +18,16 @@
 import logging
 import webob.exc
 
-from reddwarf.common import exception, config
+from reddwarf.common import exception
 from reddwarf.common import wsgi
 from reddwarf.instance import models as instance_models
 from reddwarf.extensions.mgmt import views
+from reddwarf.instance.service import InstanceController
 
 LOG = logging.getLogger(__name__)
 
 
-class BaseController(wsgi.Controller):
-    """Base controller class."""
-
-    exclude_attr = []
-    exception_map = {
-        webob.exc.HTTPUnprocessableEntity: [
-            exception.UnprocessableEntity,
-            ],
-        webob.exc.HTTPBadRequest: [
-            exception.BadRequest,
-            ],
-        webob.exc.HTTPNotFound: [
-            exception.NotFound,
-            instance_models.ModelNotFoundError,
-            ],
-        webob.exc.HTTPConflict: [
-            ],
-        }
-
-    def __init__(self):
-        self.add_addresses = config.Config.get('add_addresses', False)
-        pass
-
-    def _extract_required_params(self, params, model_name):
-        params = params or {}
-        model_params = params.get(model_name, {})
-        return utils.stringify_keys(utils.exclude(model_params,
-                                                  *self.exclude_attr))
-
-
-class InstanceController(BaseController):
+class MgmtInstanceController(InstanceController):
     """Controller for instance functionality"""
 
     def index(self, req, tenant_id, detailed=False):