DAOS-13590 control: Update the consistent naming for CurrentLeader to current_leader (#12286)

Samir Raval · web-flow · commit 1b54d9e0ea39 · 2023-06-15T09:58:43.000-06:00
Signed-off-by: Samir Raval &lt;samir.raval@intel.com&gt;
diff --git a/src/control/common/proto/mgmt/svc.pb.go b/src/control/common/proto/mgmt/svc.pb.go
diff --git a/src/control/lib/control/system.go b/src/control/lib/control/system.go
@@ -620,8 +620,8 @@ type LeaderQueryReq struct {
 // LeaderQueryResp contains the status of the request and, if successful, the
 // MS leader and set of replicas in the system.
 type LeaderQueryResp struct {
-	Leader   string `json:"CurrentLeader"`
-	Replicas []string
+	Leader   string   `json:"current_leader"`
+	Replicas []string `json:"replicas"`
 }
 
 // LeaderQuery requests the current Management Service leader and the set of
diff --git a/src/mgmt/svc.pb-c.c b/src/mgmt/svc.pb-c.c
@@ -1154,12 +1154,12 @@ const ProtobufCMessageDescriptor mgmt__leader_query_req__descriptor =
 static const ProtobufCFieldDescriptor mgmt__leader_query_resp__field_descriptors[2] =
 {
   {
-    "currentLeader",
+    "current_leader",
     1,
     PROTOBUF_C_LABEL_NONE,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(Mgmt__LeaderQueryResp, currentleader),
+    offsetof(Mgmt__LeaderQueryResp, current_leader),
     NULL,
     &protobuf_c_empty_string,
     0,             /* flags */
@@ -1179,7 +1179,7 @@ static const ProtobufCFieldDescriptor mgmt__leader_query_resp__field_descriptors
   },
 };
 static const unsigned mgmt__leader_query_resp__field_indices_by_name[] = {
-  0,   /* field[0] = currentLeader */
+  0,   /* field[0] = current_leader */
   1,   /* field[1] = replicas */
 };
 static const ProtobufCIntRange mgmt__leader_query_resp__number_ranges[1 + 1] =
@@ -1468,7 +1468,7 @@ static const ProtobufCFieldDescriptor mgmt__get_attach_info_resp__field_descript
     offsetof(Mgmt__GetAttachInfoResp, ms_ranks),
     NULL,
     NULL,
-    0 | PROTOBUF_C_FIELD_FLAG_PACKED,             /* flags */
+    0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
diff --git a/src/mgmt/svc.pb-c.h b/src/mgmt/svc.pb-c.h
diff --git a/src/proto/mgmt/svc.proto b/src/proto/mgmt/svc.proto
@@ -61,7 +61,7 @@ message LeaderQueryReq {
 }
 
 message LeaderQueryResp {
-	string currentLeader = 1;
+	string current_leader = 1;
 	repeated string replicas = 2;
 }
 
diff --git a/src/tests/ftest/control/ms_failover.py b/src/tests/ftest/control/ms_failover.py
@@ -34,7 +34,7 @@ def get_leader(self):
             str: hostname of the MS leader, or None
         """
         sys_leader_info = self.get_dmg_command().system_leader_query()
-        l_addr = sys_leader_info["response"]["CurrentLeader"]
+        l_addr = sys_leader_info["response"]["current_leader"]
 
         if not l_addr:
             return None
diff --git a/src/tests/ftest/control/ms_resilience.py b/src/tests/ftest/control/ms_resilience.py
@@ -92,7 +92,7 @@ def get_leader(self):
 
         """
         sys_leader_info = self.get_dmg_command().system_leader_query()
-        l_addr = sys_leader_info["response"]["CurrentLeader"]
+        l_addr = sys_leader_info["response"]["current_leader"]
 
         return get_hostname(l_addr)
 
diff --git a/src/tests/ftest/util/dmg_utils.py b/src/tests/ftest/util/dmg_utils.py
@@ -1056,8 +1056,8 @@ def system_leader_query(self):
         # Example JSON output:
         # {
         #   "response": {
-        #     "CurrentLeader": "127.0.0.1:10001",
-        #     "Replicas": [
+        #     "current_leader": "127.0.0.1:10001",
+        #     "replicas": [
         #       "127.0.0.1:10001"
         #     ]
         #   },

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ message LeaderQueryReq {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`message LeaderQueryResp {`
`64`		`- string currentLeader = 1;`
	`64`	`+ string current_leader = 1;`
`65`	`65`	`repeated string replicas = 2;`
`66`	`66`	`}`
`67`	`67`