Move tenantId to headers

Author: burmanm

hawkular/metrics.py

@@ -10,7 +10,6 @@
 TODO: Allow changing instance's tenant?
 TODO: Authentication when it's done..
 TODO: Remove HawkularMetricsConnectionError and use HawkularMetricsError only?
-TODO: 0.3.3 will before release move the tenantId to headers..
 """
 
 class MetricType:
@@ -88,7 +87,7 @@ def _get_base_url(self):
         return "http://{0}:{1}/{2}/".format(self.host, str(self.port), self.path)
 
     def _get_url(self, metric_type):
-        return self._get_base_url() + '{0}/{1}'.format(self.tenant_id, metric_type)
+        return self._get_base_url() + '{0}'.format(metric_type)
 
     def _get_metrics_single_url(self, metric_type, metric_id):
         return self._get_url(metric_type) + '/{0}'.format(self._clean_metric_id(metric_id))
@@ -108,6 +107,7 @@ def _http(self, url, method, data=None):
         try:
             req = urllib2.Request(url=url)
             req.add_header('Content-Type', 'application/json')
+            req.add_header('tenantId', self.tenant_id)
 
             if not isinstance(data, str):
                 data = json.dumps(data, indent=2)
@@ -246,10 +246,7 @@ def query_definitions(self, query_type):
         """
         Query available metric definitions. 
         """
-        # if isinstance(query_type, MetricType):
-        #     query_type = MetricType.short(query_type)
-            
-        definition_url = self._get_url('metrics') + '?type=' + query_type
+        definition_url = self._get_url('metrics') + '?type=' + MetricType.short(query_type)
         return self._get(definition_url)
 
     def create_metric_definition(self, metric_type, metric_id, **tags):

hawkular/metrics_test.py

@@ -6,7 +6,7 @@ class TestMetricFunctionsBase(unittest.TestCase):
 
     def setUp(self):
         self.test_tenant = str(uuid.uuid4())
-        self.client = HawkularMetricsClient(tenant_id=self.test_tenant, port=8081)
+        self.client = HawkularMetricsClient(tenant_id=self.test_tenant, port=8080)
 
 class TenantTestCase(TestMetricFunctionsBase):
     """