7c603e4a67
Currently OS_ENDPOINT_TYPE and --os-interface are being ignored for network commands. This means the public URL is always used. Make sure that these are picked up correctly so we hit the correct endpoint (internal/admin/etc.) for commands such as: $ openstack --os-interface internal network list Change-Id: Iac05204e3056e386d84d3644b5da1a2bb322bb0a Closes-bug: 1592368
60 lines
1.9 KiB
Python
60 lines
1.9 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
|
|
from openstack import profile
|
|
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"""
|
|
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)
|
|
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
|