From 77f3324058c704fe1505583ceaf725e4a5ca452c Mon Sep 17 00:00:00 2001
From: Fei Long Wang <flwang@catalyst.net.nz>
Date: Wed, 12 Apr 2017 14:32:10 +1200
Subject: [PATCH] Rename `usage` to `measurements`
Change-Id: I6bb80fef2befaf76697ca4e88d267f3c3441e356
---
.../unit/v2/{test_usage.py => test_measurements.py} | 4 ++--
distilclient/v2/client.py | 4 ++--
distilclient/v2/{usage.py => measurements.py} | 13 ++++++-------
3 files changed, 10 insertions(+), 11 deletions(-)
rename distilclient/tests/unit/v2/{test_usage.py => test_measurements.py} (89%)
rename distilclient/v2/{usage.py => measurements.py} (65%)
diff --git a/distilclient/tests/unit/v2/test_usage.py b/distilclient/tests/unit/v2/test_measurements.py
similarity index 89%
rename from distilclient/tests/unit/v2/test_usage.py
rename to distilclient/tests/unit/v2/test_measurements.py
index 1d7fb06..df8c0a2 100644
--- a/distilclient/tests/unit/v2/test_usage.py
+++ b/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()
diff --git a/distilclient/v2/client.py b/distilclient/v2/client.py
index bee431d..6ace015 100644
--- a/distilclient/v2/client.py
+++ b/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)
diff --git a/distilclient/v2/usage.py b/distilclient/v2/measurements.py
similarity index 65%
rename from distilclient/v2/usage.py
rename to distilclient/v2/measurements.py
index 9cdce43..72789e2 100644
--- a/distilclient/v2/usage.py
+++ b/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.
- :returns: A list of usages.
+ """Retrieve a list of measurements.
+ :returns: A list of measurements.
"""
- url = "/v2/usage?project_id={0}&start={1}&end={2}".format(project_id,
- start,
- end)
- return self._list(url, "usage")
+ url = "/v2/measurements?project_id={0}&start={1}&end={2}"
+ url = url.format(project_id, start, end)
+ return self._list(url, "measurements")