Make management client id optional

nsg-ethz · Jul 4, 2024 · d0a3b5c · d0a3b5c
1 parent ad023ca
commit d0a3b5c
Show file tree

Hide file tree

Showing 8 changed files with 5,381 additions and 1,455 deletions.
diff --git a/client/api.grpc.pb.cc b/client/api.grpc.pb.cc
diff --git a/client/api.grpc.pb.h b/client/api.grpc.pb.h
diff --git a/client/api.pb.cc b/client/api.pb.cc
diff --git a/client/api.pb.h b/client/api.pb.h
diff --git a/proto/api.proto b/proto/api.proto
@@ -115,7 +115,7 @@ message mgmtRequest {
   string clientUid = 1; // id for the client this request gets to
   srvRequestType msgType = 2; // id for the message as header
   optional string requestBody = 3; // content
-  uint32 requestNo = 4; // id of this request. A sequence number like identifier to identify responses
+  optional uint32 requestNo = 4; // Unused. Id of this request. A sequence number like identifier to identify responses.
   string mgmtId = 5;
   string pw = 6;
 }

diff --git a/server/api_pb2.py b/server/api_pb2.py
diff --git a/server/api_pb2_grpc.py b/server/api_pb2_grpc.py
@@ -5,7 +5,7 @@
 
 import api_pb2 as api__pb2
 
-GRPC_GENERATED_VERSION = '1.64.0'
+GRPC_GENERATED_VERSION = '1.64.1'
 GRPC_VERSION = grpc.__version__
 EXPECTED_ERROR_RELEASE = '1.65.0'
 SCHEDULED_RELEASE_DATE = 'June 25, 2024'

diff --git a/server/server.py b/server/server.py
@@ -530,14 +530,13 @@ def issueRequestToClient(self, request, context):
             return
 
         clientId = request.clientUid
+        manageRequestNo = request.requestNo # the request number of the management client (may not be the same as the one for the external client)
         # repack management request to client request
         requestToClient = pbdef.api__pb2.srvRequest()
 
         requestToClient.clientUid = clientId
         requestToClient.msgType = request.msgType
         requestToClient.requestBody = request.requestBody
-        # TODO: Deambiguate server-> client and server->management client ID
-        requestToClient.requestNo = request.requestNo
 
         requestNo = cm.scheduleNewRequestToClient(clientId, requestToClient)
         waitSucceeded = cm.waitOnRequestCompletion(clientId, requestNo)
@@ -548,6 +547,7 @@ def issueRequestToClient(self, request, context):
 
         response = cm.getResponseOfRequestNo(clientId, requestNo)
         cm.purgeResponseOfRequestNo(clientId, requestNo)  # clean up
+        response.requestNo = manageRequestNo
         return response
 
     def getMessages(self, request, context):