 258c1102cc
			
		
	
	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
		
			
				
	
	
		
			211 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			211 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| #   Copyright 2012-2013 OpenStack Foundation
 | |
| #
 | |
| #   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 action implementations"""
 | |
| 
 | |
| import six
 | |
| 
 | |
| from openstackclient.common import command
 | |
| from openstackclient.common import utils
 | |
| from openstackclient.identity import common
 | |
| 
 | |
| 
 | |
| class CreateService(command.ShowOne):
 | |
|     """Create new service"""
 | |
| 
 | |
|     def get_parser(self, prog_name):
 | |
|         parser = super(CreateService, self).get_parser(prog_name)
 | |
|         parser.add_argument(
 | |
|             'type',
 | |
|             metavar='<type>',
 | |
|             help='New service type (compute, image, identity, volume, etc)',
 | |
|         )
 | |
|         parser.add_argument(
 | |
|             '--name',
 | |
|             metavar='<name>',
 | |
|             help='New service name',
 | |
|         )
 | |
|         parser.add_argument(
 | |
|             '--description',
 | |
|             metavar='<description>',
 | |
|             help='New service description',
 | |
|         )
 | |
|         enable_group = parser.add_mutually_exclusive_group()
 | |
|         enable_group.add_argument(
 | |
|             '--enable',
 | |
|             action='store_true',
 | |
|             help='Enable service (default)',
 | |
|         )
 | |
|         enable_group.add_argument(
 | |
|             '--disable',
 | |
|             action='store_true',
 | |
|             help='Disable service',
 | |
|         )
 | |
|         return parser
 | |
| 
 | |
|     def take_action(self, parsed_args):
 | |
|         identity_client = self.app.client_manager.identity
 | |
| 
 | |
|         enabled = True
 | |
|         if parsed_args.disable:
 | |
|             enabled = False
 | |
| 
 | |
|         service = identity_client.services.create(
 | |
|             name=parsed_args.name,
 | |
|             type=parsed_args.type,
 | |
|             description=parsed_args.description,
 | |
|             enabled=enabled,
 | |
|         )
 | |
| 
 | |
|         service._info.pop('links')
 | |
|         return zip(*sorted(six.iteritems(service._info)))
 | |
| 
 | |
| 
 | |
| class DeleteService(command.Command):
 | |
|     """Delete service"""
 | |
| 
 | |
|     def get_parser(self, prog_name):
 | |
|         parser = super(DeleteService, self).get_parser(prog_name)
 | |
|         parser.add_argument(
 | |
|             'service',
 | |
|             metavar='<service>',
 | |
|             help='Service to delete (type or ID)',
 | |
|         )
 | |
|         return parser
 | |
| 
 | |
|     def take_action(self, parsed_args):
 | |
|         identity_client = self.app.client_manager.identity
 | |
| 
 | |
|         service = common.find_service(identity_client, parsed_args.service)
 | |
| 
 | |
|         identity_client.services.delete(service.id)
 | |
|         return
 | |
| 
 | |
| 
 | |
| class ListService(command.Lister):
 | |
|     """List services"""
 | |
| 
 | |
|     def get_parser(self, prog_name):
 | |
|         parser = super(ListService, self).get_parser(prog_name)
 | |
|         parser.add_argument(
 | |
|             '--long',
 | |
|             action='store_true',
 | |
|             default=False,
 | |
|             help='List additional fields in output',
 | |
|         )
 | |
|         return parser
 | |
| 
 | |
|     def take_action(self, parsed_args):
 | |
| 
 | |
|         if parsed_args.long:
 | |
|             columns = ('ID', 'Name', 'Type', 'Description', 'Enabled')
 | |
|         else:
 | |
|             columns = ('ID', 'Name', 'Type')
 | |
|         data = self.app.client_manager.identity.services.list()
 | |
|         return (
 | |
|             columns,
 | |
|             (utils.get_item_properties(s, columns) for s in data),
 | |
|         )
 | |
| 
 | |
| 
 | |
| class SetService(command.Command):
 | |
|     """Set service properties"""
 | |
| 
 | |
|     def get_parser(self, prog_name):
 | |
|         parser = super(SetService, self).get_parser(prog_name)
 | |
|         parser.add_argument(
 | |
|             'service',
 | |
|             metavar='<service>',
 | |
|             help='Service to update (type, name or ID)',
 | |
|         )
 | |
|         parser.add_argument(
 | |
|             '--type',
 | |
|             metavar='<type>',
 | |
|             help='New service type (compute, image, identity, volume, etc)',
 | |
|         )
 | |
|         parser.add_argument(
 | |
|             '--name',
 | |
|             metavar='<service-name>',
 | |
|             help='New service name',
 | |
|         )
 | |
|         parser.add_argument(
 | |
|             '--description',
 | |
|             metavar='<description>',
 | |
|             help='New service description',
 | |
|         )
 | |
|         enable_group = parser.add_mutually_exclusive_group()
 | |
|         enable_group.add_argument(
 | |
|             '--enable',
 | |
|             action='store_true',
 | |
|             help='Enable service',
 | |
|         )
 | |
|         enable_group.add_argument(
 | |
|             '--disable',
 | |
|             action='store_true',
 | |
|             help='Disable service',
 | |
|         )
 | |
|         return parser
 | |
| 
 | |
|     def take_action(self, parsed_args):
 | |
|         identity_client = self.app.client_manager.identity
 | |
| 
 | |
|         if (not parsed_args.name
 | |
|                 and not parsed_args.type
 | |
|                 and not parsed_args.description
 | |
|                 and not parsed_args.enable
 | |
|                 and not parsed_args.disable):
 | |
|             return
 | |
| 
 | |
|         service = common.find_service(identity_client, parsed_args.service)
 | |
| 
 | |
|         kwargs = {}
 | |
|         if parsed_args.type:
 | |
|             kwargs['type'] = parsed_args.type
 | |
|         if parsed_args.name:
 | |
|             kwargs['name'] = parsed_args.name
 | |
|         if parsed_args.description:
 | |
|             kwargs['description'] = parsed_args.description
 | |
|         if parsed_args.enable:
 | |
|             kwargs['enabled'] = True
 | |
|         if parsed_args.disable:
 | |
|             kwargs['enabled'] = False
 | |
| 
 | |
|         identity_client.services.update(
 | |
|             service.id,
 | |
|             **kwargs
 | |
|         )
 | |
|         return
 | |
| 
 | |
| 
 | |
| class ShowService(command.ShowOne):
 | |
|     """Display service details"""
 | |
| 
 | |
|     def get_parser(self, prog_name):
 | |
|         parser = super(ShowService, self).get_parser(prog_name)
 | |
|         parser.add_argument(
 | |
|             'service',
 | |
|             metavar='<service>',
 | |
|             help='Service to display (type, name or ID)',
 | |
|         )
 | |
|         return parser
 | |
| 
 | |
|     def take_action(self, parsed_args):
 | |
|         identity_client = self.app.client_manager.identity
 | |
| 
 | |
|         service = common.find_service(identity_client, parsed_args.service)
 | |
| 
 | |
|         service._info.pop('links')
 | |
|         return zip(*sorted(six.iteritems(service._info)))
 |