From 1ddc30100f863c223f3ebef0ca0e56e9c8a9cfbb Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Sat, 9 Mar 2013 00:25:06 -0600 Subject: [PATCH] Add force-delete option for volumes Again, looking thorouhgly through cinders commands, i noticed an force-delete command, which was for volumes only. Decided it would work best as an optional argument for the regular delete case Change-Id: I9de6040ea0ad71c2a9c8edc7be18779d39e7ede0 --- openstackclient/volume/v1/volume.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py index f2d08510..6b0d7cd6 100644 --- a/openstackclient/volume/v1/volume.py +++ b/openstackclient/volume/v1/volume.py @@ -125,7 +125,14 @@ class DeleteVolume(command.Command): parser.add_argument( 'volume', metavar='', - help='ID of volume to delete', + help='Name or ID of volume to delete', + ) + parser.add_argument( + '--force', + dest='force', + action='store_true', + default=False, + help='Attempt forced removal of a volume, regardless of state', ) return parser @@ -134,7 +141,10 @@ class DeleteVolume(command.Command): volume_client = self.app.client_manager.volume volume = utils.find_resource( volume_client.volumes, parsed_args.volume) - volume_client.volumes.delete(volume.id) + if parsed_args.force: + volume_client.volumes.force_delete(volume.id) + else: + volume_client.volumes.delete(volume.id) return