From 096b23f187d0b3ccbed25d8bd02723a61cc4da2d Mon Sep 17 00:00:00 2001
From: shishir gowda <sgowda@redhat.com>
Date: Thu, 24 Oct 2013 15:47:14 +0530
Subject: mgmt/glusterd: snapshot config changes

Also refactored code in glusterd for create command
Additionally, removed brick-op func from mgmt_iniate_all_phases

Change-Id: Iddcc332009c5716adee7f2b04c93b352fb983446
Signed-off-by: shishir gowda <sgowda@redhat.com>
---
 rpc/xdr/src/cli1-xdr.c | 11 +++++++++++
 rpc/xdr/src/cli1-xdr.h | 11 +++++++++++
 rpc/xdr/src/cli1-xdr.x | 10 +++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'rpc')

diff --git a/rpc/xdr/src/cli1-xdr.c b/rpc/xdr/src/cli1-xdr.c
index f0f08d334..97b210e14 100644
--- a/rpc/xdr/src/cli1-xdr.c
+++ b/rpc/xdr/src/cli1-xdr.c
@@ -189,6 +189,17 @@ xdr_gf1_cli_snapshot (XDR *xdrs, gf1_cli_snapshot *objp)
 	return TRUE;
 }
 
+bool_t
+xdr_gf1_cli_snapshot_config (XDR *xdrs, gf1_cli_snapshot_config *objp)
+{
+	register int32_t *buf;
+        buf = NULL;
+
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+
 bool_t
 xdr_gf_cli_req (XDR *xdrs, gf_cli_req *objp)
 {
diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h
index 0987d6d41..4c4cb0f18 100644
--- a/rpc/xdr/src/cli1-xdr.h
+++ b/rpc/xdr/src/cli1-xdr.h
@@ -182,6 +182,15 @@ enum gf1_cli_snapshot {
 };
 typedef enum gf1_cli_snapshot gf1_cli_snapshot;
 
+enum gf1_cli_snapshot_config {
+	GF_SNAP_CONFIG_TYPE_NONE = 0,
+	GF_SNAP_CONFIG_SYS_MAX = 0 + 1,
+	GF_SNAP_CONFIG_VOL_MAX = 0 + 2,
+	GF_SNAP_CONFIG_DISPLAY = 0 + 3,
+	GF_SNAP_CONFIG_CG_MAX = 0 + 4,
+};
+typedef enum gf1_cli_snapshot_config gf1_cli_snapshot_config;
+
 struct gf_cli_req {
 	struct {
 		u_int dict_len;
@@ -294,6 +303,7 @@ extern  bool_t xdr_gf1_cli_stats_op (XDR *, gf1_cli_stats_op*);
 extern  bool_t xdr_gf1_cli_top_op (XDR *, gf1_cli_top_op*);
 extern  bool_t xdr_gf_cli_status_type (XDR *, gf_cli_status_type*);
 extern  bool_t xdr_gf1_cli_snapshot (XDR *, gf1_cli_snapshot*);
+extern  bool_t xdr_gf1_cli_snapshot_config (XDR *, gf1_cli_snapshot_config*);
 extern  bool_t xdr_gf_cli_req (XDR *, gf_cli_req*);
 extern  bool_t xdr_gf_cli_rsp (XDR *, gf_cli_rsp*);
 extern  bool_t xdr_gf1_cli_peer_list_req (XDR *, gf1_cli_peer_list_req*);
@@ -323,6 +333,7 @@ extern bool_t xdr_gf1_cli_stats_op ();
 extern bool_t xdr_gf1_cli_top_op ();
 extern bool_t xdr_gf_cli_status_type ();
 extern bool_t xdr_gf1_cli_snapshot ();
+extern bool_t xdr_gf1_cli_snapshot_config ();
 extern bool_t xdr_gf_cli_req ();
 extern bool_t xdr_gf_cli_rsp ();
 extern bool_t xdr_gf1_cli_peer_list_req ();
diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x
index 3a28d5256..8167abbf9 100644
--- a/rpc/xdr/src/cli1-xdr.x
+++ b/rpc/xdr/src/cli1-xdr.x
@@ -124,7 +124,7 @@ enum gf_cli_status_type {
 
 /* Identifiers for snapshot clis */
 enum gf1_cli_snapshot {
-        GF_SNAP_OPTION_TYPE_NONE,
+        GF_SNAP_OPTION_TYPE_NONE = 0,
         GF_SNAP_OPTION_TYPE_CREATE,
         GF_SNAP_OPTION_TYPE_DELETE,
         GF_SNAP_OPTION_TYPE_RESTORE,
@@ -135,6 +135,14 @@ enum gf1_cli_snapshot {
         GF_SNAP_OPTION_TYPE_CONFIG
 };
 
+enum gf1_cli_snapshot_config {
+        GF_SNAP_CONFIG_TYPE_NONE = 0,
+        GF_SNAP_CONFIG_SYS_MAX,
+        GF_SNAP_CONFIG_VOL_MAX,
+        GF_SNAP_CONFIG_DISPLAY,
+        GF_SNAP_CONFIG_CG_MAX
+};
+
  struct gf_cli_req {
         opaque  dict<>;
 }  ;
-- 
cgit