oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#2778 - added request managers for USerManager and UserSessionManager classes

Browse Source
This commit is contained in:
Chris McCarthy
2024-07-29 10:29:12 +01:00
parent 2e35549c95
commit 265632669e
1 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/primaite/simulator/network/hardware/base.py
View File

@@ -850,8 +850,29 @@ class UserManager(Service):
kwargs["port"] = Port.NONE kwargs["port"] = Port.NONE
kwargs["protocol"] = IPProtocol.NONE kwargs["protocol"] = IPProtocol.NONE
super().__init__(**kwargs) super().__init__(**kwargs)
self._request_manager = None
self.start() self.start()
def _init_request_manager(self) -> RequestManager:
"""
Initialise the request manager.
More information in user guide and docstring for SimComponent._init_request_manager.
"""
rm = super()._init_request_manager()
# todo add doc about requeest schemas
rm.add_request(
"change_password",
RequestType(
func=lambda request, context: RequestResponse.from_bool(
self.change_user_password(username=request[0], current_password=request[1], new_password=request[2])
)
),
)
return rm
def describe_state(self) -> Dict: def describe_state(self) -> Dict:
""" """
Returns the state of the UserManager along with the number of users and admins. Returns the state of the UserManager along with the number of users and admins.
@@ -1117,6 +1138,34 @@ class UserSessionManager(Service):
super().__init__(**kwargs) super().__init__(**kwargs)
self.start() self.start()
def _init_request_manager(self) -> RequestManager:
"""
Initialise the request manager.
More information in user guide and docstring for SimComponent._init_request_manager.
"""
rm = super()._init_request_manager()
# todo add doc about requeest schemas
rm.add_request(
"remote_login",
RequestType(
func=lambda request, context: RequestResponse.from_bool(
self.remote_login(username=request[0], password=request[1], remote_ip_address=request[2])
)
),
)
rm.add_request(
"remote_logout",
RequestType(
func=lambda request, context: RequestResponse.from_bool(
self.remote_logout(remote_session_id=request[0])
)
),
)
return rm
def show(self, markdown: bool = False, include_session_id: bool = False, include_historic: bool = False): def show(self, markdown: bool = False, include_session_id: bool = False, include_historic: bool = False):
""" """
Displays a table of the user sessions on the Node. Displays a table of the user sessions on the Node.
@@ -1686,6 +1735,10 @@ class Node(SimComponent):
self._application_manager.add_request(name="install", request_type=RequestType(func=_install_application)) self._application_manager.add_request(name="install", request_type=RequestType(func=_install_application))
self._application_manager.add_request(name="uninstall", request_type=RequestType(func=_uninstall_application)) self._application_manager.add_request(name="uninstall", request_type=RequestType(func=_uninstall_application))
rm.add_request("accounts", RequestType(func=self.user_manager._request_manager)) # noqa
rm.add_request("sessions", RequestType(func=self.user_session_manager._request_manager)) # noqa
return rm return rm
def describe_state(self) -> Dict: def describe_state(self) -> Dict:
@@ -1868,7 +1921,6 @@ class Node(SimComponent):
def pre_timestep(self, timestep: int) -> None: def pre_timestep(self, timestep: int) -> None:
"""Apply pre-timestep logic.""" """Apply pre-timestep logic."""
super().pre_timestep(timestep) super().pre_timestep(timestep)
self._
for network_interface in self.network_interfaces.values(): for network_interface in self.network_interfaces.values():
network_interface.pre_timestep(timestep=timestep) network_interface.pre_timestep(timestep=timestep)