Merge "Rename usage to measurements"

distilclient/tests/unit/v2/test_measurements.py

@@ -18,8 +18,8 @@
 from distilclient.tests.unit import utils
 
 
-class UsageTest(utils.TestCase):
+class MeasurementsTest(utils.TestCase):
 
     # Testcases for class Share
     def setUp(self):
-        super(UsageTest, self).setUp()
+        super(MeasurementsTest, self).setUp()

distilclient/v2/client.py

@@ -20,7 +20,7 @@ import six
 
 from distilclient.common import httpclient
 from distilclient import exceptions
-from distilclient.v2 import usage
+from distilclient.v2 import measurements
 
 
 class Client(object):
@@ -185,7 +185,7 @@ class Client(object):
                                             http_log_debug=http_log_debug,
                                             api_version=self.api_version)
 
-        self.usage = usage.UsageManager(self)
+        self.measurements = measurements.MeasurementManager(self)
 
         self._load_extensions(extensions)
 

distilclient/v2/measurements.py

@@ -15,13 +15,12 @@
 from distilclient import base
 
 
-class UsageManager(base.Manager):
+class MeasurementManager(base.Manager):
 
     def list(self, project_id, start, end):
-        """Retrieve a list of usages.
+        """Retrieve a list of measurements.
-        :returns: A list of usages.
+        :returns: A list of measurements.
         """
-        url = "/v2/usage?project_id={0}&start={1}&end={2}".format(project_id,
+        url = "/v2/measurements?project_id={0}&start={1}&end={2}"
-                                                                  start,
+        url = url.format(project_id, start, end)
-                                                                  end)
+        return self._list(url, "measurements")
-        return self._list(url, "usage")