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

#2735: fixes to broken items

Browse Source
This commit is contained in:
Czar Echavez
2024-07-29 15:12:24 +01:00
parent 265632669e
commit 3d13669671
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -850,7 +850,6 @@ class UserManager(Service):
kwargs["port"] = Port.NONE
kwargs["protocol"] = IPProtocol.NONE
super().__init__(**kwargs)
self._request_manager = None
self.start()
@@ -1499,20 +1498,28 @@ class Node(SimComponent):
super().__init__(**kwargs)
self.session_manager.node = self
self.session_manager.software_manager = self.software_manager
self.software_manager.install(UserSessionManager, node=self)
self._request_manager.add_request(
"sessions", RequestType(func=self.user_session_manager._request_manager)
) # noqa
self.software_manager.install(UserManager)
self._request_manager.add_request("accounts", RequestType(func=self.user_manager._request_manager)) # noqa
self.user_manager.add_user(username="admin", password="admin", is_admin=True, bypass_can_perform_action=True)
self._install_system_software()
@property
def user_manager(self) -> UserManager:
"""The Nodes User Manager."""
return self.software_manager.software["UserManager"] # noqa
return self.software_manager.software.get("UserManager") # noqa
@property
def user_session_manager(self) -> UserSessionManager:
"""The Nodes User Session Manager."""
return self.software_manager.software["UserSessionManager"] # noqa
return self.software_manager.software.get("UserSessionManager") # noqa
def local_login(self, username: str, password: str) -> Optional[str]:
"""
@@ -1735,10 +1742,6 @@ class Node(SimComponent):
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))
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
def describe_state(self) -> Dict:

3
src/primaite/simulator/network/hardware/nodes/network/switch.py
View File

@@ -108,6 +108,9 @@ class Switch(NetworkNode):
for i in range(1, self.num_ports + 1):
self.connect_nic(SwitchPort())
def _install_system_software(self):
pass
def show(self, markdown: bool = False):
"""
Prints a table of the SwitchPorts on the Switch.