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

Finalise the refactor. It works well now.

Browse Source
This commit is contained in:
Marek Wolan
2024-02-25 17:44:41 +00:00
parent a34cf08209
commit 994dbc3501
10 changed files with 65 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/primaite/simulator/network/container.py
View File

@@ -48,9 +48,9 @@ class Network(SimComponent):
def setup_for_episode(self, episode: int):
"""Reset the original state of the SimComponent."""
for node in self.nodes.values():
node.setup_for_episode(episode)
node.setup_for_episode(episode=episode)
for link in self.links.values():
link.setup_for_episode(episode)
link.setup_for_episode(episode=episode)
for node in self.nodes.values():
node.power_on()
@@ -172,7 +172,7 @@ class Network(SimComponent):
def clear_links(self):
"""Clear all the links in the network by resetting their component state for the episode."""
for link in self.links.values():
link.setup_for_episode()
link.setup_for_episode(episode=0) # TODO: shouldn't be using this method here.
def draw(self, seed: int = 123):
"""

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

@@ -90,7 +90,7 @@ class NetworkInterface(SimComponent, ABC):
def setup_for_episode(self, episode: int):
"""Reset the original state of the SimComponent."""
super().setup_for_episode(episode)
super().setup_for_episode(episode=episode)
if episode and self.pcap:
self.pcap.current_episode = episode
self.pcap.setup_logger()
@@ -643,17 +643,17 @@ class Node(SimComponent):
def setup_for_episode(self, episode: int):
"""Reset the original state of the SimComponent."""
super().setup_for_episode(episode)
super().setup_for_episode(episode=episode)
# Reset File System
self.file_system.setup_for_episode(episode)
self.file_system.setup_for_episode(episode=episode)
# Reset all Nics
for network_interface in self.network_interfaces.values():
network_interface.setup_for_episode(episode)
network_interface.setup_for_episode(episode=episode)
for software in self.software_manager.software.values():
software.setup_for_episode(episode)
software.setup_for_episode(episode=episode)
if episode and self.sys_log:
self.sys_log.current_episode = episode

2
src/primaite/simulator/network/hardware/nodes/network/router.py
View File

@@ -1078,7 +1078,7 @@ class Router(NetworkNode):
for i, _ in self.network_interface.items():
self.enable_port(i)
super().setup_for_episode(episode)
super().setup_for_episode(episode=episode)
def _init_request_manager(self) -> RequestManager:
rm = super()._init_request_manager()