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

#2887 - Test fixes

Browse Source
This commit is contained in:
Charlie Crane
2025-01-31 18:46:02 +00:00
parent 3d47b9c863
commit d806391625
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1564,7 +1564,7 @@ class Node(SimComponent, ABC):
"Time steps until reveal to red scan is complete." "Time steps until reveal to red scan is complete."
dns_server: Optional[IPv4Address] = None dns_server: Optional[IPv4Address] = None
"List of IP addresses of DNS servers used for name resolution." "List of IP addresses of DNS servers used for name resolution."
default_gateway: Optional[IPV4Address] = None default_gateway: Optional[IPV4Address] = None
"The default gateway IP address for forwarding network traffic to other networks." "The default gateway IP address for forwarding network traffic to other networks."

1
src/primaite/simulator/network/hardware/nodes/network/wireless_router.py
View File

@@ -130,6 +130,7 @@ class WirelessRouter(Router, identifier="wireless_router"):
hostname: str = "WirelessRouter" hostname: str = "WirelessRouter"
airspace: AirSpace airspace: AirSpace
num_ports: int = 0
def __init__(self, **kwargs): def __init__(self, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)

4
tests/integration_tests/game_layer/observations/test_firewall_observation.py
View File

@@ -25,7 +25,7 @@ def check_default_rules(acl_obs):
def test_firewall_observation(): def test_firewall_observation():
"""Test adding/removing acl rules and enabling/disabling ports.""" """Test adding/removing acl rules and enabling/disabling ports."""
net = Network() net = Network()
firewall_cfg = {"type": "firewall", "hostname": "firewall", "opertating_state": NodeOperatingState.ON} firewall_cfg = {"type": "firewall", "hostname": "firewall"}
firewall = Firewall.from_config(config=firewall_cfg) firewall = Firewall.from_config(config=firewall_cfg)
firewall_observation = FirewallObservation( firewall_observation = FirewallObservation(
where=[], where=[],
@@ -118,7 +118,7 @@ def test_firewall_observation():
# connect a switch to the firewall and check that only the correct port is updated # connect a switch to the firewall and check that only the correct port is updated
switch: Switch = Switch.from_config( switch: Switch = Switch.from_config(
config={"type": "switch", "hostname": "switch", "num_ports": 1, "operating_state": NodeOperatingState.ON} config={"type": "switch", "hostname": "switch", "num_ports": 1, "operating_state": "ON"}
) )
link = net.connect(firewall.network_interface[1], switch.network_interface[1]) link = net.connect(firewall.network_interface[1], switch.network_interface[1])
assert firewall.network_interface[1].enabled assert firewall.network_interface[1].enabled

2
tests/integration_tests/system/test_database_on_node.py
View File

@@ -62,7 +62,7 @@ def peer_to_peer_secure_db(peer_to_peer) -> Tuple[Computer, Computer]:
database_service: DatabaseService = node_b.software_manager.software["DatabaseService"] # noqa database_service: DatabaseService = node_b.software_manager.software["DatabaseService"] # noqa
database_service.stop() database_service.stop()
database_service.password = "12345" database_service.config.db_password = "12345"
database_service.start() database_service.start()
return node_a, node_b return node_a, node_b