diff --git a/src/primaite/simulator/network/hardware/base.py b/src/primaite/simulator/network/hardware/base.py index 8cbe2b87..732b79f5 100644 --- a/src/primaite/simulator/network/hardware/base.py +++ b/src/primaite/simulator/network/hardware/base.py @@ -1564,7 +1564,7 @@ class Node(SimComponent, ABC): "Time steps until reveal to red scan is complete." 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 "The default gateway IP address for forwarding network traffic to other networks." diff --git a/src/primaite/simulator/network/hardware/nodes/network/wireless_router.py b/src/primaite/simulator/network/hardware/nodes/network/wireless_router.py index 5e52de7e..348c2aaa 100644 --- a/src/primaite/simulator/network/hardware/nodes/network/wireless_router.py +++ b/src/primaite/simulator/network/hardware/nodes/network/wireless_router.py @@ -130,6 +130,7 @@ class WirelessRouter(Router, identifier="wireless_router"): hostname: str = "WirelessRouter" airspace: AirSpace + num_ports: int = 0 def __init__(self, **kwargs): super().__init__(**kwargs) diff --git a/tests/integration_tests/game_layer/observations/test_firewall_observation.py b/tests/integration_tests/game_layer/observations/test_firewall_observation.py index 17c7775f..874fa49e 100644 --- a/tests/integration_tests/game_layer/observations/test_firewall_observation.py +++ b/tests/integration_tests/game_layer/observations/test_firewall_observation.py @@ -25,7 +25,7 @@ def check_default_rules(acl_obs): def test_firewall_observation(): """Test adding/removing acl rules and enabling/disabling ports.""" 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_observation = FirewallObservation( where=[], @@ -118,7 +118,7 @@ def test_firewall_observation(): # connect a switch to the firewall and check that only the correct port is updated 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]) assert firewall.network_interface[1].enabled diff --git a/tests/integration_tests/system/test_database_on_node.py b/tests/integration_tests/system/test_database_on_node.py index 8ad292b2..59e50659 100644 --- a/tests/integration_tests/system/test_database_on_node.py +++ b/tests/integration_tests/system/test_database_on_node.py @@ -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.stop() - database_service.password = "12345" + database_service.config.db_password = "12345" database_service.start() return node_a, node_b