update tests and make office lan creation work like previously

src/primaite/simulator/network/creation.py

@@ -155,7 +155,12 @@ class OfficeLANAdder(NetworkNodeAdder, discriminator="office-lan"):
         # Create a core switch if more than one edge switch is needed
         if num_of_switches > 1:
             core_switch = Switch.from_config(
-                config={"type": "switch", "hostname": f"switch_core_{config.lan_name}", "start_up_duration": 0}
+                config={
+                    "type": "switch",
+                    "hostname": f"switch_core_{config.lan_name}",
+                    "start_up_duration": 0,
+                    "num_ports": 24,
+                }
             )
             core_switch.power_on()
             network.add_node(core_switch)
@@ -183,7 +188,12 @@ class OfficeLANAdder(NetworkNodeAdder, discriminator="office-lan"):
         switch_port = 0
         switch_n = 1
         switch = Switch.from_config(
-            config={"type": "switch", "hostname": f"switch_edge_{switch_n}_{config.lan_name}", "start_up_duration": 0}
+            config={
+                "type": "switch",
+                "hostname": f"switch_edge_{switch_n}_{config.lan_name}",
+                "start_up_duration": 0,
+                "num_ports": 24,
+            }
         )
         switch.power_on()
         network.add_node(switch)
@@ -207,6 +217,7 @@ class OfficeLANAdder(NetworkNodeAdder, discriminator="office-lan"):
                         "type": "switch",
                         "hostname": f"switch_edge_{switch_n}_{config.lan_name}",
                         "start_up_duration": 0,
+                        "num_ports": 24,
                     }
                 )
                 switch.power_on()

tests/unit_tests/_primaite/_simulator/_network/_hardware/nodes/test_switch.py

@@ -17,4 +17,3 @@ def switch() -> Switch:
 def test_describe_state(switch):
     state = switch.describe_state()
     assert len(state.get("ports")) is 8
-    assert state.get("num_ports") is 8

tests/unit_tests/_primaite/_simulator/_system/_applications/test_applications.py

@@ -18,7 +18,7 @@ def test_scan(application):
 
 def test_run_application(application):
     assert application.operating_state == ApplicationOperatingState.CLOSED
-    assert application.health_state_actual == SoftwareHealthState.UNUSED
+    assert application.health_state_actual == SoftwareHealthState.GOOD
 
     application.run()
     assert application.operating_state == ApplicationOperatingState.RUNNING
@@ -37,9 +37,9 @@ def test_close_application(application):
 
 def test_application_describe_states(application):
     assert application.operating_state == ApplicationOperatingState.CLOSED
-    assert application.health_state_actual == SoftwareHealthState.UNUSED
+    assert application.health_state_actual == SoftwareHealthState.GOOD
 
-    assert SoftwareHealthState.UNUSED.value == application.describe_state().get("health_state_actual")
+    assert SoftwareHealthState.GOOD.value == application.describe_state().get("health_state_actual")
 
     application.run()
     assert SoftwareHealthState.GOOD.value == application.describe_state().get("health_state_actual")

tests/unit_tests/_primaite/_simulator/_system/_services/test_services.py

@@ -22,7 +22,7 @@ def test_scan(service):
 
 def test_start_service(service):
     assert service.operating_state == ServiceOperatingState.STOPPED
-    assert service.health_state_actual == SoftwareHealthState.UNUSED
+    assert service.health_state_actual == SoftwareHealthState.GOOD
     service.start()
 
     assert service.operating_state == ServiceOperatingState.RUNNING
@@ -43,7 +43,7 @@ def test_pause_and_resume_service(service):
     assert service.operating_state == ServiceOperatingState.STOPPED
     service.resume()
     assert service.operating_state == ServiceOperatingState.STOPPED
-    assert service.health_state_actual == SoftwareHealthState.UNUSED
+    assert service.health_state_actual == SoftwareHealthState.GOOD
 
     service.start()
     assert service.health_state_actual == SoftwareHealthState.GOOD
@@ -58,11 +58,11 @@ def test_pause_and_resume_service(service):
 
 def test_restart(service):
     assert service.operating_state == ServiceOperatingState.STOPPED
-    assert service.health_state_actual == SoftwareHealthState.UNUSED
+    assert service.health_state_actual == SoftwareHealthState.GOOD
     service.restart()
     # Service is STOPPED. Restart will only work if the service was PAUSED or RUNNING
     assert service.operating_state == ServiceOperatingState.STOPPED
-    assert service.health_state_actual == SoftwareHealthState.UNUSED
+    assert service.health_state_actual == SoftwareHealthState.GOOD
 
     service.start()
     assert service.operating_state == ServiceOperatingState.RUNNING
@@ -157,11 +157,11 @@ def test_service_fixing(service):
 def test_enable_disable(service):
     service.disable()
     assert service.operating_state == ServiceOperatingState.DISABLED
-    assert service.health_state_actual == SoftwareHealthState.UNUSED
+    assert service.health_state_actual == SoftwareHealthState.GOOD
 
     service.enable()
     assert service.operating_state == ServiceOperatingState.STOPPED
-    assert service.health_state_actual == SoftwareHealthState.UNUSED
+    assert service.health_state_actual == SoftwareHealthState.GOOD
 
 
 def test_overwhelm_service(service):

tests/unit_tests/_primaite/_simulator/_system/test_software.py

@@ -39,6 +39,6 @@ def test_software_creation(software):
 
 
 def test_software_set_health_state(software):
-    assert software.health_state_actual == SoftwareHealthState.UNUSED
-    software.set_health_state(SoftwareHealthState.GOOD)
     assert software.health_state_actual == SoftwareHealthState.GOOD
+    software.set_health_state(SoftwareHealthState.COMPROMISED)
+    assert software.health_state_actual == SoftwareHealthState.COMPROMISED