Merge '2887-Align_Node_Types' into 3062-discriminators

tests/integration_tests/extensions/nodes/super_computer.py

@@ -36,8 +36,8 @@ class SuperComputer(HostNode, discriminator="supercomputer"):
 
     SYSTEM_SOFTWARE: ClassVar[Dict] = {**HostNode.SYSTEM_SOFTWARE, "ftp-client": FTPClient}
 
-    def __init__(self, ip_address: IPV4Address, subnet_mask: IPV4Address, **kwargs):
+    def __init__(self, **kwargs):
         print("--- Extended Component: SuperComputer ---")
-        super().__init__(ip_address=ip_address, subnet_mask=subnet_mask, **kwargs)
+        super().__init__(**kwargs)
 
     pass

tests/integration_tests/extensions/services/extended_service.py

@@ -31,14 +31,14 @@ class ExtendedService(Service, discriminator="extended-service"):
 
         type: str = "extended-service"
 
+        backup_server_ip: IPv4Address = None
+        """IP address of the backup server."""
+
     config: "ExtendedService.ConfigSchema" = Field(default_factory=lambda: ExtendedService.ConfigSchema())
 
     password: Optional[str] = None
     """Password that needs to be provided by clients if they want to connect to the DatabaseService."""
 
-    backup_server_ip: IPv4Address = None
-    """IP address of the backup server."""
-
     latest_backup_directory: str = None
     """Directory of latest backup."""