#2418 Add Printer and Wireless router to config parser

src/primaite/game/game.py

@@ -15,10 +15,11 @@ from primaite.game.science import graph_has_cycle, topological_sort
 from primaite.simulator.network.hardware.base import NodeOperatingState
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
 from primaite.simulator.network.hardware.nodes.host.host_node import NIC
-from primaite.simulator.network.hardware.nodes.host.server import Server
+from primaite.simulator.network.hardware.nodes.host.server import Printer, Server
 from primaite.simulator.network.hardware.nodes.network.firewall import Firewall
 from primaite.simulator.network.hardware.nodes.network.router import Router
 from primaite.simulator.network.hardware.nodes.network.switch import Switch
+from primaite.simulator.network.hardware.nodes.network.wireless_router import WirelessRouter
 from primaite.simulator.network.nmne import set_nmne_config
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.sim_container import Simulation
@@ -273,8 +274,18 @@ class PrimaiteGame:
                 new_node = Router.from_config(node_cfg)
             elif n_type == "firewall":
                 new_node = Firewall.from_config(node_cfg)
+            elif n_type == "wireless_router":
+                new_node = WirelessRouter.from_config(node_cfg)
+            elif n_type == "printer":
+                new_node = Printer(
+                    hostname=node_cfg["hostname"],
+                    ip_address=node_cfg["ip_address"],
+                    subnet_mask=node_cfg["subnet_mask"],
+                )
             else:
-                _LOGGER.warning(f"invalid node type {n_type} in config")
+                msg = f"invalid node type {n_type} in config"
+                _LOGGER.error(msg)
+                raise ValueError(msg)
             if "services" in node_cfg:
                 for service_cfg in node_cfg["services"]:
                     new_service = None

src/primaite/simulator/network/hardware/nodes/host/server.py

@@ -28,3 +28,9 @@ class Server(HostNode):
     * Applications:
         * Web Browser
     """
+
+
+class Printer(HostNode):
+    """Printer? I don't even know her!."""
+
+    # TODO: Implement printer-specific behaviour

tests/assets/configs/test_primaite_session.yaml

@@ -681,6 +681,12 @@ simulation:
       - ref: client_2_dns_client
         type: DNSClient
 
+    - ref: HP_LaserJet_Pro_4102fdn_printer
+      type: printer
+      hostname: HP_LaserJet_Pro_4102fdn_printer
+      ip_address: 192.168.10.99
+      subnet_mask: 255.255.255.0
+
     links:
     - ref: router_1___switch_1
       endpoint_a_ref: router_1

tests/e2e_integration_tests/test_primaite_session.py

@@ -29,7 +29,7 @@ class TestPrimaiteSession:
             assert session.env
 
             assert session.env.game.simulation.network
-            assert len(session.env.game.simulation.network.nodes) == 10
+            assert len(session.env.game.simulation.network.nodes) == 11
 
     @pytest.mark.skip(reason="Session is not being maintained and will be removed in the subsequent beta release.")
     @pytest.mark.parametrize("temp_primaite_session", [[CFG_PATH]], indirect=True)