Clark Boylan 6a8302b532 Fix pep8 issues.
Fix several pep8 issues and pin the pep8 test to pep8 version 1.1.
This should prevent future changes from being unmergable by the pep8
gate after a pep8 upgrade.

Change-Id: I4678a9179579fb5c7afe795fb43a8a89a99ad717
2012-06-13 10:49:43 -07:00

227 lines
7.9 KiB
Python

# Copyright 2012 OpenStack LLC.
# All Rights Reserved.
#
# 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.
#
# vim: tabstop=4 shiftwidth=4 softtabstop=4
"""
Endpoint action implementations
"""
import logging
from cliff import lister
from cliff import show
from keystoneclient import exceptions as identity_exc
from openstackclient.common import command
from openstackclient.common import exceptions
from openstackclient.common import utils
class CreateEndpoint(command.OpenStackCommand, show.ShowOne):
"""Create endpoint command"""
api = 'identity'
log = logging.getLogger(__name__ + '.CreateEndpoint')
def get_parser(self, prog_name):
parser = super(CreateEndpoint, self).get_parser(prog_name)
parser.add_argument(
'service',
metavar='<endpoint-service>',
help='New endpoint service')
parser.add_argument(
'--region',
metavar='<region>',
help='New endpoint region')
parser.add_argument(
'--publicurl',
metavar='<public-url>',
help='New endpoint public URL')
parser.add_argument(
'--adminurl',
metavar='<admin-url>',
help='New endpoint admin URL')
parser.add_argument(
'--internalurl',
metavar='<internal-url>',
help='New endpoint internal URL')
return parser
def get_data(self, parsed_args):
self.log.debug('get_data(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
service = utils.find_resource(
identity_client.services, parsed_args.service)
endpoint = identity_client.endpoints.create(
parsed_args.region,
service.id,
parsed_args.publicurl,
parsed_args.adminurl,
parsed_args.internalurl,
)
info = {}
info.update(endpoint._info)
info['service_name'] = service.name
info['service_type'] = service.type
return zip(*sorted(info.iteritems()))
class DeleteEndpoint(command.OpenStackCommand):
"""Delete endpoint command"""
api = 'identity'
log = logging.getLogger(__name__ + '.DeleteEndpoint')
def get_parser(self, prog_name):
parser = super(DeleteEndpoint, self).get_parser(prog_name)
parser.add_argument(
'endpoint',
metavar='<endpoint-id>',
help='ID of endpoint to delete')
return parser
def run(self, parsed_args):
self.log.debug('run(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
identity_client.endpoints.delete(parsed_args.endpoint)
return
class ListEndpoint(command.OpenStackCommand, lister.Lister):
"""List endpoint command"""
api = 'identity'
log = logging.getLogger(__name__ + '.ListEndpoint')
def get_parser(self, prog_name):
parser = super(ListEndpoint, self).get_parser(prog_name)
parser.add_argument(
'--long',
action='store_true',
default=False,
help='Additional fields are listed in output')
return parser
def get_data(self, parsed_args):
self.log.debug('get_data(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
if parsed_args.long:
columns = ('ID', 'Region', 'Service Name', 'Service Type',
'PublicURL', 'AdminURL', 'InternalURL')
else:
columns = ('ID', 'Region', 'Service Name', 'Service Type')
data = identity_client.endpoints.list()
for ep in data:
service = utils.find_resource(
identity_client.services, ep.service_id)
ep.service_name = service.name
ep.service_type = service.type
return (columns,
(utils.get_item_properties(
s, columns,
formatters={},
) for s in data),
)
class ShowEndpoint(command.OpenStackCommand, show.ShowOne):
"""Show endpoint command"""
api = 'identity'
log = logging.getLogger(__name__ + '.ShowEndpoint')
def get_parser(self, prog_name):
parser = super(ShowEndpoint, self).get_parser(prog_name)
parser.add_argument(
'service',
metavar='<service>',
help='Name or ID of service endpoint to display')
parser.add_argument(
'--type',
metavar='<endpoint-type>',
default='publicURL',
help='Endpoint type: publicURL, internalURL, adminURL ' +
'(default publicURL)')
parser.add_argument(
'--attr',
metavar='<endpoint-attribute>',
help='Endpoint attribute to use for selection')
parser.add_argument(
'--value',
metavar='<endpoint-value>',
help='Value of endpoint attribute to use for selection')
parser.add_argument(
'--all',
action='store_true',
default=False,
help='Show all endpoints for this service')
return parser
def get_data(self, parsed_args):
self.log.debug('get_data(%s)' % parsed_args)
identity_client = self.app.client_manager.identity
if not parsed_args.all:
# Find endpoint filtered by a specific attribute or service type
kwargs = {
'service_type': parsed_args.service,
'endpoint_type': parsed_args.type,
}
if parsed_args.attr and parsed_args.value:
kwargs.update({
'attr': parsed_args.attr,
'filter_value': parsed_args.value,
})
elif parsed_args.attr or parsed_args.value:
msg = 'Both --attr and --value required'
raise exceptions.CommandError(msg)
url = identity_client.service_catalog.url_for(**kwargs)
info = {'%s.%s' % (parsed_args.service, parsed_args.type): url}
return zip(*sorted(info.iteritems()))
else:
# The Identity 2.0 API doesn't support retrieving a single
# endpoint so we have to do this ourselves
try:
service = utils.find_resource(
identity_client.services, parsed_args.service)
except exceptions.CommandError:
try:
# search for service type
service = identity_client.services.find(
type=parsed_args.service)
# FIXME(dtroyer): This exception should eventually come from
# common client exceptions
except identity_exc.NotFound:
msg = "No service with a type, name or ID of '%s' exists" \
% parsed_args.service
raise exceptions.CommandError(msg)
else:
raise
data = identity_client.endpoints.list()
for ep in data:
if ep.service_id == service.id:
info = {}
info.update(ep._info)
service = utils.find_resource(
identity_client.services, ep.service_id)
info['service_name'] = service.name
info['service_type'] = service.type
return zip(*sorted(info.iteritems()))