6ae0d2e8a5
Currently OpenStackClient uses keystoneclient for authentication. This change will update OpenStackClient to use keystoneauth for authentication. All dependant test have been updated. Updating how auth_ref is set in the tests to use KSA fixtures had some racy side-effects. The user_role_list tests failed when they picked up an auth_ref that was a fixture. This exposed a weakness in ListUserRole that needed to be fixed at the same time re handling of unscoped tokens and options. Change-Id: I4ddb2dbbb3bf2ab37494468eaf65cef9213a6e00 Closes-Bug: 1533369
100 lines
3.2 KiB
Python
100 lines
3.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.
|
|
#
|
|
|
|
"""Identity v2 Service Catalog action implementations"""
|
|
|
|
import six
|
|
|
|
from openstackclient.common import command
|
|
from openstackclient.common import exceptions
|
|
from openstackclient.common import utils
|
|
from openstackclient.i18n import _
|
|
|
|
|
|
def _format_endpoints(eps=None):
|
|
if not eps:
|
|
return ""
|
|
ret = ''
|
|
for index, ep in enumerate(eps):
|
|
region = eps[index].get('region')
|
|
if region is None:
|
|
region = '<none>'
|
|
ret += region + '\n'
|
|
for endpoint_type in ['publicURL', 'internalURL', 'adminURL']:
|
|
url = eps[index].get(endpoint_type)
|
|
if url:
|
|
ret += " %s: %s\n" % (endpoint_type, url)
|
|
return ret
|
|
|
|
|
|
class ListCatalog(command.Lister):
|
|
"""List services in the service catalog"""
|
|
|
|
def take_action(self, parsed_args):
|
|
|
|
# Trigger auth if it has not happened yet
|
|
auth_ref = self.app.client_manager.auth_ref
|
|
if not auth_ref:
|
|
raise exceptions.AuthorizationFailure(
|
|
"Only an authorized user may issue a new token."
|
|
)
|
|
|
|
data = auth_ref.service_catalog.catalog
|
|
columns = ('Name', 'Type', 'Endpoints')
|
|
return (columns,
|
|
(utils.get_dict_properties(
|
|
s, columns,
|
|
formatters={
|
|
'Endpoints': _format_endpoints,
|
|
},
|
|
) for s in data))
|
|
|
|
|
|
class ShowCatalog(command.ShowOne):
|
|
"""Display service catalog details"""
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ShowCatalog, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'service',
|
|
metavar='<service>',
|
|
help=_('Service to display (type or name)'),
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
|
|
# Trigger auth if it has not happened yet
|
|
auth_ref = self.app.client_manager.auth_ref
|
|
if not auth_ref:
|
|
raise exceptions.AuthorizationFailure(
|
|
"Only an authorized user may issue a new token."
|
|
)
|
|
|
|
data = None
|
|
for service in auth_ref.service_catalog.catalog:
|
|
if (service.get('name') == parsed_args.service or
|
|
service.get('type') == parsed_args.service):
|
|
data = service
|
|
data['endpoints'] = _format_endpoints(data['endpoints'])
|
|
if 'endpoints_links' in data:
|
|
data.pop('endpoints_links')
|
|
break
|
|
|
|
if not data:
|
|
self.app.log.error(_('service %s not found\n') %
|
|
parsed_args.service)
|
|
return ((), ())
|
|
|
|
return zip(*sorted(six.iteritems(data)))
|