Merge branch 'master' into get_group_members

Author: burmanm

hawkular/alerts.py

@@ -71,9 +71,10 @@ class GroupConditionsInfo(ApiOject):
         'conditions', 'data_id_member_map'
     ]
 
-    defaults = {
-        'conditions': []
-    }
+    def __init__(self, dictionary=dict()):
+        ApiOject.__init__(self, dictionary)
+        udict = self.transform_dict_to_underscore(dictionary)
+        self.conditions = Condition.list_to_object_list(udict.get('conditions'))
 
     def addCondition(self, c):
         self.conditions.append(c)
@@ -164,10 +165,37 @@ def get_group_members(self, group_id):
         url = self._service_url(['triggers', 'groups', group_id, 'members'])
         return Trigger.list_to_object_list(self._get(url))
 
+    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))
+
     def create_group_member(self, member):
         data = self._serialize_object(member)
         return Trigger(self._post(self._service_url(['triggers', 'groups', 'members']), data))
 
+    def get_trigger_conditions(self, trigger_id):
+        """
+        Get all conditions for a specific trigger
+        :param trigger_id: Trigger definition id to be retrieved
+        :return: list of condition objects
+        """
+        response = self._get(self._service_url(['triggers', trigger_id, 'conditions']))
+        return  Condition.list_to_object_list(response)
+
     def create_group_conditions(self, group_id, trigger_mode, conditions):
         data = self._serialize_object(conditions)
         url = self._service_url(['triggers', 'groups', group_id, 'conditions', trigger_mode])

hawkular/client.py

@@ -165,7 +165,7 @@ def _get_status_url(self):
     def tenant(self, tenant_id):
         self.tenant_id = tenant_id
 
-    def _http(self, url, method, data=None, decoder=None):
+    def _http(self, url, method, data=None, decoder=None, parse_json=True):
         res = None
         req = Request(url=url)
         req.add_header('Content-Type', 'application/json')
@@ -193,10 +193,13 @@ def _http(self, url, method, data=None, decoder=None):
             req.get_method = lambda: method
             res = urlopen(req, context=self.context)
 
-            if res.getcode() == 200:
-                data = json.load(reader(res), cls=decoder)
-            elif res.getcode() == 204:
-                data = {}
+            if parse_json:
+                if res.getcode() == 200:
+                    data = json.load(reader(res), cls=decoder)
+                elif res.getcode() == 204:
+                    data = {}
+            else:
+                data = reader(res).read()
 
             return data
 
@@ -207,11 +210,11 @@ def _http(self, url, method, data=None, decoder=None):
             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')
+        return self._http(url, 'DELETE', parse_json=False)
 
     def _post(self, url, data):
         return self._http(url, 'POST', data)

tests/test_alerts.py

@@ -22,6 +22,13 @@
 import os
 from tests import base
 
+try:
+    # Python 3
+    from urllib.error import HTTPError
+except ImportError:
+    # Fall back to Python 2's urllib2
+    from urllib2 import HTTPError
+
 
 class TestAlertsFunctionsBase(unittest.TestCase):
     def setUp(self):
@@ -125,6 +132,63 @@ def test_create_group_trigger(self):
         self.assertEqual(created_group_trigger.id, trigger.id)
         self.assertEqual(created_group_trigger.name, trigger.name)
 
+    def test_get_trigger_conditions(self):
+        # Create group trigger object
+        trigger = Trigger()
+        trigger.id = 'group_trigger_01'
+        trigger.name = 'group_trigger'
+        self.client.create_group_trigger(trigger)
+
+        # Create condition objects
+        condition1 = Condition()
+        condition1.trigger_mode = TriggerMode.AUTORESOLVE
+        condition1.type = ConditionType.THRESHOLD
+        condition1.data_id = 'did1'
+        condition1.threshold = 5
+        condition1.operator = Operator.LT
+
+        condition2 = Condition()
+        condition2.trigger_mode = TriggerMode.AUTORESOLVE
+        condition2.type = ConditionType.THRESHOLD
+        condition2.data_id = 'did2'
+        condition2.threshold = 5
+        condition2.operator = Operator.GT
+
+        condition3 = Condition()
+        condition3.trigger_mode = TriggerMode.AUTORESOLVE
+        condition3.type = ConditionType.THRESHOLD
+        condition3.data_id = 'did3'
+        condition3.threshold = 5
+        condition3.operator = Operator.GTE
+
+        gc = GroupConditionsInfo()
+        gc.addCondition(condition1)
+        gc.addCondition(condition2)
+        gc.addCondition(condition3)
+        self.client.create_group_conditions(trigger.id, TriggerMode.AUTORESOLVE, gc)
+
+        gc = self.client.get_trigger_conditions(trigger.id)
+        self.assertEqual(len(gc), 3)
+        gc_dids = [c.data_id for c in gc]
+        self.assertEqual(gc_dids, ['did1', 'did2', 'did3'])
+
+    def test_delete_group_trigger(self):
+        # Create a group trigger
+        gt = Trigger()
+        gt.id = 'delete_group_trigger'
+        gt.name = 'group_trigger_to_delete'
+        self.client.create_group_trigger(gt)
+
+        group_count = len(self.client.list_triggers())
+        # Delete the created group trigger
+        self.client.delete_group_trigger('delete_group_trigger')
+
+        # Compare number of remaining triggers and query the deleted trigger id
+        self.assertEqual(len(self.client.list_triggers()), group_count-1)
+        with self.assertRaises(HTTPError) as e:
+            self.client.get_trigger('delete_group_trigger')
+            self.assertEqual(e.getcode(), 404)
+
     def test_create_groups(self):
         # Create a group trigger
         t = Trigger()
@@ -161,3 +225,12 @@ def test_create_groups(self):
         gm = self.client.get_group_members('a-group-trigger')
         self.assertEqual(len(gm), 1)
         self.assertEqual(gm[0].id, 'member1')
+
+        # 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)