Add auth token to metrics client.

Support two versions of hawkular metrics.

Author: rubenvp8510

.travis.yml

@@ -12,6 +12,10 @@ before_install:
   - sudo apt-get install jq
   - ./.travis/run_hawkular.sh
 env:
-  PYTHONPATH=.
+  global:
+    - PYTHONPATH=.
+  matrix:
+    - HAWKULAR_VERSION=latest
+    - HAWKULAR_VERSION=0.15
 
 script: pytest

.travis/run_hawkular.sh

@@ -2,29 +2,40 @@
 
 WAIT_STEP=3
 MAX_STEPS=120
-HAWKULAR_IMAGE=rubensvp/hawkular-metrics:latest
+LOWER_VERSION="0.15"
+
+if [[ -z ${HAWKULAR_VERSION+x} ]]; then
+    HAWKULAR_VERSION='latest'
+fi
+
+HAWKULAR_IMAGE=rubensvp/hawkular-metrics:${HAWKULAR_VERSION}
 
 function metrics_status {
-    curl -s http://localhost:8080/hawkular/metrics/status | jq -r '.MetricsService'
+    curl -s http://localhost:8080/hawkular/metrics/status | jq -r '.MetricsService'  2> /dev/null
 }
 
 function alerts_status {
-    curl -s http://localhost:8080/hawkular/alerts/status | jq -r '.status'
+    curl -s http://localhost:8080/hawkular/alerts/status | jq -r '.status' 2> /dev/null
 }
 
 function cassandra_status {
-    docker exec hawkular-cassandra nodetool statusbinary | tr -dc '[[:print:]]'
+    docker exec hawkular-cassandra nodetool statusbinary  | tr -dc '[[:print:]]'  2> /dev/null
 }
 
 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
+    echo "Starting hawkular metrics $HAWKULAR_VERSION ..."
+    while ([ "$METRICS_STATUS" != "STARTED" ] || ( [ "$ALERTS_STATUS" != "STARTED" ] && [ "$HAWKULAR_VERSION" != "$LOWER_VERSION" ]) )  && [ ${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"
+        if [[ "$HAWKULAR_VERSION" == "$LOWER_VERSION" ]]; then
+            echo "Hawkular server status, metrics: $METRICS_STATUS"
+        else
+            echo "Hawkular server status, metrics: $METRICS_STATUS, alerts: $ALERTS_STATUS"
+        fi
         TOTAL_WAIT=$((TOTAL_WAIT+WAIT_STEP))
         echo "Waited $TOTAL_WAIT seconds for Hawkular metrics to start."
     done
@@ -35,7 +46,7 @@ function launch_hawkular {
 }
 
 function launch_cassandra {
-    docker run --name  hawkular-cassandra  -d cassandra:3.7
+    docker run --name  hawkular-cassandra  -e CASSANDRA_START_RPC=true -d cassandra:3.7
 }
 
 function wait_cassandra {

tests/test_metrics.py

@@ -25,7 +25,7 @@ class TestMetricFunctionsBase(unittest.TestCase):
     def setUp(self):
         self.maxDiff = None
         self.test_tenant = str(uuid.uuid4())
-        self.client = HawkularMetricsClient(tenant_id=self.test_tenant, port=8080)
+        self.client = HawkularMetricsClient(tenant_id=self.test_tenant, port=8080, authtoken='secret')
 
 class TenantTestCase(TestMetricFunctionsBase):
     """