summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v2_0/service.py
diff options
context:
space:
mode:
authorsunyajing <yajing.sun@easystack.cn>2016-06-23 12:55:54 +0800
committerSteve Martinelli <s.martinelli@gmail.com>2016-06-23 23:57:49 -0400
commit6df09fd377f872388d4f855b001a6578ae6fba46 (patch)
treedf8bba22d73bf72444a184433fb41c084e26bd0a /openstackclient/identity/v2_0/service.py
parent5b144334bf526c8d368e592019fbb80c072911dc (diff)
downloadpython-openstackclient-6df09fd377f872388d4f855b001a6578ae6fba46.tar.gz
Support multi-delete for commands in identity V2
Commands are "ec2 credentials delete", "service delete", "endpoint delete". Also update their unit tests and functional tests. Partial-Bug: #1592906 Change-Id: I1a0b7160b803a523646d09d030e6f112c81c4c24
Diffstat (limited to 'openstackclient/identity/v2_0/service.py')
-rw-r--r--openstackclient/identity/v2_0/service.py26
1 files changed, 21 insertions, 5 deletions
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index df332eb6..e318643c 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -91,21 +91,37 @@ class CreateService(command.ShowOne):
class DeleteService(command.Command):
- """Delete service"""
+ """Delete service(s)"""
def get_parser(self, prog_name):
parser = super(DeleteService, self).get_parser(prog_name)
parser.add_argument(
- 'service',
+ 'services',
metavar='<service>',
- help=_('Service to delete (type, name or ID)'),
+ nargs='+',
+ help=_('Service(s) to delete (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)
- identity_client.services.delete(service.id)
+
+ result = 0
+ for service in parsed_args.services:
+ try:
+ service = common.find_service(identity_client, service)
+ identity_client.services.delete(service.id)
+ except Exception as e:
+ result += 1
+ LOG.error(_("Failed to delete service with "
+ "name or ID '%(service)s': %(e)s")
+ % {'service': service, 'e': e})
+
+ if result > 0:
+ total = len(parsed_args.services)
+ msg = (_("%(result)s of %(total)s services failed "
+ "to delete.") % {'result': result, 'total': total})
+ raise exceptions.CommandError(msg)
class ListService(command.Lister):