From 7008073e1d00c1af0dc5913cdf5d94372f10088d Mon Sep 17 00:00:00 2001
From: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
Date: Wed, 29 Nov 2017 17:44:50 +0530
Subject: delete: support [unlink-storage <yes|no>] option

$ gluster-block help
gluster-block (0.3)
usage:
  gluster-block <command> <volname[/blockname]> [<args>] [--json*]

commands:
[...]

  delete  <volname/blockname> [unlink-storage <yes|no>] [force]
        delete block device.
[...]
supported JSON formats:
  --json|--json-plain|--json-spaced|--json-pretty

Change-Id: I64bc99a8519be6f90a7e8bc5558b0d7518661995
Fixes: #19
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
---
 cli/gluster-block.c | 57 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 17 deletions(-)

(limited to 'cli')

diff --git a/cli/gluster-block.c b/cli/gluster-block.c
index dcf22a1..bfdaa18 100644
--- a/cli/gluster-block.c
+++ b/cli/gluster-block.c
@@ -19,11 +19,11 @@
                                 "[prealloc <full|no>] [storage <filename>] "   \
                                 "<HOST1[,HOST2,...]> <size> [--json*]"
 # define  GB_DELETE_HELP_STR  "gluster-block delete <volname/blockname> "      \
-                              "[force] [--json*]"
+                                "[unlink-storage <yes|no>] [force] [--json*]"
 # define  GB_MODIFY_HELP_STR  "gluster-block modify <volname/blockname> "      \
-                               "<auth enable|disable> [--json*]"
+                                "<auth enable|disable> [--json*]"
 # define  GB_REPLACE_HELP_STR "gluster-block replace <volname/blockname> "     \
-                               "<old-node> <new-node> [force] [--json*]"
+                                "<old-node> <new-node> [force] [--json*]"
 # define  GB_INFO_HELP_STR    "gluster-block info <volname/blockname> [--json*]"
 # define  GB_LIST_HELP_STR    "gluster-block list <volname> [--json*]"
 
@@ -212,7 +212,7 @@ glusterBlockHelp(void)
       "  info    <volname/blockname>\n"
       "        details about block device.\n"
       "\n"
-      "  delete  <volname/blockname> [force]\n"
+      "  delete  <volname/blockname> [unlink-storage <yes|no>] [force]\n"
       "        delete block device.\n"
       "\n"
       "  modify  <volname/blockname> <auth enable|disable>\n"
@@ -505,36 +505,59 @@ glusterBlockList(int argcount, char **options, int json)
 static int
 glusterBlockDelete(int argcount, char **options, int json)
 {
-  blockDeleteCli cobj = {0};
+  blockDeleteCli dobj = {0};
+  size_t optind = 2;
   int ret = -1;
 
 
-  if (argcount < 3 || argcount > 4) {
+  if (argcount < 3 || argcount > 6) {
     MSG("Inadequate arguments for delete:\n%s\n", GB_DELETE_HELP_STR);
       return -1;
   }
 
-  if (argcount == 4) {
-    if (strcmp(options[3], "force")) {
-      MSG("unknown option '%s' for delete:\n%s\n", options[3], GB_DELETE_HELP_STR);
-      return -1;
+  dobj.json_resp = json;
+
+  /* default: delete storage */
+  dobj.unlink = 1;
+
+  if (glusterBlockParseVolumeBlock (options[optind++], dobj.volume,
+                                    dobj.block_name, sizeof(dobj.volume),
+                                    sizeof(dobj.block_name), GB_DELETE_HELP_STR,
+                                    "delete")) {
+    goto out;
+  }
+
+  if ((argcount - optind) && !strcmp(options[optind], "unlink-storage")) {
+    optind++;
+    ret = convertStringToTrillianParse(options[optind++]);
+    if(ret >= 0) {
+      dobj.unlink = ret;
     } else {
-      cobj.force = true;
+      MSG("%s\n", "'unlink-storage' option is incorrect");
+      MSG("%s\n", GB_DELETE_HELP_STR);
+      LOG("cli", GB_LOG_ERROR, "Delete failed while parsing argument "
+                               "to unlink-storage  for <%s/%s>",
+                               dobj.volume, dobj.block_name);
+      goto out;
     }
   }
 
-  cobj.json_resp = json;
+  if ((argcount - optind) && !strcmp(options[optind], "force")) {
+    optind++;
+    dobj.force = true;
+  }
 
-  if (glusterBlockParseVolumeBlock (options[2], cobj.volume, cobj.block_name,
-                                    sizeof(cobj.volume), sizeof(cobj.block_name),
-                                    GB_DELETE_HELP_STR, "delete")) {
+  if (argcount - optind) {
+    MSG("Unknown option: '%s'\n%s\n", options[optind], GB_DELETE_HELP_STR);
+    LOG("cli", GB_LOG_ERROR, "Delete failed parsing argument unknow option '%s'"
+        " for <%s/%s>", options[optind], dobj.volume, dobj.block_name);
     goto out;
   }
 
-  ret = glusterBlockCliRPC_1(&cobj, DELETE_CLI);
+  ret = glusterBlockCliRPC_1(&dobj, DELETE_CLI);
   if (ret) {
     LOG("cli", GB_LOG_ERROR, "failed deleting block %s on volume %s",
-        cobj.block_name, cobj.volume);
+        dobj.block_name, dobj.volume);
   }
 
  out:
-- 
cgit