Rename back to query_metric()

Author: burmanm

hawkular/metrics.py

@@ -256,7 +256,7 @@ def push(self, metric_type, metric_id, value, timestamp=None, **tags):
         item = create_metric(metric_type, metric_id, create_datapoint(value, timestamp, **tags))
         self.put(item)
 
-    def query_metrics(self, metric_type, metric_id, **search_options):
+    def query_metric(self, metric_type, metric_id, **search_options):
         """
         Query for metrics from the server. 
 
@@ -273,13 +273,13 @@ def query_single_gauge(self, metric_id, **search_options):
         """
         See query_metric
         """
-        return self.query_metrics(MetricType.Gauge, metric_id, **search_options)
+        return self.query_metric(MetricType.Gauge, metric_id, **search_options)
 
     def query_single_availability(self, metric_id, **search_options):
         """
         See query_metric
         """
-        return self.query_metrics(MetricType.Availability, metric_id, **search_options)
+        return self.query_metric(MetricType.Availability, metric_id, **search_options)
 
     def query_definitions(self, query_type):
         """

hawkular/metrics_test.py

@@ -217,11 +217,11 @@ def test_query_options(self):
         self.client.put(m)
 
         # Query first without limitations
-        d = self.client.query_metrics(MetricType.Gauge, 'test.query.gauge.1')
+        d = self.client.query_metric(MetricType.Gauge, 'test.query.gauge.1')
         self.assertEqual(2, len(d))
 
         # Query for data which has start time limitation
-        d = self.client.query_metrics(MetricType.Gauge, 'test.query.gauge.1', start=(t-1000))
+        d = self.client.query_metric(MetricType.Gauge, 'test.query.gauge.1', start=(t-1000))
         self.assertEqual(1, len(d))
 
     # This feature isn't really ready for prime time in Hawkular-Metrics yet..