snapshot/cli: Fix snapshot status xml output

snap status --xml errors out if a brick is down and
doesn't have pid. It is handled in the cli of the snap
status where "N/A" is displayed in such a scenario.
Handled the same in xml

snap status <snapname> --xml fails as the writer is
not initialised for the same. Using GF_SNAP_STATUS_TYPE_ITER
instead of GF_SNAP_STATUS_TYPE_SNAP for all snap's
status to differentiate between the two scenarios.

Added testcase volume-snapshot-xml.t to check
all snapshot commands xml outputs

Change-Id: I99563e8f3e84f1aaeabd865326bb825c44f5c745
BUG: 1325831
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/14018
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>

2 files changed, 51 insertions, 36 deletions

diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 0bf03bceaa2..441f4247c45 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -9908,7 +9908,7 @@ cli_populate_req_dict_for_status (dict_t *snap_dict, dict_t *dict, int index) {
         GF_ASSERT (dict);
 
         ret = dict_set_uint32 (snap_dict, "sub-cmd",
-                               GF_SNAP_STATUS_TYPE_SNAP);
+                               GF_SNAP_STATUS_TYPE_ITER);
         if (ret) {
                 gf_log ("cli", GF_LOG_ERROR, "Could not save command "
                         "type in snap dict");
@@ -10000,7 +10000,8 @@ cli_snapshot_status (dict_t *dict, gf_cli_rsp *rsp,
                 goto out;
         }
 
-        if (status_cmd != GF_SNAP_STATUS_TYPE_SNAP) {
+        if ((status_cmd != GF_SNAP_STATUS_TYPE_SNAP) &&
+            (status_cmd != GF_SNAP_STATUS_TYPE_ITER)) {
                 dict_copy (dict, local->dict);
                 goto out;
         }
@@ -10484,7 +10485,8 @@ gf_cli_snapshot_for_status (call_frame_t *frame, xlator_t *this,
          * is already handled. Therefore we can return from here.
          * If want to get status of all snaps in the system or volume then
          * we should get them one by one.*/
-        if (cmd == GF_SNAP_STATUS_TYPE_SNAP) {
+        if ((cmd == GF_SNAP_STATUS_TYPE_SNAP) ||
+            (cmd == GF_SNAP_STATUS_TYPE_ITER)) {
                 ret = 0;
                 goto out;
         }
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c
index 35b739c0f62..f6158eab794 100644
--- a/cli/src/cli-xml-output.c
+++ b/cli/src/cli-xml-output.c
@@ -5146,8 +5146,16 @@ cli_xml_snapshot_volume_status (xmlTextWriterPtr writer, xmlDocPtr doc,
 
                 ret = dict_get_str (dict, key, &buffer);
                 if (ret) {
-                        gf_log ("cli", GF_LOG_INFO, "Unable to get Brick Path");
-                        goto out;
+                        gf_log ("cli", GF_LOG_ERROR,
+                                "Unable to get Brick Path");
+                        /*
+                         * If path itself is not present, then end *
+                         * this brick's status and continue to the *
+                         * brick                                   *
+                         */
+                        ret = xmlTextWriterEndElement (writer);
+                        XML_RET_CHECK_AND_GOTO (ret, out);
+                        continue;
                 }
 
                 ret = xmlTextWriterWriteFormatElement (writer,
@@ -5159,14 +5167,14 @@ cli_xml_snapshot_volume_status (xmlTextWriterPtr writer, xmlDocPtr doc,
 
                 ret = dict_get_str (dict, key, &buffer);
                 if (ret) {
-                        gf_log ("cli", GF_LOG_INFO,
+                        gf_log ("cli", GF_LOG_ERROR,
                                 "Unable to get Volume Group");
-                        goto out;
-                }
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                              (xmlChar *) "volumeGroup", "N/A");
+                } else
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                       (xmlChar *) "volumeGroup", "%s", buffer);
 
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                        (xmlChar *) "volumeGroup",
-                                        "%s", buffer);
                 XML_RET_CHECK_AND_GOTO (ret, out);
 
                 snprintf (key, sizeof (key), "%s.brick%d.status", keyprefix, i);
@@ -5175,22 +5183,25 @@ cli_xml_snapshot_volume_status (xmlTextWriterPtr writer, xmlDocPtr doc,
                 if (ret) {
                         gf_log ("cli", GF_LOG_INFO,
                                 "Unable to get Brick Running");
-                        strcpy (buffer, "N/A");
-                }
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                    (xmlChar *) "BrickRunning", "%s", buffer);
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                            (xmlChar *) "brick_running", "N/A");
+                } else
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                     (xmlChar *) "brick_running", "%s", buffer);
+
                 XML_RET_CHECK_AND_GOTO (ret, out);
 
                 snprintf (key, sizeof (key), "%s.brick%d.pid", keyprefix, i);
 
                 ret = dict_get_int32 (dict, key, &pid);
                 if (ret) {
-                        gf_log ("cli", GF_LOG_ERROR, "Unable to get pid");
-                        goto out;
-                }
+                        gf_log ("cli", GF_LOG_INFO, "Unable to get pid");
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                                      (xmlChar *) "pid", "N/A");
+                } else
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                                  (xmlChar *) "pid", "%d", pid);
 
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                        (xmlChar *) "pid", "%d", pid);
                 XML_RET_CHECK_AND_GOTO (ret, out);
 
                 snprintf (key, sizeof (key), "%s.brick%d.data", keyprefix, i);
@@ -5199,28 +5210,29 @@ cli_xml_snapshot_volume_status (xmlTextWriterPtr writer, xmlDocPtr doc,
                 if (ret) {
                         gf_log ("cli", GF_LOG_ERROR,
                                         "Unable to get Data Percent");
-                        goto out;
-                }
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                          (xmlChar *) "data_percentage", "N/A");
+                } else
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                   (xmlChar *) "data_percentage", "%s", buffer);
 
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *) "lvUsage",
-                                                       "%s", buffer);
                 XML_RET_CHECK_AND_GOTO (ret, out);
 
                 snprintf (key, sizeof (key), "%s.brick%d.lvsize",
                           keyprefix, i);
                 ret = dict_get_str (dict, key, &buffer);
                 if (ret) {
-                        gf_log ("cli", GF_LOG_INFO, "Unable to get LV Size");
-                        goto out;
-                }
+                        gf_log ("cli", GF_LOG_ERROR, "Unable to get LV Size");
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                                 (xmlChar *) "lvSize", "N/A");
+                } else {
+                        /* Truncate any newline character */
+                        buffer = strtok (buffer, "\n");
 
-                /* Truncate any newline character */
-                buffer = strtok (buffer, "\n");
+                        ret = xmlTextWriterWriteFormatElement (writer,
+                                          (xmlChar *) "lvSize", "%s", buffer);
+                }
 
-                ret = xmlTextWriterWriteFormatElement (writer,
-                                                       (xmlChar *) "lvSize",
-                                                       "%s", buffer);
                 XML_RET_CHECK_AND_GOTO (ret, out);
 
                 /* </brick> */
@@ -5358,7 +5370,8 @@ cli_xml_snapshot_status (xmlTextWriterPtr writer, xmlDocPtr doc, dict_t *dict)
                 goto out;
         }
 
-        if (GF_SNAP_STATUS_TYPE_SNAP == status_cmd) {
+        if ((GF_SNAP_STATUS_TYPE_SNAP == status_cmd) ||
+            (GF_SNAP_STATUS_TYPE_ITER == status_cmd)) {
                 snapcount = 1;
         } else {
                 ret = dict_get_int32 (dict, "status.snapcount", &snapcount);
@@ -6123,7 +6136,7 @@ cli_xml_snapshot_begin_composite_op (cli_local_t *local)
                 goto out;
         }
 
-        if (cmd == GF_SNAP_STATUS_TYPE_SNAP ||
+        if (cmd == GF_SNAP_STATUS_TYPE_ITER ||
             cmd == GF_SNAP_DELETE_TYPE_SNAP){
                 ret = 0;
                 goto out;
@@ -6168,7 +6181,7 @@ cli_xml_snapshot_end_composite_op (cli_local_t *local)
                 goto out;
         }
 
-        if (cmd == GF_SNAP_STATUS_TYPE_SNAP ||
+        if (cmd == GF_SNAP_STATUS_TYPE_ITER ||
             cmd == GF_SNAP_DELETE_TYPE_SNAP){
                 ret = 0;
                 goto out;