80da4d6cf8
SDK is removing Profile, but currently has compat code to support this invocation in OSC. While the intent is to protect people from upgrade breakage, it's python, and packaging things have a tendency to get strange. By putting in a little belt and suspenders if block here, we can hopefully protect folks who upgrade sdk for some reason without upgrading python-openstackclient. Change-Id: Id678e97a2b99dbbfc772acc8c6ba283db551723d
74 lines
2.4 KiB
Python
74 lines
2.4 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.
|
|
#
|
|
|
|
import logging
|
|
|
|
from openstack import connection
|
|
try:
|
|
from openstack import profile
|
|
except ImportError:
|
|
profile = None
|
|
from osc_lib import utils
|
|
|
|
from openstackclient.i18n import _
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
DEFAULT_API_VERSION = '2.0'
|
|
API_VERSION_OPTION = 'os_network_api_version'
|
|
API_NAME = "network"
|
|
API_VERSIONS = {
|
|
"2.0": "openstack.connection.Connection",
|
|
"2": "openstack.connection.Connection",
|
|
}
|
|
|
|
|
|
def make_client(instance):
|
|
"""Returns a network proxy"""
|
|
if profile is None:
|
|
# New SDK
|
|
conn = connection.Connection(
|
|
cloud_config=instance._cli_options,
|
|
session=instance.session)
|
|
else:
|
|
prof = profile.Profile()
|
|
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('Network client initialized using OpenStack SDK: %s',
|
|
conn.network)
|
|
|
|
# NOTE(dtroyer): Horrible ugly hack since we don't actually save
|
|
# the connection anywhere yet, so stash it in the
|
|
# instance directly from here for other uses
|
|
instance.sdk_connection = conn
|
|
return conn.network
|
|
|
|
|
|
def build_option_parser(parser):
|
|
"""Hook to add global options"""
|
|
parser.add_argument(
|
|
'--os-network-api-version',
|
|
metavar='<network-api-version>',
|
|
default=utils.env('OS_NETWORK_API_VERSION'),
|
|
help=_("Network API version, default=%s "
|
|
"(Env: OS_NETWORK_API_VERSION)") % DEFAULT_API_VERSION
|
|
)
|
|
return parser
|