Rename #1

Author: manasdk

st2client/st2client/models/reactor.py

@@ -7,7 +7,7 @@
 
 
 class Trigger(core.Resource):
-    _plural = 'Triggers'
+    _plural = 'Triggertypes'
 
 
 class Rule(core.Resource):

st2common/st2common/models/api/reactor.py

@@ -3,68 +3,83 @@
 
 from st2common.models.base import BaseAPI
 from st2common.models.api.stormbase import StormBaseAPI, StormFoundationAPI
-from st2common.models.db.reactor import RuleDB, ActionExecutionSpecDB, TriggerDB, AHTriggerDB
+from st2common.models.db.reactor import RuleDB, ActionExecutionSpecDB, TriggerTypeDB, TriggerDB
 import st2common.validators.api.reactor as validator
 
 
-def get_id(identifiable):
-    if identifiable is None:
-        return ''
-    return str(identifiable.id)
-
-
-def get_ref(identifiable):
-    if identifiable is None:
-        return {}
-    return {'id': str(identifiable.id), 'name': identifiable.name}
-
-
-def get_model_from_ref(db_api, ref):
-    if ref is None:
-        return None
-    model_id = ref['id'] if 'id' in ref else None
-    if model_id is not None:
-        return db_api.get_by_id(model_id)
-    model_name = ref['name'] if 'name' in ref else None
-    for model in db_api.query(name=model_name):
-        return model
-    return None
-
-
-class TriggerAPI(BaseAPI):
+class TriggerTypeAPI(BaseAPI):
     schema = {
-        "type": "object"
+        'type': 'object',
+        'properties': {
+            'id': {
+                'type': 'string',
+                'default': None
+            },
+            'name': {
+                'type': 'string'
+            },
+            'description': {
+                'type': 'string',
+                'default': None
+            },
+            'payload_info': {
+                'type': 'array'
+            },
+            'parameters_schema': {
+                'type': 'object'
+            }
+        },
+        'required': ['name'],
+        'additionalProperties': False
     }
 
     @classmethod
     def from_model(cls, model):
         trigger = model.to_mongo()
-        trigger['name'] = str(trigger.pop('_id'))
+        trigger['id'] = str(trigger.pop('_id'))
         return cls(**trigger)
 
     @classmethod
-    def to_model(cls, trigger):
-        model = StormBaseAPI.to_model(TriggerDB, trigger)
-        model.payload_info = trigger.payload_info
+    def to_model(cls, triggertype):
+        model = StormBaseAPI.to_model(TriggerTypeDB, triggertype)
+        model.payload_info = triggertype.payload_info
+        model.parameter_schema = triggertype.parameter_schema
         return model
 
 
-class AHTriggerAPI(BaseAPI):
+class TriggerAPI(BaseAPI):
     schema = {
-        "type": "object"
+        'type': 'object',
+        'properties': {
+            'id': {
+                'type': 'string',
+                'default': None
+            },
+            'name': {
+                'type': 'string'
+            },
+            'type': {
+                'type': 'string'
+            },
+            'parameters': {
+                'type': 'object'
+            }
+        },
+        'required': ['type'],
+        'additionalProperties': False
     }
 
     @classmethod
     def from_model(cls, model):
         trigger = model.to_mongo()
         trigger['name'] = str(trigger.pop('_id'))
-        if trigger.has_key('type'):
+        if 'type' in trigger:
             trigger['type'] = str(trigger.pop('type'))
         return cls(**trigger)
 
     @classmethod
     def to_model(cls, trigger):
-        model = StormFoundationAPI.to_model(AHTriggerDB, trigger)
+        model = StormFoundationAPI.to_model(TriggerDB, trigger)
         model.name = trigger.name
         model.type = getattr(trigger, 'type', None)
         model.parameters = getattr(trigger, 'parameters', None)

st2common/st2common/models/base.py

@@ -26,7 +26,7 @@ def set_defaults(validator, properties, instance, schema):
                 instance.setdefault(property, subschema["default"])
 
     return jsonschema.validators.extend(
-        validator_class, {"properties" : set_defaults},
+        validator_class, {"properties": set_defaults},
     )
 
 
@@ -100,4 +100,4 @@ def callfunction(*args, **kwargs):
 
         return callfunction
 
-    return decorate
+    return decorate

st2common/st2common/models/db/reactor.py

@@ -3,38 +3,20 @@
 from st2common.models.db.stormbase import StormBaseDB, StormFoundationDB
 
 
-class TriggerSourceDB(StormBaseDB):
-    """Source of a trigger. Typically an external system or service that
-    generates events which must be adapted to a trigger using the provided
-    adapter.
-    Attribute:
-        url: url of the source
-        auth_token: token used by an adapter to authenticate with the
-        adapter_file_uri: uri of the adapter which will translate an event
-        specific to the source to a corresponding trigger.
-    """
-    url = me.URLField()
-    auth_token = me.StringField()
-    adapter_file_uri = me.StringField()
-
-
-class TriggerDB(me.Document):
+class TriggerTypeDB(StormBaseDB):
     """Description of a specific kind/type of a trigger. The name is expected
        uniquely identify a trigger in the namespace of all triggers provided
        by a specific trigger_source.
     Attribute:
         trigger_source: Source that owns this trigger type.
         payload_info: Meta information of the expected payload.
     """
-    name = me.StringField(primary_key=True)
-    description = me.StringField()
     payload_info = me.ListField()
     parameters_schema = me.DictField()
 
 
-class AHTriggerDB(me.Document):
-    name = me.StringField(primary_key=True)
-    type = me.ReferenceField(TriggerDB.__name__)
+class TriggerDB(StormBaseDB):
+    type = me.DictField()
     parameters = me.DictField()
 
 
@@ -45,7 +27,7 @@ class TriggerInstanceDB(StormFoundationDB):
         payload (dict): payload specific to the occurrence.
         occurrence_time (datetime): time of occurrence of the trigger.
     """
-    trigger = me.ReferenceField(AHTriggerDB.__name__)
+    trigger = me.DictField()
     payload = me.DictField()
     occurrence_time = me.DateTimeField()
 
@@ -66,7 +48,7 @@ class RuleDB(StormBaseDB):
         status: enabled or disabled. If disabled occurrence of the trigger
         does not lead to execution of a action and vice-versa.
     """
-    trigger = me.ReferenceField(AHTriggerDB)
+    trigger = me.DictField()
     criteria = me.DictField()
     action = me.EmbeddedDocumentField(ActionExecutionSpecDB)
     enabled = me.BooleanField(required=True, default=True,
@@ -88,9 +70,8 @@ class RuleEnforcementDB(StormFoundationDB):
 
 
 # specialized access objects
-triggersource_access = MongoDBAccess(TriggerSourceDB)
+triggertype_access = MongoDBAccess(TriggerTypeDB)
 trigger_access = MongoDBAccess(TriggerDB)
-ahtrigger_access = MongoDBAccess(AHTriggerDB)
 triggerinstance_access = MongoDBAccess(TriggerInstanceDB)
 rule_access = MongoDBAccess(RuleDB)
 ruleenforcement_access = MongoDBAccess(RuleEnforcementDB)

st2common/st2common/persistence/reactor.py

@@ -1,11 +1,10 @@
 from st2common.persistence import Access
-from st2common.models.db.reactor import triggersource_access, \
-    trigger_access, triggerinstance_access, rule_access, \
-    ruleenforcement_access, ahtrigger_access
+from st2common.models.db.reactor import triggertype_access, trigger_access, triggerinstance_access,\
+    rule_access, ruleenforcement_access
 
 
-class TriggerSource(Access):
-    IMPL = triggersource_access
+class TriggerType(Access):
+    IMPL = triggertype_access
 
     @classmethod
     def _get_impl(kls):
@@ -20,14 +19,6 @@ def _get_impl(kls):
         return kls.IMPL
 
 
-class AHTrigger(Access):
-    IMPL = ahtrigger_access
-
-    @classmethod
-    def _get_impl(kls):
-        return kls.IMPL
-
-
 class TriggerInstance(Access):
     IMPL = triggerinstance_access
 

st2reactorcontroller/st2reactorcontroller/controllers/root.py

@@ -1,18 +1,18 @@
 from pecan import expose
 from webob.exc import status_map
 
-import st2reactorcontroller.controllers.triggers
-import st2reactorcontroller.controllers.rules
+from st2reactorcontroller.controllers.triggers import TriggerTypeController, TriggerController, \
+    TriggerInstanceController
+from st2reactorcontroller.controllers.rules import RuleController, RuleEnforcementController
 
 
 class RootController(object):
 
-    triggers = st2reactorcontroller.controllers.triggers.TriggerController()
-    triggerinstances = \
-        st2reactorcontroller.controllers.triggers.TriggerInstanceController()
-    rules = st2reactorcontroller.controllers.rules.RuleController()
-    ruleenforcements = \
-        st2reactorcontroller.controllers.rules.RuleEnforcementController()
+    triggertypes = TriggerTypeController()
+    triggers = TriggerController()
+    triggerinstances = TriggerInstanceController()
+    rules = RuleController()
+    ruleenforcements = RuleEnforcementController()
 
     @expose(generic=True, template='index.html')
     def index(self):

st2reactorcontroller/st2reactorcontroller/controllers/rules.py

@@ -5,10 +5,10 @@
 from pecan.rest import RestController
 from st2common import log as logging
 from st2common.exceptions.apivalidation import ValueValidationException
-from st2common.models.api.reactor import RuleAPI, RuleEnforcementAPI, AHTriggerAPI
+from st2common.models.api.reactor import RuleAPI, RuleEnforcementAPI, TriggerAPI
 from st2common.models.db.reactor import RuleDB
 from st2common.models.base import jsexpose
-from st2common.persistence.reactor import Rule, RuleEnforcement, AHTrigger, Trigger
+from st2common.persistence.reactor import Rule, RuleEnforcement, TriggerType, Trigger
 from wsme import types as wstypes
 
 LOG = logging.getLogger(__name__)
@@ -47,7 +47,6 @@ def get_all(self, name=None):
         LOG.debug('GET all /rules/ client_result=%s', rule_apis)
         return rule_apis
 
-
     @jsexpose(body=RuleAPI, status_code=httplib.CREATED)
     def post(self, rule):
         """