Merge "Remove climate namespace"
This commit is contained in:
commit
d023f4e853
@ -20,10 +20,6 @@ service_available_group = cfg.OptGroup(name="service_available",
|
|||||||
title="Available OpenStack Services")
|
title="Available OpenStack Services")
|
||||||
|
|
||||||
service_option = [
|
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",
|
cfg.BoolOpt("blazar",
|
||||||
default=True,
|
default=True,
|
||||||
help="Whether or not blazar is expected to be available"),
|
help="Whether or not blazar is expected to be available"),
|
||||||
|
@ -19,7 +19,7 @@ from tempest.lib.common import rest_client
|
|||||||
|
|
||||||
class ResourceReservationV1Client(rest_client.RestClient):
|
class ResourceReservationV1Client(rest_client.RestClient):
|
||||||
"""Client class for accessing the resource reservation API."""
|
"""Client class for accessing the resource reservation API."""
|
||||||
CLIMATECLIENT_VERSION = '1'
|
BLAZARCLIENT_VERSION = '1'
|
||||||
|
|
||||||
lease = '/leases'
|
lease = '/leases'
|
||||||
lease_path = '/leases/%s'
|
lease_path = '/leases/%s'
|
||||||
|
@ -37,8 +37,7 @@ class ResourceReservationScenarioTest(manager.ScenarioTest):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def setup_clients(cls):
|
def setup_clients(cls):
|
||||||
super(ResourceReservationScenarioTest, cls).setup_clients()
|
super(ResourceReservationScenarioTest, cls).setup_clients()
|
||||||
if not (CONF.service_available.climate or
|
if not CONF.service_available.blazar:
|
||||||
CONF.service_available.blazar):
|
|
||||||
raise cls.skipException("Resource reservation support is"
|
raise cls.skipException("Resource reservation support is"
|
||||||
"required")
|
"required")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user