From 21ac85f14c68684a6a51619c061cbcc5a44ee1ad Mon Sep 17 00:00:00 2001 From: Masahito Muroi Date: Tue, 13 Mar 2018 10:28:57 +0900 Subject: [PATCH] Remove climate namespace Partial-Bug: #1755325 Change-Id: I57dcc03c9fed3fbd407640c81db50559bef4a0dd --- blazar_tempest_plugin/config.py | 4 ---- .../services/reservation/reservation_client.py | 2 +- .../tests/scenario/resource_reservation_scenario.py | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/blazar_tempest_plugin/config.py b/blazar_tempest_plugin/config.py index 671560f..6509bcf 100644 --- a/blazar_tempest_plugin/config.py +++ b/blazar_tempest_plugin/config.py @@ -20,10 +20,6 @@ service_available_group = cfg.OptGroup(name="service_available", title="Available OpenStack Services") service_option = [ - cfg.BoolOpt("climate", - default=True, - help="Whether or not climate is expected to be available. " - "This config remains for backward compatibility."), cfg.BoolOpt("blazar", default=True, help="Whether or not blazar is expected to be available"), diff --git a/blazar_tempest_plugin/services/reservation/reservation_client.py b/blazar_tempest_plugin/services/reservation/reservation_client.py index 881ee6a..32c355c 100644 --- a/blazar_tempest_plugin/services/reservation/reservation_client.py +++ b/blazar_tempest_plugin/services/reservation/reservation_client.py @@ -19,7 +19,7 @@ from tempest.lib.common import rest_client class ResourceReservationV1Client(rest_client.RestClient): """Client class for accessing the resource reservation API.""" - CLIMATECLIENT_VERSION = '1' + BLAZARCLIENT_VERSION = '1' lease = '/leases' lease_path = '/leases/%s' diff --git a/blazar_tempest_plugin/tests/scenario/resource_reservation_scenario.py b/blazar_tempest_plugin/tests/scenario/resource_reservation_scenario.py index f9fc453..6850a5b 100644 --- a/blazar_tempest_plugin/tests/scenario/resource_reservation_scenario.py +++ b/blazar_tempest_plugin/tests/scenario/resource_reservation_scenario.py @@ -37,8 +37,7 @@ class ResourceReservationScenarioTest(manager.ScenarioTest): @classmethod def setup_clients(cls): super(ResourceReservationScenarioTest, cls).setup_clients() - if not (CONF.service_available.climate or - CONF.service_available.blazar): + if not CONF.service_available.blazar: raise cls.skipException("Resource reservation support is" "required")