Added copyright/license information, renamed query_metric -> query_metrics

Author: burmanm

README.md

@@ -5,7 +5,26 @@ This repository includes the necessary Python client libraries to access Hawkula
 
 ## Introduction
 
-Python client to access Hawkular-Metrics, an abstraction to invoke REST-methods on the server endpoint using urllib2. No external dependencies, works with Python 2.7 (Python 3.x support planned).
+Python client to access Hawkular-Metrics, an abstraction to invoke REST-methods on the server endpoint using urllib2. No external dependencies, works with Python 2.7.x and Python 3.4.x (tested with the Python 3.4.2, might work with newer versions also)
+
+## License and copyright
+
+```
+   Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
+   and other contributors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+```
 
 ## Installation
 

hawkular/metrics.py

@@ -1,3 +1,19 @@
+"""
+   Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
+   and other contributors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+"""
 from __future__ import unicode_literals
 
 import codecs
@@ -240,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_metric(self, metric_type, metric_id, **search_options):
+    def query_metrics(self, metric_type, metric_id, **search_options):
         """
         Query for metrics from the server. 
 
@@ -257,13 +273,13 @@ def query_single_gauge(self, metric_id, **search_options):
         """
         See query_metric
         """
-        return self.query_metric(MetricType.Gauge, metric_id, **search_options)
+        return self.query_metrics(MetricType.Gauge, metric_id, **search_options)
 
     def query_single_availability(self, metric_id, **search_options):
         """
         See query_metric
         """
-        return self.query_metric(MetricType.Availability, metric_id, **search_options)
+        return self.query_metrics(MetricType.Availability, metric_id, **search_options)
 
     def query_definitions(self, query_type):
         """

hawkular/metrics_test.py

@@ -1,3 +1,19 @@
+"""
+   Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
+   and other contributors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+"""
 from __future__ import unicode_literals
 
 import unittest
@@ -201,11 +217,11 @@ def test_query_options(self):
         self.client.put(m)
 
         # Query first without limitations
-        d = self.client.query_metric(MetricType.Gauge, 'test.query.gauge.1')
+        d = self.client.query_metrics(MetricType.Gauge, 'test.query.gauge.1')
         self.assertEqual(2, len(d))
 
         # Query for data which has start time limitation
-        d = self.client.query_metric(MetricType.Gauge, 'test.query.gauge.1', start=(t-1000))
+        d = self.client.query_metrics(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..