1 files changed, 29 insertions, 86 deletions

diff --git a/lib/mgmt.proto b/lib/mgmt.proto
index 8a11ff0fa5..01a99ab63b 100644
--- a/lib/mgmt.proto
+++ b/lib/mgmt.proto
@@ -55,7 +55,10 @@ message YangData {
 enum CfgDataReqType {
   REQ_TYPE_NONE = 0;
   SET_DATA = 1;
-  DELETE_DATA = 2;
+  REMOVE_DATA = 2;
+  CREATE_DATA = 3;
+  DELETE_DATA = 4;
+  REPLACE_DATA = 5;
 }
 
 message YangCfgDataReq {
@@ -73,8 +76,9 @@ message YangGetDataReq {
 //
 message BeSubscribeReq {
   required string client_name = 1;
-  required bool subscribe_xpaths = 2;
-  repeated string xpath_reg = 3;
+  repeated string config_xpaths = 2;
+  repeated string oper_xpaths = 3;
+  repeated string notif_xpaths = 4;
 }
 
 message BeSubscribeReply {
@@ -94,16 +98,14 @@ message BeTxnReply {
 
 message BeCfgDataCreateReq {
   required uint64 txn_id = 1;
-  required uint64 batch_id = 2;
-  repeated YangCfgDataReq data_req = 3;
-  required bool end_of_data = 4;
+  repeated YangCfgDataReq data_req = 2;
+  required bool end_of_data = 3;
 }
 
 message BeCfgDataCreateReply {
   required uint64 txn_id = 1;
-  required uint64 batch_id = 2;
-  required bool success = 3;
-  optional string error_if_any = 4;
+  required bool success = 2;
+  optional string error_if_any = 3;
 }
 
 message BeCfgDataApplyReq {
@@ -112,15 +114,8 @@ message BeCfgDataApplyReq {
 
 message BeCfgDataApplyReply {
   required uint64 txn_id = 1;
-  repeated uint64 batch_ids = 2;
-  required bool success = 3;
-  optional string error_if_any = 4;
-}
-
-message BeOperDataGetReq {
-  required uint64 txn_id = 1;
-  required uint64 batch_id = 2;
-  repeated YangGetDataReq data = 3;
+  required bool success = 2;
+  optional string error_if_any = 3;
 }
 
 message YangDataReply {
@@ -128,36 +123,6 @@ message YangDataReply {
   required int64 next_indx = 2;
 }
 
-message BeOperDataGetReply {
-  required uint64 txn_id = 1;
-  required uint64 batch_id = 2;
-  required bool success = 3;
-  optional string error = 4;
-  optional YangDataReply data = 5;
-}
-
-message BeOperDataNotify {
-  required YangDataReply data = 5;
-}
-
-message BeConfigCmdReq {
-  required string cmd = 1;
-}
-
-message BeConfigCmdReply {
-  required bool success = 1;
-  required string error_if_any = 2;
-}
-
-message BeShowCmdReq {
-  required string cmd = 1;
-}
-
-message BeShowCmdReply {
-  required bool success = 1;
-  required string cmd_ouput = 2;
-}
-
 //
 // Any message on the MGMTD Backend Interface.
 //
@@ -171,13 +136,6 @@ message BeMessage {
     BeCfgDataCreateReply cfg_data_reply = 7;
     BeCfgDataApplyReq cfg_apply_req = 8;
     BeCfgDataApplyReply cfg_apply_reply = 9;
-    BeOperDataGetReq get_req = 10;
-    BeOperDataGetReply get_reply = 11;
-    BeOperDataNotify notify_data = 12;
-    BeConfigCmdReq cfg_cmd_req = 13;
-    BeConfigCmdReply cfg_cmd_reply = 14;
-    BeShowCmdReq show_cmd_req = 15;
-    BeShowCmdReply show_cmd_reply = 16;
   }
 }
 
@@ -243,7 +201,8 @@ message FeSetConfigReply {
   required DatastoreId ds_id = 2;
   required uint64 req_id = 3;
   required bool success = 4;
-  optional string error_if_any = 5;
+  required bool implicit_commit = 5;
+  optional string error_if_any = 6;
 }
 
 message FeCommitConfigReq {
@@ -266,36 +225,22 @@ message FeCommitConfigReply {
   optional string error_if_any = 8;
 }
 
-message FeGetConfigReq {
-  required uint64 session_id = 1;
-  required DatastoreId ds_id = 2;
-  required uint64 req_id = 3;
-  repeated YangGetDataReq data = 4;
-}
-
-message FeGetConfigReply {
-  required uint64 session_id = 1;
-  required DatastoreId ds_id = 2;
-  required uint64 req_id = 3;
-  required bool success = 4;
-  optional string error_if_any = 5;
-  optional YangDataReply data = 6;
-}
-
-message FeGetDataReq {
+message FeGetReq {
   required uint64 session_id = 1;
-  required DatastoreId ds_id = 2;
-  required uint64 req_id = 3;
-  repeated YangGetDataReq data = 4;
+  required bool config = 2;
+  required DatastoreId ds_id = 3;
+  required uint64 req_id = 4;
+  repeated YangGetDataReq data = 5;
 }
 
-message FeGetDataReply {
+message FeGetReply {
   required uint64 session_id = 1;
-  required DatastoreId ds_id = 2;
-  required uint64 req_id = 3;
-  required bool success = 4;
-  optional string error_if_any = 5;
-  optional YangDataReply data = 6;
+  required bool config = 2;
+  required DatastoreId ds_id = 3;
+  required uint64 req_id = 4;
+  required bool success = 5;
+  optional string error_if_any = 6;
+  optional YangDataReply data = 7;
 }
 
 message FeNotifyDataReq {
@@ -321,10 +266,8 @@ message FeMessage {
     FeSetConfigReply setcfg_reply = 8;
     FeCommitConfigReq commcfg_req = 9;
     FeCommitConfigReply commcfg_reply = 10;
-    FeGetConfigReq getcfg_req = 11;
-    FeGetConfigReply getcfg_reply = 12;
-    FeGetDataReq getdata_req = 13;
-    FeGetDataReply getdata_reply = 14;
+    FeGetReq get_req = 11;
+    FeGetReply get_reply = 12;
     FeNotifyDataReq notify_data_req = 15;
     FeRegisterNotifyReq regnotify_req = 16;
   }