From f099a87fd36b600ccb8268937d3cd7ca84799f77 Mon Sep 17 00:00:00 2001
From: Sachin Pandit <spandit@redhat.com>
Date: Tue, 3 Feb 2015 05:01:38 +0530
Subject: features/quota : Fix XML output for quota list command

Sample output:
---------------

Sample 1)
----------
[root@snapshot-28 glusterfs]# gluster volume quota vol1 list /dir1 /dir4 /dir5 --xml
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cliOutput>
  <opRet>0</opRet>
  <opErrno>0</opErrno>
  <opErrstr/>
  <volQuota>
    <limit>
      <path>/dir1</path>
      <hard_limit>10.0MB</hard_limit>
      <soft_limit>80%</soft_limit>
      <used_space>0Bytes</used_space>
      <avail_space>10.0MB</avail_space>
      <hl_exceeded>No</hl_exceeded>
      <sl_exceeded>No</sl_exceeded>
    </limit>
    <limit>
      <path>/dir4</path>
      <path>No such file or directory</path>
    </limit>
    <limit>
      <path>/dir5</path>
      <path>No such file or directory</path>
    </limit>
  </volQuota>
</cliOutput>

Sample 2)
---------
gluster volume quota vol1 list --xml
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cliOutput>
  <opRet>0</opRet>
  <opErrno>0</opErrno>
  <opErrstr/>
  <volQuota/>
</cliOutput>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cliOutput>
  <volQuota>
    <limit>
      <path>/dir</path>
      <hard_limit>10.0MB</hard_limit>
      <soft_limit>80%</soft_limit>
      <used_space>0Bytes</used_space>
      <avail_space>10.0MB</avail_space>
      <hl_exceeded>No</hl_exceeded>
      <sl_exceeded>No</sl_exceeded>
    </limit>
    <limit>
      <path>/dir1</path>
      <hard_limit>10.0MB</hard_limit>
      <soft_limit>80%</soft_limit>
      <used_space>0Bytes</used_space>
      <avail_space>10.0MB</avail_space>
      <hl_exceeded>No</hl_exceeded>
      <sl_exceeded>No</sl_exceeded>
    </limit>
  </volQuota>
</cliOutput>

Change-Id: I8a8d83cff88f778e5ee01fbca07d9f94c412317a
BUG: 1185259
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/9481
Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
---
 cli/src/cli.h | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'cli/src/cli.h')

diff --git a/cli/src/cli.h b/cli/src/cli.h
index bdf366b22ed..2e1369af944 100644
--- a/cli/src/cli.h
+++ b/cli/src/cli.h
@@ -357,9 +357,19 @@ int
 cli_xml_output_vol_info (cli_local_t *local, dict_t *dict);
 
 int
-cli_xml_output_vol_quota_limit_list (char *volname, char *limit_list,
-                                      int op_ret, int op_errno,
-                                      char *op_errstr);
+cli_xml_output_vol_quota_limit_list_begin (cli_local_t *local, int op_ret,
+                                           int op_errno, char *op_errstr);
+int
+cli_xml_output_vol_quota_limit_list_end (cli_local_t *local);
+
+int
+cli_quota_list_xml_error (cli_local_t *local, char *path,
+                          char *errstr);
+
+int
+cli_quota_xml_output (cli_local_t *local, char *path, char *hl_str,
+                      char *sl_final, void *used, void *avail,
+                      char *sl, char *hl);
 
 int
 cli_xml_output_peer_status (dict_t *dict, int op_ret, int op_errno,
-- 
cgit