Setup travis CI.

Fix some metrics test in order to pass Travis.

Fix alerts for work with python 3.4.x

Support two versions of hawkular metrics for testing

Author: rubenvp8510

.travis.yml

@@ -0,0 +1,17 @@
+sudo: required
+
+language: python
+python:
+  - "2.7"
+  - "3.4"
+
+services:
+  - docker
+
+before_install:
+  - sudo apt-get install jq
+  - ./.travis/run_hawkular.sh
+env:
+  PYTHONPATH=.
+
+script: pytest

.travis/run_hawkular.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+WAIT_STEP=3
+MAX_STEPS=120
+HAWKULAR_IMAGE=rubensvp/hawkular-metrics:latest
+
+function metrics_status {
+    curl -s http://localhost:8080/hawkular/metrics/status | jq -r '.MetricsService'
+}
+
+function alerts_status {
+    curl -s http://localhost:8080/hawkular/alerts/status | jq -r '.status'
+}
+
+function cassandra_status {
+    docker exec hawkular-cassandra nodetool statusbinary | tr -dc '[[:print:]]'
+}
+
+function wait_hawkular {
+    METRICS_STATUS=$(metrics_status)
+    ALERTS_STATUS=$(alerts_status)
+    TOTAL_WAIT=0
+    while ([ "$METRICS_STATUS" != "STARTED" ] || [ "$ALERTS_STATUS" != "STARTED" ])   && [ ${TOTAL_WAIT} -lt ${MAX_STEPS} ]; do
+        METRICS_STATUS=$(metrics_status)
+        ALERTS_STATUS=$(alerts_status)
+        sleep ${WAIT_STEP}
+        echo "Hawkular server status, metrics: $METRICS_STATUS, alerts: $ALERTS_STATUS"
+        TOTAL_WAIT=$((TOTAL_WAIT+WAIT_STEP))
+        echo "Waited $TOTAL_WAIT seconds for Hawkular metrics to start."
+    done
+}
+
+function launch_hawkular {
+    docker run --name hawkular-metrics -p 8080:8080 --link hawkular-cassandra -d  ${HAWKULAR_IMAGE}
+}
+
+function launch_cassandra {
+    docker run --name  hawkular-cassandra  -d cassandra:3.7
+}
+
+function wait_cassandra {
+    CASSANDRA_STATUS=$(cassandra_status)
+    TOTAL_WAIT=0;
+    while [ "$CASSANDRA_STATUS" != "running" ] && [ ${TOTAL_WAIT} -lt ${MAX_STEPS} ]; do
+        CASSANDRA_STATUS=$(cassandra_status)
+        echo "Cassandra server status: $CASSANDRA_STATUS."
+        sleep ${WAIT_STEP}
+        TOTAL_WAIT=$((TOTAL_WAIT+WAIT_STEP))
+        echo "Waited $TOTAL_WAIT seconds for Cassandra to start."
+    done
+}
+
+launch_cassandra
+wait_cassandra
+launch_hawkular
+wait_hawkular

hawkular/alerts.py

@@ -14,9 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 """
-
-from client import ApiOject, HawkularBaseClient
-
+from hawkular.client import ApiOject, HawkularBaseClient
 
 class Trigger(ApiOject):
     __slots__ = [

hawkular/client.py

@@ -56,7 +56,11 @@ def __init__(self, dictionary=dict()):
             setattr(self, k, udict.get(k,self.defaults.get(k)))
 
     def to_json_object(self):
-        return ApiOject.transform_dict_to_camelcase(self.__dict__)
+        dictionary = {}
+        for attribute in self.__slots__:
+            if hasattr(self,attribute):
+                dictionary[attribute] = getattr(self,attribute)
+        return ApiOject.transform_dict_to_camelcase(dictionary)
 
     @staticmethod
     def _to_camelcase(word):
@@ -71,13 +75,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.iteritems() if v is not None)
+        return dict((ApiOject._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.iteritems() if v is not None)
+        return dict((ApiOject._to_underscore(k), v) for k, v in dictionary.items() if v is not None)
 
     @classmethod
     def list_to_object_list(cls, o):
@@ -171,8 +175,9 @@ def _http(self, url, method, data=None, decoder=None):
         if self.token is not None:
             req.add_header('Authorization', 'Bearer {0}'.format(self.token))
         elif self.username is not None:
+            b64 = base64.b64encode(bytes(self.username + ':' + self.password, encoding='utf-8'))
             req.add_header('Authorization',
-                           'Basic {0}'.format(base64.b64encode(self.username + b':' + self.password)))
+                           'Basic {0}'.format(b64))
 
         if not isinstance(data, str):
             data = json.dumps(data, indent=2)

hawkular/metrics.py

@@ -98,7 +98,8 @@ def __init__(self,
                  token=None,
                  username=None,
                  password=None,
-                 auto_set_legacy_api=True):
+                 auto_set_legacy_api=True,
+                 authtoken=None):
         """
         A new instance of HawkularMetricsClient is created with the following defaults:
 
@@ -123,6 +124,7 @@ def __init__(self,
         self.username = username
         self.password = password
         self.legacy_api = False
+        self.authtoken = authtoken
 
         opener = build_opener(HawkularHTTPErrorProcessor())
         install_opener(opener)
@@ -185,6 +187,9 @@ def _http(self, url, method, data=None):
             elif self.username is not None:
                 req.add_header('Authorization', 'Basic {0}'.format(base64.b64encode(self.username + b':' + self.password)))
 
+            if self.authtoken is not None:
+                req.add_header('Hawkular-Admin-Token', self.authtoken)
+
             if not isinstance(data, str):
                 data = json.dumps(data, indent=2)
 

hawkular/alerts_test.py tests/test_alerts.pyhawkular/alerts_test.py renamed to tests/test_alerts.py

@@ -18,17 +18,15 @@
 
 import unittest
 import uuid
-from alerts import *
+from hawkular.alerts import *
 
 
 class TestAlertsFunctionsBase(unittest.TestCase):
     def setUp(self):
         self.maxDiff = None
         self.test_tenant = str(uuid.uuid4())
         self.client = HawkularAlertsClient(tenant_id=self.test_tenant,
-                                           port=8080,
-                                           username='jdoe',
-                                           password='password')
+                                           port=8080)
 
 
 class MetricsTestCase(TestAlertsFunctionsBase):

hawkular/metrics_test.py tests/test_metrics.pyhawkular/metrics_test.py renamed to tests/test_metrics.py

@@ -18,7 +18,7 @@
 
 import unittest
 import uuid
-from metrics import *
+from  hawkular.metrics  import *
 
 class TestMetricFunctionsBase(unittest.TestCase):