f598fd23e1
There were two code paths that did the same thing, and while the code paths did the same thing, one of them supported region_name and the other one did not. Moving all this functionality into a single function to prevent this from happening in the future. - Re-factored make_client and create_connection. - Remove now unused sdk.py. - Renamed test_sdk to test_plugin. Change-Id: Ibb477290c90e9af51be3537d11cf5142041db37f
72 lines
2.2 KiB
Python
72 lines
2.2 KiB
Python
# 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.
|
|
|
|
"""OpenStackClient plugin for Clustering service."""
|
|
|
|
import logging
|
|
|
|
from openstack import connection
|
|
from openstack import profile
|
|
from osc_lib import utils
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
DEFAULT_CLUSTERING_API_VERSION = '1'
|
|
API_VERSION_OPTION = 'os_clustering_api_version'
|
|
API_NAME = 'clustering'
|
|
CURRENT_API_VERSION = '1.8'
|
|
|
|
|
|
def create_connection(prof=None, **kwargs):
|
|
interface = kwargs.pop('interface', None)
|
|
region_name = kwargs.pop('region_name', None)
|
|
user_agent = kwargs.pop('user_agent', None)
|
|
|
|
if not prof:
|
|
prof = profile.Profile()
|
|
prof.set_api_version(API_NAME, CURRENT_API_VERSION)
|
|
|
|
if interface:
|
|
prof.set_interface(API_NAME, interface)
|
|
if region_name:
|
|
prof.set_region(API_NAME, region_name)
|
|
|
|
return connection.Connection(profile=prof, user_agent=user_agent, **kwargs)
|
|
|
|
|
|
def make_client(instance):
|
|
"""Returns a clustering proxy"""
|
|
conn = create_connection(
|
|
region_name=instance.region_name,
|
|
interface=instance.interface,
|
|
authenticator=instance.session.auth
|
|
)
|
|
|
|
LOG.debug('Connection: %s', conn)
|
|
LOG.debug('Clustering client initialized using OpenStackSDK: %s',
|
|
conn.cluster)
|
|
return conn.cluster
|
|
|
|
|
|
def build_option_parser(parser):
|
|
"""Hook to add global options"""
|
|
parser.add_argument(
|
|
'--os-clustering-api-version',
|
|
metavar='<clustering-api-version>',
|
|
default=utils.env(
|
|
'OS_CLUSTERING_API_VERSION',
|
|
default=DEFAULT_CLUSTERING_API_VERSION),
|
|
help='Clustering API version, default=' +
|
|
DEFAULT_CLUSTERING_API_VERSION +
|
|
' (Env: OS_CLUSTERING_API_VERSION)')
|
|
return parser
|