Merge pull request #28 from dkorn/update_group_trigger

Add support for update group trigger definition in Hawkular alerts

Author: burmanm

hawkular/alerts.py

@@ -155,15 +155,23 @@ def create_group_trigger(self, trigger):
         data = self._serialize_object(trigger)
         return Trigger(self._post(self._service_url(['triggers', 'groups']), data))
 
+    def update_group_trigger(self, group_id, trigger):
+        """
+        :param group_id: group trigger id to be updated
+        :param trigger: Trigger object, the group trigger to be updated
+        """
+        data = self._serialize_object(trigger)
+        self._put(self._service_url(['triggers', 'groups', group_id]), data, parse_json=False)
+
     def delete_group_trigger(self, group_id, keep_non_orphans=False, keep_orphans=False):
-         """
-         Delete a group trigger
-         :param group_id: ID of the group trigger to delete
-         :param keep_non_orphans: if True converts the non-orphan member triggers to standard triggers
-         :param keep_orphans: if True converts the orphan member triggers to standard triggers
-         """
-         params = {'keepNonOrphans': str(keep_non_orphans).lower(), 'keepOrphans': str(keep_orphans).lower()}
-         self._delete(self._service_url(['triggers', 'groups', group_id], params=params))
+        """
+        Delete a group trigger
+        :param group_id: ID of the group trigger to delete
+        :param keep_non_orphans: if True converts the non-orphan member triggers to standard triggers
+        :param keep_orphans: if True converts the orphan member triggers to standard triggers
+        """
+        params = {'keepNonOrphans': str(keep_non_orphans).lower(), 'keepOrphans': str(keep_orphans).lower()}
+        self._delete(self._service_url(['triggers', 'groups', group_id], params=params))
 
     def create_group_member(self, member):
         data = self._serialize_object(member)

hawkular/client.py

@@ -210,8 +210,8 @@ def _http(self, url, method, data=None, decoder=None, parse_json=True):
             if res:
                 res.close()
 
-    def _put(self, url, data):
-        return self._http(url, 'PUT', data)
+    def _put(self, url, data, parse_json=True):
+        return self._http(url, 'PUT', data, parse_json=parse_json)
 
     def _delete(self, url):
         return self._http(url, 'DELETE', parse_json=False)

tests/test_alerts.py

@@ -182,3 +182,12 @@ def test_create_groups(self):
         self.assertEqual(len(gcc), 1)
         t_m1c = self.client.create_group_member(m1)
         self.assertEqual(t_m1c.type, TriggerType.MEMBER)
+
+        # Update group trigger
+        t.enabled = True
+        t.severity = Severity.MEDIUM
+
+        self.client.update_group_trigger(t.id, t)
+        gt = self.client.get_trigger(t.id)
+        self.assertEqual(gt.enabled, True)
+        self.assertEqual(gt.severity, Severity.MEDIUM)