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

#2887 - Merge in changes on dev to resolve conflicts. All tests should now pass

Browse Source
This commit is contained in:
Charlie Crane
2025-02-03 11:18:34 +00:00
parent d1e932a57c
commit 3d01f52eea
10 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration_tests/configuration_file_parsing/nodes/test_node_config.py
View File

@@ -3,8 +3,8 @@ from primaite.config.load import data_manipulation_config_path
from primaite.simulator.network.container import Network
from primaite.simulator.network.hardware.node_operating_state import NodeOperatingState
from primaite.simulator.network.hardware.nodes.host.computer import Computer
from primaite.simulator.network.hardware.nodes.network.wireless_router import WirelessRouter
from primaite.simulator.network.hardware.nodes.network.firewall import Firewall
from primaite.simulator.network.hardware.nodes.network.wireless_router import WirelessRouter
from tests.integration_tests.configuration_file_parsing import BASIC_CONFIG, DMZ_NETWORK, load_config