From 3d47b9c8638322b537d6346612f71a7a69b309ad Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Thu, 30 Jan 2025 17:33:00 +0000
Subject: [PATCH] #2887 - Further fixes to unit tests

---
 src/primaite/simulator/network/hardware/base.py        | 5 ++++-
 src/primaite/simulator/system/core/software_manager.py | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/primaite/simulator/network/hardware/base.py b/src/primaite/simulator/network/hardware/base.py
index 08e100d2..8cbe2b87 100644
--- a/src/primaite/simulator/network/hardware/base.py
+++ b/src/primaite/simulator/network/hardware/base.py
@@ -1532,6 +1532,7 @@ class Node(SimComponent, ABC):
 
         model_config = ConfigDict(arbitrary_types_allowed=True)
         """Configure pydantic to allow arbitrary types, let the instance have attributes not present in the model."""
+
         hostname: str = "default"
         "The node hostname on the network."
 
@@ -1568,6 +1569,8 @@ class Node(SimComponent, ABC):
         default_gateway: Optional[IPV4Address] = None
         "The default gateway IP address for forwarding network traffic to other networks."
 
+        operating_state: Any = None
+
     @property
     def dns_server(self) -> Optional[IPv4Address]:
         return self.config.dns_server
@@ -1579,7 +1582,6 @@ class Node(SimComponent, ABC):
             msg = f"Configuration contains an invalid Node type: {config['type']}"
             return ValueError(msg)
         obj = cls(config=cls.ConfigSchema(**config))
-        obj.operating_state = NodeOperatingState.ON if not (p := config.get("operating_state")) else NodeOperatingState[p.upper()]
         return obj
 
     def __init_subclass__(cls, identifier: Optional[str] = None, **kwargs: Any) -> None:
@@ -1623,6 +1625,7 @@ class Node(SimComponent, ABC):
                 dns_server=kwargs["config"].dns_server,
             )
         super().__init__(**kwargs)
+        self.operating_state = NodeOperatingState.ON if not (p := kwargs["config"].operating_state) else NodeOperatingState[p.upper()]
         self._install_system_software()
         self.session_manager.node = self
         self.session_manager.software_manager = self.software_manager
diff --git a/src/primaite/simulator/system/core/software_manager.py b/src/primaite/simulator/system/core/software_manager.py
index ddb30a3b..0f7aa936 100644
--- a/src/primaite/simulator/system/core/software_manager.py
+++ b/src/primaite/simulator/system/core/software_manager.py
@@ -140,6 +140,7 @@ class SoftwareManager:
         elif isinstance(software, Service):
             self.node.services[software.uuid] = software
             self.node._service_request_manager.add_request(software.name, RequestType(func=software._request_manager))
+            software.start()
         software.install()
         software.software_manager = self
         self.software[software.name] = software