cli, mgmt/glusterd: Added replace brick cli response

Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 1322 (Replace brick should show status of paused and abort states)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1322

3 files changed, 17 insertions, 12 deletions

diff --git a/rpc/xdr/src/cli1-xdr.c b/rpc/xdr/src/cli1-xdr.c
index 22c00f2f797..dd225f35524 100644
--- a/rpc/xdr/src/cli1-xdr.c
+++ b/rpc/xdr/src/cli1-xdr.c
@@ -443,6 +443,8 @@ xdr_gf1_cli_replace_brick_rsp (XDR *xdrs, gf1_cli_replace_brick_rsp *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->volname, ~0))
 		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->status, ~0))
+		 return FALSE;
 	return TRUE;
 }
 
@@ -470,10 +472,10 @@ xdr_gf1_cli_set_vol_rsp (XDR *xdrs, gf1_cli_set_vol_rsp *objp)
 	return TRUE;
 }
 
-
 bool_t
 xdr_gf1_cli_log_filename_req (XDR *xdrs, gf1_cli_log_filename_req *objp)
 {
+
 	 if (!xdr_string (xdrs, &objp->volname, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->brick, ~0))
@@ -486,6 +488,7 @@ xdr_gf1_cli_log_filename_req (XDR *xdrs, gf1_cli_log_filename_req *objp)
 bool_t
 xdr_gf1_cli_log_filename_rsp (XDR *xdrs, gf1_cli_log_filename_rsp *objp)
 {
+
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
@@ -495,10 +498,10 @@ xdr_gf1_cli_log_filename_rsp (XDR *xdrs, gf1_cli_log_filename_rsp *objp)
 	return TRUE;
 }
 
-
 bool_t
 xdr_gf1_cli_log_locate_req (XDR *xdrs, gf1_cli_log_locate_req *objp)
 {
+
 	 if (!xdr_string (xdrs, &objp->volname, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->brick, ~0))
@@ -509,6 +512,7 @@ xdr_gf1_cli_log_locate_req (XDR *xdrs, gf1_cli_log_locate_req *objp)
 bool_t
 xdr_gf1_cli_log_locate_rsp (XDR *xdrs, gf1_cli_log_locate_rsp *objp)
 {
+
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
@@ -518,10 +522,10 @@ xdr_gf1_cli_log_locate_rsp (XDR *xdrs, gf1_cli_log_locate_rsp *objp)
 	return TRUE;
 }
 
-
 bool_t
 xdr_gf1_cli_log_rotate_req (XDR *xdrs, gf1_cli_log_rotate_req *objp)
 {
+
 	 if (!xdr_string (xdrs, &objp->volname, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->brick, ~0))
@@ -532,6 +536,7 @@ xdr_gf1_cli_log_rotate_req (XDR *xdrs, gf1_cli_log_rotate_req *objp)
 bool_t
 xdr_gf1_cli_log_rotate_rsp (XDR *xdrs, gf1_cli_log_rotate_rsp *objp)
 {
+
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h
index e725e525785..2219b054740 100644
--- a/rpc/xdr/src/cli1-xdr.h
+++ b/rpc/xdr/src/cli1-xdr.h
@@ -270,6 +270,7 @@ struct gf1_cli_replace_brick_rsp {
 	int op_ret;
 	int op_errno;
 	char *volname;
+	char *status;
 };
 typedef struct gf1_cli_replace_brick_rsp gf1_cli_replace_brick_rsp;
 
@@ -291,45 +292,44 @@ typedef struct gf1_cli_set_vol_rsp gf1_cli_set_vol_rsp;
 
 struct gf1_cli_log_filename_req {
 	char *volname;
-        char *brick;
-        char *path;
+	char *brick;
+	char *path;
 };
 typedef struct gf1_cli_log_filename_req gf1_cli_log_filename_req;
 
 struct gf1_cli_log_filename_rsp {
 	int op_ret;
 	int op_errno;
-        char *errstr;
+	char *errstr;
 };
 typedef struct gf1_cli_log_filename_rsp gf1_cli_log_filename_rsp;
 
 struct gf1_cli_log_locate_req {
 	char *volname;
-        char *brick;
+	char *brick;
 };
 typedef struct gf1_cli_log_locate_req gf1_cli_log_locate_req;
 
 struct gf1_cli_log_locate_rsp {
 	int op_ret;
 	int op_errno;
-        char *path;
+	char *path;
 };
 typedef struct gf1_cli_log_locate_rsp gf1_cli_log_locate_rsp;
 
 struct gf1_cli_log_rotate_req {
 	char *volname;
-        char *brick;
+	char *brick;
 };
 typedef struct gf1_cli_log_rotate_req gf1_cli_log_rotate_req;
 
 struct gf1_cli_log_rotate_rsp {
 	int op_ret;
 	int op_errno;
-        char *errstr;
+	char *errstr;
 };
 typedef struct gf1_cli_log_rotate_rsp gf1_cli_log_rotate_rsp;
 
-
 /* the xdr functions */
 
 #if defined(__STDC__) || defined(__cplusplus)
@@ -373,7 +373,6 @@ extern  bool_t xdr_gf1_cli_log_locate_rsp (XDR *, gf1_cli_log_locate_rsp*);
 extern  bool_t xdr_gf1_cli_log_rotate_req (XDR *, gf1_cli_log_rotate_req*);
 extern  bool_t xdr_gf1_cli_log_rotate_rsp (XDR *, gf1_cli_log_rotate_rsp*);
 
-
 #else /* K&R C */
 extern bool_t xdr_gf1_cluster_type ();
 extern bool_t xdr_gf1_cli_replace_op ();
diff --git a/rpc/xdr/src/cli1.x b/rpc/xdr/src/cli1.x
index 359a7742375..0ffe32726ca 100644
--- a/rpc/xdr/src/cli1.x
+++ b/rpc/xdr/src/cli1.x
@@ -184,6 +184,7 @@ struct gf1_cli_get_vol_rsp {
         int     op_ret;
         int     op_errno;
         string  volname<>;
+        string  status<>;
 }  ;