From ee29136f6e9f63bfc5375aacc204dddd6bcb2d9d Mon Sep 17 00:00:00 2001 From: Martin CAMEY Date: Tue, 10 Apr 2018 18:48:23 +0200 Subject: [PATCH] Update client and tests for services endpoints Cloudkitty is now based on metrics and no more on services for the metrology part. This reflects the changes from cloudkitty in the tempest plugin. The tests retrieving services are updated and commented until the corresponding patch in Cloudkitty is merged. Change-Id: Ib829090a43e13e4b66917a66f6e865783b9216f0 --- cloudkitty_tempest_plugin/services/client.py | 8 ++++---- .../tests/api/test_cloudkitty_api.py | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cloudkitty_tempest_plugin/services/client.py b/cloudkitty_tempest_plugin/services/client.py index 4fcbf81..a04e271 100644 --- a/cloudkitty_tempest_plugin/services/client.py +++ b/cloudkitty_tempest_plugin/services/client.py @@ -92,10 +92,10 @@ class RatingClient(rest_client.RestClient): uri = '/info/config/' return self._do_request('GET', uri) - def get_service(self, service_name=None): - uri = '/info/services/' - if service_name: - uri += service_name + '/' + def get_metric(self, metric_name=None): + uri = '/info/metrics/' + if metric_name: + uri += metric_name + '/' return self._do_request('GET', uri) def get_rating_module(self, module_name=None): diff --git a/cloudkitty_tempest_plugin/tests/api/test_cloudkitty_api.py b/cloudkitty_tempest_plugin/tests/api/test_cloudkitty_api.py index 6cd6760..ed0b125 100644 --- a/cloudkitty_tempest_plugin/tests/api/test_cloudkitty_api.py +++ b/cloudkitty_tempest_plugin/tests/api/test_cloudkitty_api.py @@ -134,13 +134,13 @@ class CloudkittyPrimaryAPITest(base.BaseRatingTest): def test_get_config(self): self.rating_client.get_config() - @decorators.idempotent_id('43b03099-0493-4291-9749-85cd8d512811') - def test_get_services(self): - self.rating_client.get_service() + # @decorators.idempotent_id('43b03099-0493-4291-9749-85cd8d512811') + # def test_get_metrics(self): + # self.rating_client.get_metric() - @decorators.idempotent_id('64ecae87-0138-41bd-829f-91302dae7802') - def test_get_service(self): - self.rating_client.get_service('compute') + # @decorators.idempotent_id('64ecae87-0138-41bd-829f-91302dae7802') + # def test_get_metric(self): + # self.rating_client.get_metric('cpu') @decorators.idempotent_id('cccbff8a-24b2-4251-8f7b-ea941d048b9d') def test_report_summary(self):