Change ApiOject to ApiObject

Author: Guilherme Baufaker Rêgo

hawkular/alerts.py

@@ -14,10 +14,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 """
-from hawkular.client import ApiOject, HawkularBaseClient
+from hawkular.client import ApiObject, HawkularBaseClient
 
-
-class Trigger(ApiOject):
+class Trigger(ApiObject):
     __slots__ = [
         'id', 'name', 'description', 'type', 'event_type', 'event_category',
         'event_text', 'event_category', 'event_text', 'severity', 'context',
@@ -26,8 +25,7 @@ class Trigger(ApiOject):
         'enabled', 'firing_match', 'source'
     ]
 
-
-class Condition(ApiOject):
+class Condition(ApiObject):
     __slots__ = [
         'trigger_id', 'trigger_mode', 'type', 'condition_set_size',
         'condition_set_index', 'condition_id', 'context', 'data_id',
@@ -37,14 +35,13 @@ class Condition(ApiOject):
     ]
 
 
-class Dampening(ApiOject):
+class Dampening(ApiObject):
     __slots__ = [
         'trigger_id', 'trigger_mode', 'type', 'eval_true_setting',
         'eval_total_setting', 'eval_time_setting', 'dampening_id'
     ]
 
-
-class FullTrigger(ApiOject):
+class FullTrigger(ApiObject):
     defaults = {
         'conditions': [],
         'dampenings': []
@@ -60,20 +57,20 @@ def __init__(self, dictionary=dict()):
         self.conditions = Condition.list_to_object_list(udict.get('conditions'))
 
 
-class GroupMemberInfo(ApiOject):
+class GroupMemberInfo(ApiObject):
     __slots__ = [
         'group_id', 'member_id', 'member_name', 'member_description', 'member_context',
         'member_tags', 'data_id_map'
     ]
 
 
-class GroupConditionsInfo(ApiOject):
+class GroupConditionsInfo(ApiObject):
     __slots__ = [
         'conditions', 'data_id_member_map'
     ]
 
     def __init__(self, dictionary=dict()):
-        ApiOject.__init__(self, dictionary)
+        ApiObject.__init__(self, dictionary)
         udict = self.transform_dict_to_underscore(dictionary)
         self.conditions = Condition.list_to_object_list(udict.get('conditions'))
 
@@ -199,7 +196,6 @@ def put_trigger_conditions(self, trigger_id, trigger_mode, conditions):
         response = self._put(url, data)
         return Condition.list_to_object_list(response)
 
-
     def get_trigger_conditions(self, trigger_id):
         """
         Get all conditions for a specific trigger

hawkular/client.py

@@ -40,7 +40,7 @@
 
 class ApiJsonEncoder(json.JSONEncoder):
     def default(self, obj):
-        if isinstance(obj, ApiOject):
+        if isinstance(obj, ApiObject):
             return obj.to_json_object()
         else:
             return json.JSONEncoder.default(self, obj)
@@ -71,12 +71,12 @@ def http_response(self, request, response):
     https_response = http_response
 
 
-class ApiOject:
+class ApiObject:
 
     defaults = dict()
 
     def __init__(self, dictionary=dict()):
-        udict = ApiOject.transform_dict_to_underscore(dictionary)
+        udict = ApiObject.transform_dict_to_underscore(dictionary)
         for k in self.__slots__:
             setattr(self, k, udict.get(k,self.defaults.get(k)))
 
@@ -85,7 +85,7 @@ def to_json_object(self):
         for attribute in self.__slots__:
             if hasattr(self,attribute):
                 dictionary[attribute] = getattr(self,attribute)
-        return ApiOject.transform_dict_to_camelcase(dictionary)
+        return ApiObject.transform_dict_to_camelcase(dictionary)
 
     @staticmethod
     def _to_camelcase(word):
@@ -100,13 +100,13 @@ def _to_underscore(word):
     def transform_dict_to_camelcase(dictionary):
         if dictionary is None:
             return dict()
-        return dict((ApiOject._to_camelcase(k), v) for k, v in dictionary.items() if v is not None)
+        return dict((ApiObject._to_camelcase(k), v) for k, v in dictionary.items() if v is not None)
 
     @staticmethod
     def transform_dict_to_underscore(dictionary):
         if dictionary is None:
             return dict()
-        return dict((ApiOject._to_underscore(k), v) for k, v in dictionary.items() if v is not None)
+        return dict((ApiObject._to_underscore(k), v) for k, v in dictionary.items() if v is not None)
 
     @classmethod
     def list_to_object_list(cls, o):

hawkular/metrics.py

@@ -28,7 +28,7 @@
 except ImportError:
     import json
 
-from hawkular.client import ApiOject, HawkularBaseClient, HawkularMetricsError
+from hawkular.client import ApiObject, HawkularBaseClient, HawkularMetricsError
 from hawkular.client import HawkularMetricsConnectionError, HawkularMetricsStatusError
 
 class MetricType:
@@ -91,25 +91,25 @@ def _get_single_id_url(self, previous_url, id):
     @staticmethod
     def _transform_tags(**tags):
         return ','.join("%s:%s" % (key,val) for (key,val) in tags.items())
-        
+
     def _isfloat(value):
         try:
             float(value)
             return True
         except ValueError:
             return False
-        
+
     """
     External methods
-    """    
+    """
 
     def tenant(self, tenant_id):
         self.tenant_id = tenant_id
 
     """
     Instance methods
     """
-    
+
     def put(self, data):
         """
         Send multiple different metric_ids to the server in a single batch. Metrics can be a mixture
@@ -219,7 +219,7 @@ def query_metric_definition(self, metric_type, metric_id):
         :param metric_id: Exact string matching metric id
         """
         return self._get(self._get_metrics_single_url(metric_type, metric_id))
-    
+
     def query_metric_definitions(self, metric_type=None, id_filter=None, **tags):
         """
         Query available metric definitions.
@@ -280,7 +280,7 @@ def create_metric_definition(self, metric_type, metric_id, **tags):
             raise e
 
         return True
-        
+
     def query_metric_tags(self, metric_type, metric_id):
         """
         Returns a list of tags in the metric definition.
@@ -303,7 +303,7 @@ def update_metric_tags(self, metric_type, metric_id, **tags):
 
     def delete_metric_tags(self, metric_type, metric_id, **deleted_tags):
         """
-        Delete one or more tags from the metric definition. 
+        Delete one or more tags from the metric definition.
 
         :param metric_type: MetricType to be matched (required)
         :param metric_id: Exact string matching metric id
@@ -312,12 +312,12 @@ def delete_metric_tags(self, metric_type, metric_id, **deleted_tags):
         tags = self._transform_tags(**deleted_tags)
         tags_url = self._get_metrics_tags_url(self._get_metrics_single_url(metric_type, metric_id)) + '/{0}'.format(tags)
 
-        self._delete(tags_url)    
-        
+        self._delete(tags_url)
+
     """
     Tenant related queries
     """
-    
+
     def query_tenants(self):
         """
         Query available tenants and their information.
@@ -330,7 +330,7 @@ def create_tenant(self, tenant_id, retentions=None):
         version of Hawkular-Metrics has fixed implementation.
 
         :param retentions: A set of retention settings, see Hawkular-Metrics documentation for more info
-        """        
+        """
         item = { 'id': tenant_id }
         if retentions is not None:
             item['retentions'] = retentions
@@ -391,15 +391,15 @@ def create_metric(metric_type, metric_id, data):
     """
     if not isinstance(data, list):
         data = [data]
-    
+
     return { 'type': metric_type,'id': metric_id, 'data': data }
 
 def create_percentiles_filter(*percentiles):
     """
     Create percentiles filter from a list of float64 percentile values
     """
     return ','.join("%s" % p for p in percentiles)
-        
+
 def create_tags_filter(**tags):
     """
     Transform a set of parameters to a tag query language filter