#1355 - Carried out full renaming in node.py, active_node.py, passive_node.py, and service_node.py to make params and variable names explicit.

- Made the same renaming in the yaml laydown config files.
- Added Type hints wherever I've been.
- Added a custom NodeType in custom_typing.py to encompass the Union of ActiveNode, PassiveNode, ServiceNode.

src/primaite/common/service.py

@@ -1,83 +1,28 @@
 # Crown Copyright (C) Dstl 2022. DEFCON 703. Shared in confidence.
 """The Service class."""
 
-from primaite.common.enums import SOFTWARE_STATE
+from primaite.common.enums import SoftwareState
 
 
 class Service(object):
     """Service class."""
 
-    def __init__(self, _name, _port, _state):
+    def __init__(self, name: str, port: str, software_state: SoftwareState):
         """
         Init.
 
-        Args:
-            _name: The service name
-            _port: The service port
-            _state: The service state
+        :param name: The service name.
+        :param port: The service port.
+        :param software_state: The service SoftwareState.
         """
-        self.name = _name
-        self.port = _port
-        self.state = _state
+        self.name = name
+        self.port = port
+        self.software_state = software_state
         self.patching_count = 0
 
-    def set_name(self, _name):
-        """
-        Sets the service name.
-
-        Args:
-            _name: The service name
-        """
-        self.name = _name
-
-    def get_name(self):
-        """
-        Gets the service name.
-
-        Returns:
-             The service name
-        """
-        return self.name
-
-    def set_port(self, _port):
-        """
-        Sets the service port.
-
-        Args:
-            _port: The service port
-        """
-        self.port = _port
-
-    def get_port(self):
-        """
-        Gets the service port.
-
-        Returns:
-             The service port
-        """
-        return self.port
-
-    def set_state(self, _state):
-        """
-        Sets the service state.
-
-        Args:
-            _state: The service state
-        """
-        self.state = _state
-
-    def get_state(self):
-        """
-        Gets the service state.
-
-        Returns:
-             The service state
-        """
-        return self.state
-
     def reduce_patching_count(self):
         """Reduces the patching count for the service."""
         self.patching_count -= 1
         if self.patching_count <= 0:
             self.patching_count = 0
-            self.state = SOFTWARE_STATE.GOOD
+            self.software_state = SoftwareState.GOOD