afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

grpc: removed set session metadata, now accomplished with start session

Browse source
This commit is contained in:
Blake Harnden 2021-04-27 21:08:58 -07:00
parent a217c2445c
commit 634341dd03
8 changed files with 7 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

16
daemon/core/api/grpc/client.py
View file

@ -298,22 +298,6 @@ class CoreGrpcClient:
request = core_pb2.GetSessionRequest(session_id=session_id)
return self.stub.GetSession(request)
def set_session_metadata(
self, session_id: int, config: Dict[str, str]
) -> core_pb2.SetSessionMetadataResponse:
"""
Set metadata for a session.
:param session_id: id of session
:param config: configuration values to set
:return: response with result of success or failure
:raises grpc.RpcError: when session doesn't exist
"""
request = core_pb2.SetSessionMetadataRequest(
session_id=session_id, config=config
)
return self.stub.SetSessionMetadata(request)
def set_session_state(
self, session_id: int, state: core_pb2.SessionState
) -> core_pb2.SetSessionStateResponse:

17
daemon/core/api/grpc/clientw.py
View file

@ -258,6 +258,7 @@ class CoreGrpcClient:
:param session: session to start
:param asymmetric_links: link configuration for asymmetric links
:param definition: True to only define session data, False to start session
:return: tuple of result and exception strings
"""
nodes = [x.to_proto() for x in session.nodes.values()]
@ -335,6 +336,7 @@ class CoreGrpcClient:
options=options,
user=session.user,
definition=definition,
metadata=session.metadata,
)
response = self.stub.StartSession(request)
return response.result, list(response.exceptions)
@ -412,21 +414,6 @@ class CoreGrpcClient:
response = self.stub.GetSession(request)
return wrappers.Session.from_proto(response.session)
def set_session_metadata(self, session_id: int, config: Dict[str, str]) -> bool:
"""
Set metadata for a session.
:param session_id: id of session
:param config: configuration values to set
:return: True for success, False otherwise
:raises grpc.RpcError: when session doesn't exist
"""
request = core_pb2.SetSessionMetadataRequest(
session_id=session_id, config=config
)
response = self.stub.SetSessionMetadata(request)
return response.result
def set_session_state(self, session_id: int, state: wrappers.SessionState) -> bool:
"""
Set session state.

16
daemon/core/api/grpc/server.py
View file

@ -235,6 +235,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
session.options.config_reset()
for key, value in request.options.items():
session.options.set_config(key, value)
session.metadata = dict(request.metadata)
# location
if request.HasField("location"):
@ -419,21 +420,6 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
result = False
return core_pb2.SetSessionStateResponse(result=result)
def SetSessionMetadata(
self, request: core_pb2.SetSessionMetadataRequest, context: ServicerContext
) -> core_pb2.SetSessionMetadataResponse:
"""
Update a session's metadata.
:param request: set metadata request
:param context: context object
:return: set metadata response
"""
logger.debug("set session metadata: %s", request)
session = self.get_session(request.session_id, context)
session.metadata = dict(request.config)
return core_pb2.SetSessionMetadataResponse(result=True)
def CheckSession(
self, request: core_pb2.GetSessionRequest, context: ServicerContext
) -> core_pb2.CheckSessionResponse: