Merge pull request #299 from StackStorm/STORM-337/rename_mapping_to_p…

…arameters RFR: Fix: Rename mapping to parameters for action section in rule model
StackStorm · Jul 30, 2014 · 07551b2 · 07551b2
2 parents d8fa997 + 67e17a5
commit 07551b2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/contrib/examples/rules/sample-rule.json b/contrib/examples/rules/sample-rule.json
@@ -17,9 +17,9 @@
         "type": {
             "name": "st2.test.action"
         },
-        "mapping": {
-            "ip2": "{{system.k1}}",
-            "ip1": "{{trigger.t1_p}}"
+        "parameters": {
+            "ip1": "{{trigger.t1_p}}",
+            "ip2": "{{system.k1}}"
         }
     },
 

diff --git a/st2common/st2common/models/api/reactor.py b/st2common/st2common/models/api/reactor.py
@@ -79,7 +79,7 @@ class RuleAPI(StormBaseAPI):
         e.g.
         "action":
         { "type": {"id": "2345678901"}
-        , "mapping":
+        , "parameters":
             { "command": "{{ system.foo }}"
             , "args": "--email {{ trigger.from }} --subject \'{{ user[stanley].ALERT_SUBJECT }}\'"}
         }
@@ -97,7 +97,7 @@ def from_model(kls, model):
         rule.trigger = model.trigger
         rule.criteria = dict(model.criteria)
         rule.action = {'type': model.action.action,
-                       'mapping': dict(model.action.data_mapping)}
+                       'parameters': dict(model.action.parameters)}
         rule.enabled = model.enabled
         return rule
 
@@ -110,8 +110,8 @@ def to_model(kls, rule):
         model.action = ActionExecutionSpecDB()
         if 'type' in rule.action:
             model.action.action = rule.action['type']
-        if 'mapping' in rule.action:
-            model.action.data_mapping = rule.action['mapping']
+        if 'parameters' in rule.action:
+            model.action.parameters = rule.action['parameters']
         model.enabled = rule.enabled
         return model
 

diff --git a/st2common/st2common/models/db/reactor.py b/st2common/st2common/models/db/reactor.py
@@ -44,7 +44,7 @@ class TriggerInstanceDB(StormFoundationDB):
 
 class ActionExecutionSpecDB(me.EmbeddedDocument):
     action = me.DictField()
-    data_mapping = me.DictField()
+    parameters = me.DictField()
 
 
 class RuleDB(StormBaseDB):

diff --git a/st2common/tests/test_db.py b/st2common/tests/test_db.py
@@ -201,7 +201,7 @@ def _create_save_rule(trigger, action=None, enabled=True):
         created.criteria = {}
         created.action = ActionExecutionSpecDB()
         created.action.action = reference.get_ref_from_model(action)
-        created.action.data_mapping = {}
+        created.action.parameters = {}
         return Rule.add_or_update(created)
 
     @staticmethod

diff --git a/st2reactor/st2reactor/rules/enforcer.py b/st2reactor/st2reactor/rules/enforcer.py
@@ -22,7 +22,7 @@ def enforce(self):
         rule_enforcement = RuleEnforcementDB()
         rule_enforcement.trigger_instance = reference.get_ref_from_model(self.trigger_instance)
         rule_enforcement.rule = reference.get_ref_from_model(self.rule)
-        data = self.data_transformer(self.rule.action.data_mapping)
+        data = self.data_transformer(self.rule.action.parameters)
         LOG.info('Invoking action %s for trigger_instance %s with data %s.',
                  RuleEnforcer.__get_action_name(self.rule.action), self.trigger_instance.id,
                  json.dumps(data))

diff --git a/st2reactorcontroller/tests/controllers/test_rules.py b/st2reactorcontroller/tests/controllers/test_rules.py
@@ -43,7 +43,7 @@
         'type': {
             'name': 'st2.test.action'
         },
-        'mapping': {
+        'parameters': {
             'ip2': '{{rule.k1}}',
             'ip1': '{{trigger.t1_p}}'
         }