1b55986c23
The resource2/proxy2 migration is finally done, so resource2/proxy2 will be resource/proxy in the next openstacksdk release. In the release after that, Profile is going away as are entrypoints plugins. This handles fixing most of that in a way that should work with both old and new. There are two additional places where it is problematic due to profile in the API. I've left a TODO note there and will send in a followup patch to handle those. Note: The masakari command doesn't work yet with this fix. Co-Authored-By: Kengo Takahara <takahara-kn@njk.co.jp> Change-Id: I0c7145c7726e8a5895451ec4e08ae3bf6f324c7a
96 lines
2.9 KiB
Python
96 lines
2.9 KiB
Python
# Copyright(c) 2016 Nippon Telegraph and Telephone Corporation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import logging
|
|
|
|
from openstack import connection
|
|
from openstack import version
|
|
from osc_lib import utils
|
|
|
|
from masakariclient.common import utils as masakariclient_utils
|
|
from masakariclient.sdk.ha import ha_service
|
|
from masakariclient.sdk.ha.v1 import _proxy
|
|
|
|
|
|
if masakariclient_utils.is_new_sdk(version.__version__):
|
|
from openstack import service_description
|
|
_new_sdk = True
|
|
else:
|
|
from openstack import profile
|
|
_new_sdk = False
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
DEFAULT_HA_API_VERSION = '1'
|
|
API_VERSION_OPTION = 'os_ha_api_version'
|
|
API_NAME = 'ha'
|
|
API_VERSIONS = {
|
|
'1': 'masakariclient.client.Client',
|
|
}
|
|
|
|
|
|
def make_client(instance):
|
|
"""Returns a ha proxy"""
|
|
if _new_sdk:
|
|
return _make_client_new(instance)
|
|
else:
|
|
return _make_client_old(instance)
|
|
|
|
|
|
def _make_client_new(instance):
|
|
desc = service_description.ServiceDescription(
|
|
service_type='ha', proxy_class=_proxy.Proxy)
|
|
|
|
conn = connection.Connection(
|
|
session=instance.session, extra_services=[desc])
|
|
conn.add_service(desc)
|
|
|
|
if version.__version__.find('0.11.0') == 0:
|
|
client = conn.ha
|
|
else:
|
|
client = conn.ha.proxy_class(
|
|
session=instance.session, service_type='ha')
|
|
|
|
return client
|
|
|
|
|
|
def _make_client_old(instance):
|
|
prof = profile.Profile()
|
|
prof._add_service(ha_service.HAService(version="v1"))
|
|
prof.set_region(API_NAME, instance.region_name)
|
|
prof.set_version(API_NAME, instance._api_version[API_NAME])
|
|
prof.set_interface(API_NAME, instance.interface)
|
|
conn = connection.Connection(authenticator=instance.session.auth,
|
|
verify=instance.session.verify,
|
|
cert=instance.session.cert,
|
|
profile=prof)
|
|
LOG.debug('Connection: %s', conn)
|
|
LOG.debug('masakari client initialized using OpenStack SDK: %s', conn.ha)
|
|
return conn.ha
|
|
|
|
|
|
def build_option_parser(parser):
|
|
"""Hook to add global options"""
|
|
parser.add_argument(
|
|
'--os-ha-api-version',
|
|
metavar='<ha-api-version>',
|
|
default=utils.env(
|
|
'OS_HA_API_VERSION',
|
|
default=DEFAULT_HA_API_VERSION),
|
|
help='ha API version, default=' +
|
|
DEFAULT_HA_API_VERSION +
|
|
' (Env: OS_HA_API_VERSION)')
|
|
return parser
|