Change Error classes to just HawkularError, not HawkularMetricsError anymore. Also remove duplicate code and unused code

Author: burmanm

hawkular/alerts.py

@@ -1,5 +1,5 @@
 """
-   Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
+   Copyright 2015-2017 Red Hat, Inc. and/or its affiliates
    and other contributors.
 
    Licensed under the Apache License, Version 2.0 (the "License");

hawkular/client.py

@@ -1,5 +1,5 @@
 """
-   Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
+   Copyright 2015-2017 Red Hat, Inc. and/or its affiliates
    and other contributors.
 
    Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,10 +17,7 @@
 from __future__ import unicode_literals
 
 import codecs
-import time
-import collections
 import base64
-import ssl
 
 try:
     import simplejson as json
@@ -46,15 +43,15 @@ def default(self, obj):
             return json.JSONEncoder.default(self, obj)
 
 
-class HawkularMetricsError(HTTPError):
+class HawkularError(HTTPError):
     pass
 
 
-class HawkularMetricsConnectionError(URLError):
+class HawkularConnectionError(URLError):
     pass
 
 
-class HawkularMetricsStatusError(ValueError):
+class HawkularStatusError(ValueError):
     pass
 
 
@@ -71,7 +68,9 @@ def http_response(self, request, response):
     https_response = http_response
 
 
-class ApiObject:
+class ApiObject(object):
+
+    __slots__ = []
 
     defaults = dict()
 
@@ -114,21 +113,7 @@ def list_to_object_list(cls, o):
             return [cls(ob) for ob in o]
         return []
 
-
-class HawkularHTTPErrorProcessor(HTTPErrorProcessor):
-    """
-    Hawkular-Metrics uses http codes 201, 204
-    """
-
-    def http_response(self, request, response):
-        if response.code in [200, 201, 204]:
-            return response
-        return HTTPErrorProcessor.http_response(self, request, response)
-
-    https_response = http_response
-
-
-class HawkularBaseClient:
+class HawkularBaseClient(object):
     """
     Creates new client for Hawkular-Metrics. As tenant_id, give intended tenant_id, even if it's not
     created yet. To change the instance's tenant_id, use tenant(tenant_id) method
@@ -284,7 +269,7 @@ def _serialize_object(o):
     def _handle_error(self, e):
         if isinstance(e, HTTPError):
             # Cast to HawkularMetricsError
-            ee = HawkularMetricsError(e.url, e.code, e.msg, e.hdrs, e.fp)
+            ee = HawkularError(e.url, e.code, e.msg, e.hdrs, e.fp)
             err_json = e.read()
 
             try:
@@ -297,17 +282,17 @@ def _handle_error(self, e):
 
         elif isinstance(e, URLError):
             # Cast to HawkularMetricsConnectionError
-            ee = HawkularMetricsConnectionError(e)
+            ee = HawkularConnectionError(e)
             ee.msg = "Error, could not send event(s) to the Hawkular Metrics: " + str(e.reason)
             raise ee
         elif isinstance(e, KeyError):
             # Cast to HawkularMetricsStatusError
-            ee = HawkularMetricsStatusError(e)
+            ee = HawkularStatusError(e)
             ee.msg = "Error, unable to get implementation version for metrics: " + str(e.reason)
             raise ee
         elif isinstance(e, ValueError):
             # Cast to HawkularMetricsStatusError
-            ee = HawkularMetricsStatusError(e)
+            ee = HawkularStatusError(e)
             ee.msg = "Error, unable to determine implementation version for metrics: " + str(e.reason)
             raise ee
         else:

hawkular/metrics.py

@@ -28,8 +28,8 @@
 except ImportError:
     import json
 
-from hawkular.client import ApiObject, HawkularBaseClient, HawkularMetricsError
-from hawkular.client import HawkularMetricsConnectionError, HawkularMetricsStatusError
+from hawkular.client import ApiObject, HawkularBaseClient, HawkularError
+from hawkular.client import HawkularConnectionError, HawkularStatusError
 
 class MetricType:
     Gauge = 'gauges'
@@ -125,7 +125,7 @@ def put(self, data):
         for d in data:
             metric_type = d.pop('type', None)
             if metric_type is None:
-                raise HawkularMetricsError('Undefined MetricType')
+                raise HawkularError('Undefined MetricType')
             r[metric_type].append(d)
 
         # This isn't transactional, but .. ouh well. One can always repost everything.
@@ -274,7 +274,7 @@ def create_metric_definition(self, metric_type, metric_id, **tags):
         json_data = json.dumps(item, indent=2)
         try:
             self._post(self._get_url(metric_type), json_data)
-        except HawkularMetricsError as e:
+        except HawkularError as e:
             if e.code == 409:
                 return False
             raise e