#2358 - the node-specific properties in Network class now simply use node.__class__.__name__ to check their type for filtering by type. Tests updated to use the new property function names

tests/conftest.py

@@ -422,7 +422,7 @@ def install_stuff_to_sim(sim: Simulation):
     assert len(sim.network.nodes) == 6
     assert len(sim.network.links) == 5
     # 5.1: Assert the router is correctly configured
-    r = sim.network.routers[0]
+    r = sim.network.router_nodes[0]
     for i, acl_rule in enumerate(r.acl.acl):
         if i == 1:
             assert acl_rule.src_port == acl_rule.dst_port == Port.DNS

tests/integration_tests/configuration_file_parsing/nodes/test_node_config.py

@@ -11,9 +11,9 @@ def test_example_config():
     network: Network = game.simulation.network
 
     assert len(network.nodes) == 10  # 10 nodes in example network
-    assert len(network.routers) == 1  # 1 router in network
-    assert len(network.switches) == 2  # 2 switches in network
-    assert len(network.servers) == 5  # 5 servers in network
+    assert len(network.router_nodes) == 1  # 1 router in network
+    assert len(network.switch_nodes) == 2  # 2 switches in network
+    assert len(network.server_nodes) == 5  # 5 servers in network
 
 
 def test_dmz_config():
@@ -23,9 +23,10 @@ def test_dmz_config():
     network: Network = game.simulation.network
 
     assert len(network.nodes) == 9  # 9 nodes in network
-    assert len(network.routers) == 2  # 2 routers in network
-    assert len(network.switches) == 3  # 3 switches in network
-    assert len(network.servers) == 2  # 2 servers in network
+    assert len(network.router_nodes) == 1  # 1 router in network
+    assert len(network.firewall_nodes) == 1  # 1 firewall in network
+    assert len(network.switch_nodes) == 3  # 3 switches in network
+    assert len(network.server_nodes) == 2  # 2 servers in network
 
 
 def test_basic_config():

tests/integration_tests/configuration_file_parsing/software_installation_and_configuration.py

@@ -60,9 +60,9 @@ def test_example_config():
     network: Network = game.simulation.network
 
     assert len(network.nodes) == 10  # 10 nodes in example network
-    assert len(network.routers) == 1  # 1 router in network
-    assert len(network.switches) == 2  # 2 switches in network
-    assert len(network.servers) == 5  # 5 servers in network
+    assert len(network.router_nodes) == 1  # 1 router in network
+    assert len(network.switch_nodes) == 2  # 2 switches in network
+    assert len(network.server_nodes) == 5  # 5 servers in network
 
 
 def test_node_software_install():

tests/unit_tests/_primaite/_simulator/_network/test_container.py

@@ -26,10 +26,10 @@ def filter_keys_nested_item(data, keys):
 
 @pytest.fixture(scope="function")
 def network(example_network) -> Network:
-    assert len(example_network.routers) is 1
-    assert len(example_network.switches) is 2
-    assert len(example_network.computers) is 2
-    assert len(example_network.servers) is 2
+    assert len(example_network.router_nodes) is 1
+    assert len(example_network.switch_nodes) is 2
+    assert len(example_network.computer_nodes) is 2
+    assert len(example_network.server_nodes) is 2
 
     example_network.show()