Add api_version support
Presently, "OpenStack-API-Version" is not passed to the masakari service. Added support to pass "OpenStack-API-Version" in the request header. Change-Id: I7cc2a0c220c3e06aaedeada7a9d87ffee0d0cd8a
This commit is contained in:
parent
60dfc77868
commit
9d10469ddc
@ -21,9 +21,14 @@ LOG = logging.getLogger(__name__)
|
||||
DEFAULT_HA_API_VERSION = '1'
|
||||
API_VERSION_OPTION = 'os_ha_api_version'
|
||||
API_NAME = 'ha'
|
||||
API_VERSIONS = {
|
||||
'1': 'masakariclient.v1.client.Client',
|
||||
}
|
||||
|
||||
SUPPORTED_VERSIONS = [
|
||||
'1',
|
||||
'1.0'
|
||||
]
|
||||
|
||||
API_VERSIONS = {v: 'masakariclient.v1.client.Client'
|
||||
for v in SUPPORTED_VERSIONS}
|
||||
|
||||
|
||||
def make_client(instance):
|
||||
@ -37,7 +42,8 @@ def make_client(instance):
|
||||
LOG.debug('Instantiating masakari service client: %s', masakari_client)
|
||||
client = masakari_client(session=instance.session,
|
||||
interface=instance.interface,
|
||||
region_name=instance.region_name)
|
||||
region_name=instance.region_name,
|
||||
api_version=instance._api_version[API_NAME])
|
||||
return client.service
|
||||
|
||||
|
||||
|
@ -82,4 +82,5 @@ class TestV1Client(base.TestCase):
|
||||
mock_session.assert_called_once_with(auth=self.auth)
|
||||
mock_connection.assert_called_once_with(
|
||||
session=self.session, interface=fake_interface,
|
||||
region_name=fake_region_name)
|
||||
region_name=fake_region_name,
|
||||
ha_api_version=None)
|
||||
|
@ -35,5 +35,6 @@ class Client(object):
|
||||
con = connection.Connection(
|
||||
session=session,
|
||||
interface=kwargs.get('interface'),
|
||||
region_name=kwargs.get('region_name'))
|
||||
region_name=kwargs.get('region_name'),
|
||||
ha_api_version=kwargs.get('api_version'))
|
||||
self.service = con.instance_ha
|
||||
|
Loading…
x
Reference in New Issue
Block a user