258c1102cc
Previously each command logs take_action parameters explicitly by using @utils.log_method decorator or log.debug(). Some commands have no logging. This commit calls a logger in the base class and drops all logging definition from individual commands. Closes-Bug: #1532294 Change-Id: I43cd0290a4353c68c075bade9571c940733da1be
92 lines
2.9 KiB
Python
92 lines
2.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.
|
|
#
|
|
|
|
"""Identity v3 Service Catalog action implementations"""
|
|
|
|
import six
|
|
|
|
from openstackclient.common import command
|
|
from openstackclient.common import utils
|
|
from openstackclient.i18n import _ # noqa
|
|
|
|
|
|
def _format_endpoints(eps=None):
|
|
if not eps:
|
|
return ""
|
|
ret = ''
|
|
for ep in eps:
|
|
region = ep.get('region_id') or ep.get('region', '<none>')
|
|
ret += region + '\n'
|
|
ret += " %s: %s\n" % (ep['interface'], ep['url'])
|
|
return ret
|
|
|
|
|
|
class ListCatalog(command.Lister):
|
|
"""List services in the service catalog"""
|
|
|
|
def take_action(self, parsed_args):
|
|
|
|
# This is ugly because if auth hasn't happened yet we need
|
|
# to trigger it here.
|
|
sc = self.app.client_manager.session.auth.get_auth_ref(
|
|
self.app.client_manager.session,
|
|
).service_catalog
|
|
|
|
data = sc.get_data()
|
|
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):
|
|
|
|
# This is ugly because if auth hasn't happened yet we need
|
|
# to trigger it here.
|
|
sc = self.app.client_manager.session.auth.get_auth_ref(
|
|
self.app.client_manager.session,
|
|
).service_catalog
|
|
|
|
data = None
|
|
for service in sc.get_data():
|
|
if (service.get('name') == parsed_args.service or
|
|
service.get('type') == parsed_args.service):
|
|
data = dict(service)
|
|
data['endpoints'] = _format_endpoints(data['endpoints'])
|
|
if 'links' in data:
|
|
data.pop('links')
|
|
break
|
|
|
|
if not data:
|
|
self.app.log.error('service %s not found\n' %
|
|
parsed_args.service)
|
|
return ([], [])
|
|
|
|
return zip(*sorted(six.iteritems(data)))
|