Add support for retentions setting in create_tenant, solves #7

Author: burmanm

hawkular/metrics.py

@@ -31,15 +31,6 @@
     from urllib2 import Request, urlopen, URLError, HTTPError, HTTPErrorProcessor, build_opener, install_opener
     from urllib import quote, urlencode
 
-"""
-TODO: Search datapoints with tags.. tag datapoints.
-TODO: Allow changing instance's tenant?
-TODO: Authentication
-TODO: Remove HawkularMetricsConnectionError and use HawkularMetricsError only?
-TODO: HWKMETRICS-110 (fetching a single definition)
-TODO: Stats queries
-"""
-
 class MetricType:
     Gauge = 'gauges'
     Availability = 'availability'
@@ -388,15 +379,16 @@ def query_tenants(self):
         """
         return self._get(self._get_tenants_url())
 
-    def create_tenant(self, tenant_id):
+    def create_tenant(self, tenant_id, retentions=None):
         """
         Create a tenant. Currently nothing can be set (to be fixed after the master
         version of Hawkular-Metrics has fixed implementation.
         """        
         item = { 'id': tenant_id }
+        if retentions is not None:
+            item['retentions'] = retentions
 
-        tenants_url = self._get_tenants_url()
-        self._post(tenants_url, json.dumps(item, indent=2))
+        self._post(self._get_tenants_url(), json.dumps(item, indent=2))
 
 """
 Static methods

hawkular/metrics_test.py

@@ -41,8 +41,13 @@ def test_tenant_creation(self):
         expect = { 'id': tenant }
         self.assertIn(expect, tenants)
 
-    def test_tenant_creation_with_retentions_and_aggregations(self):
-        pass
+    def test_tenant_creation_with_retentions(self):
+        tenant = str(uuid.uuid4())
+        retentions = { 'gauge': 8, 'availability': 30 }
+        self.client.create_tenant(tenant, retentions)
+
+        expect = { 'id': tenant, 'retentions': { 'gauge': 8, 'availability': 30 } }
+        self.assertIn(expect, self.client.query_tenants())
 
 class MetricsTestCase(TestMetricFunctionsBase):
     """