Move back to the class approach. This way we can add other common functionality

to the base class.

Author: Kami

st2api/st2api/controllers/actions.py

@@ -21,7 +21,7 @@
 LOG = logging.getLogger(__name__)
 
 
-class ActionsController(resource.ResourceController):
+class ActionsController(resource.ContentPackResourceControler):
     """
         Implements the RESTful web endpoint that handles
         the lifecycle of Actions in the system.
@@ -58,11 +58,6 @@ def _validate_action_parameters(action, runnertype_db):
             LOG.error(msg)
             abort(http_client.CONFLICT, msg)
 
-    @jsexpose()
-    @resource.referenced
-    def get_all(self, **kwargs):
-        return super(ActionsController, self)._get_all(**kwargs)
-
     @jsexpose(body=ActionAPI, status_code=http_client.CREATED)
     def post(self, action):
         """

st2api/st2api/controllers/actionviews.py

@@ -71,7 +71,11 @@ def _get_one(action_id):
         return {'parameters': all_params}
 
 
-class OverviewController(RestController):
+class OverviewController(resource.ContentPackResourceControler):
+    model = None
+    access = None
+    supported_filters = {}
+
     @jsexpose(str)
     def get_one(self, action_id):
         """
@@ -87,16 +91,16 @@ def get_one(self, action_id):
         return self._transform_action_api(action_api)
 
     @jsexpose(str)
-    @resource.referenced
-    def get_all(self, **kw):
+    def get_all(self, **kwargs):
         """
             List all actions.
 
             Handles requests:
                 GET /actions/views/overview
         """
-        LOG.info('GET all /actions/views/overview with filters=%s', kw)
-        action_dbs = Action.get_all(**kw)
+        LOG.info('GET all /actions/views/overview with filters=%s', kwargs)
+        kwargs = self._get_filters(**kwargs)
+        action_dbs = Action.get_all(**kwargs)
         action_apis = [ActionAPI.from_model(action_db) for action_db in action_dbs]
         return map(self._transform_action_api, action_apis)
 

st2api/st2api/controllers/resource.py

@@ -92,9 +92,19 @@ def _get_all(self, **kwargs):
         return [self.model.from_model(instance) for instance in instances[offset:eop]]
 
 
-def referenced(f):
-    def decorate(*args, **kwargs):
-        ref = kwargs.get('ref', None)
+class ContentPackResourceControler(ResourceController):
+    @jsexpose()
+    def get_all(self, **kwargs):
+        return self._get_all(**kwargs)
+
+    def _get_all(self, **kwargs):
+        kwargs = self._get_filters(**kwargs)
+        return super(ContentPackResourceControler, self)._get_all(**kwargs)
+
+    def _get_filters(self, **kwargs):
+        filters = copy.deepcopy(kwargs)
+
+        ref = filters.get('ref', None)
 
         if ref:
             try:
@@ -103,10 +113,8 @@ def decorate(*args, **kwargs):
                 # Invalid reference
                 return []
 
-            kwargs['name'] = ref_obj.name
-            kwargs['pack'] = ref_obj.pack
-            del kwargs['ref']
-
-        return f(*args, **kwargs)
+            filters['name'] = ref_obj.name
+            filters['pack'] = ref_obj.pack
+            del filters['ref']
 
-    return decorate
+        return filters

st2api/st2api/controllers/sensors.py

@@ -2,15 +2,14 @@
 from st2common import log as logging
 from st2common.persistence.reactor import SensorType
 from st2common.models.api.reactor import SensorTypeAPI
-from st2common.models.base import jsexpose
 from st2api.controllers import resource
 
 http_client = six.moves.http_client
 
 LOG = logging.getLogger(__name__)
 
 
-class SensorTypeController(resource.ResourceController):
+class SensorTypeController(resource.ContentPackResourceControler):
     model = SensorTypeAPI
     access = SensorType
     supported_filters = {
@@ -21,8 +20,3 @@ class SensorTypeController(resource.ResourceController):
     options = {
         'sort': ['pack', 'name']
     }
-
-    @jsexpose()
-    @resource.referenced
-    def get_all(self, **kwargs):
-        return super(SensorTypeController, self)._get_all(**kwargs)

st2api/st2api/controllers/triggers.py

@@ -15,7 +15,7 @@
 LOG = logging.getLogger(__name__)
 
 
-class TriggerTypeController(resource.ResourceController):
+class TriggerTypeController(resource.ContentPackResourceControler):
     """
         Implements the RESTful web endpoint that handles
         the lifecycle of TriggerTypes in the system.
@@ -31,11 +31,6 @@ class TriggerTypeController(resource.ResourceController):
         'sort': ['pack', 'name']
     }
 
-    @jsexpose()
-    @resource.referenced
-    def get_all(self, **kwargs):
-        return super(TriggerTypeController, self)._get_all(**kwargs)
-
     @jsexpose(body=TriggerTypeAPI, status_code=http_client.CREATED)
     def post(self, triggertype):
         """