summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v3/region.py
diff options
context:
space:
mode:
authorHuanxuan Ao <huanxuan.ao@easystack.cn>2016-07-12 12:44:55 +0800
committerHuanxuan Ao <huanxuan.ao@easystack.cn>2016-07-19 09:49:36 +0800
commit60639d76a742852e18f9e2889c480be95596c268 (patch)
treecad7069ec7b4175f9ceea7e14113b9477698f1e8 /openstackclient/identity/v3/region.py
parent55c1c575d63f4e9e6fc3f4dbb6c572e841b513d9 (diff)
downloadpython-openstackclient-60639d76a742852e18f9e2889c480be95596c268.tar.gz
Support bulk deletion for delete commands in identityv3
Support bulk deletion for delete commands in the list below identity/v3/consumer identity/v3/credential identity/v3/domain identity/v3/ec2creds identity/v3/endpoint identity/v3/federation_protocol identity/v3/identity_provider identity/v3/mapping identity/v3/policy identity/v3/region identity/v3/service_provider identity/v3/service The unit test in identityv3 need to be refactored, so I add some functional tests instead. I will add all unit tests at one time after the refactor completed. Change-Id: I82367570f59817b47c87b6c7bfeae95ccfe5c50e Closes-Bug: #1592906
Diffstat (limited to 'openstackclient/identity/v3/region.py')
-rw-r--r--openstackclient/identity/v3/region.py28
1 files changed, 24 insertions, 4 deletions
diff --git a/openstackclient/identity/v3/region.py b/openstackclient/identity/v3/region.py
index d714cd05..b7c51f93 100644
--- a/openstackclient/identity/v3/region.py
+++ b/openstackclient/identity/v3/region.py
@@ -13,13 +13,19 @@
"""Identity v3 Region action implementations"""
+import logging
+
from osc_lib.command import command
+from osc_lib import exceptions
from osc_lib import utils
import six
from openstackclient.i18n import _
+LOG = logging.getLogger(__name__)
+
+
class CreateRegion(command.ShowOne):
"""Create new region"""
@@ -60,21 +66,35 @@ class CreateRegion(command.ShowOne):
class DeleteRegion(command.Command):
- """Delete region"""
+ """Delete region(s)"""
def get_parser(self, prog_name):
parser = super(DeleteRegion, self).get_parser(prog_name)
parser.add_argument(
'region',
metavar='<region-id>',
- help=_('Region ID to delete'),
+ nargs='+',
+ help=_('Region ID(s) to delete'),
)
return parser
def take_action(self, parsed_args):
identity_client = self.app.client_manager.identity
-
- identity_client.regions.delete(parsed_args.region)
+ result = 0
+ for i in parsed_args.region:
+ try:
+ identity_client.regions.delete(i)
+ except Exception as e:
+ result += 1
+ LOG.error(_("Failed to delete region with "
+ "ID '%(region)s': %(e)s")
+ % {'region': i, 'e': e})
+
+ if result > 0:
+ total = len(parsed_args.region)
+ msg = (_("%(result)s of %(total)s regions failed "
+ "to delete.") % {'result': result, 'total': total})
+ raise exceptions.CommandError(msg)
class ListRegion(command.Lister):