Refactorized "specializations" name to a more convenient "generics"

server/src/uds/services/OpenStack/deployment_fixed.py

@@ -34,7 +34,7 @@ import logging
 import typing
 
 from uds.core import types
-from uds.core.services.specializations.fixed_machine.fixed_userservice import FixedUserService, Operation
+from uds.core.services.generics.fixed_machine.fixed_userservice import FixedUserService, Operation
 from uds.core.util import autoserializable
 
 from .openstack import types as openstack_types

server/src/uds/services/OpenStack/service_fixed.py

@@ -35,8 +35,8 @@ import typing
 from django.utils.translation import gettext_noop as _
 
 from uds.core import services, types
-from uds.core.services.specializations.fixed_machine.fixed_service import FixedService
-from uds.core.services.specializations.fixed_machine.fixed_userservice import FixedUserService
+from uds.core.services.generics.fixed_machine.fixed_service import FixedService
+from uds.core.services.generics.fixed_machine.fixed_userservice import FixedUserService
 from uds.core.ui import gui
 from uds.core.util import log
 

server/src/uds/services/PhysicalMachines/deployment.py

@@ -136,6 +136,9 @@ class IPMachineUserService(services.UserService, autoserializable.AutoSerializab
     def deploy_for_user(self, user: 'models.User') -> types.states.TaskState:
         logger.debug("Starting deploy of %s for user %s", self._ip, user)
         return self._deploy()
+    
+    def deploy_for_cache(self, level: types.services.CacheLevel) -> types.states.TaskState:
+        return self._error('Cache deploy not supported')
 
     def assign(self, ip: str) -> types.states.TaskState:
         logger.debug('Assigning from assignable with ip %s', ip)
@@ -148,7 +151,7 @@ class IPMachineUserService(services.UserService, autoserializable.AutoSerializab
                 dbService.save()
         return self._state
 
-    def error(self, reason: str) -> types.states.TaskState:
+    def _error(self, reason: str) -> types.states.TaskState:
         self._state = types.states.TaskState.ERROR
         self._ip = ''
         self._reason = reason

server/src/uds/services/PhysicalMachines/service_multi.py

@@ -327,7 +327,7 @@ class IPMachinesService(IPServiceBase):
             self.storage.save_pickled(host.host, now)
             return ipmachine_instance.assign(host.as_identifier())
 
-        return ipmachine_instance.error('IP already assigned')
+        return ipmachine_instance._error('IP already assigned')
 
     def process_login(self, id: str, remote_login: bool) -> None:
         '''

server/src/uds/services/Proxmox/deployment_fixed.py

@@ -34,7 +34,7 @@ import logging
 import typing
 
 from uds.core import types
-from uds.core.services.specializations.fixed_machine.fixed_userservice import FixedUserService, Operation
+from uds.core.services.generics.fixed_machine.fixed_userservice import FixedUserService, Operation
 from uds.core.util import autoserializable
 
 from . import client

server/src/uds/services/Proxmox/deployment_linked.py

@@ -36,7 +36,7 @@ import logging
 import typing
 
 from uds.core import types, consts
-from uds.core.services.specializations.dynamic_machine.dynamic_userservice import DynamicUserService, Operation
+from uds.core.services.generics.dynamic_machine.dynamic_userservice import DynamicUserService, Operation
 from uds.core.managers.userservice import UserServiceManager
 from uds.core.util import autoserializable
 

server/src/uds/services/Proxmox/publication.py

@@ -35,7 +35,7 @@ import typing
 
 from django.utils.translation import gettext as _
 from uds.core import types
-from uds.core.services.specializations.dynamic_machine.dynamic_publication import DynamicPublication
+from uds.core.services.generics.dynamic_machine.dynamic_publication import DynamicPublication
 from uds.core.util import autoserializable
 
 # Not imported at runtime, just for type checking

server/src/uds/services/Proxmox/service_fixed.py

@@ -35,8 +35,8 @@ import typing
 from django.utils.translation import gettext_noop as _
 
 from uds.core import services, types
-from uds.core.services.specializations.fixed_machine.fixed_service import FixedService
-from uds.core.services.specializations.fixed_machine.fixed_userservice import FixedUserService
+from uds.core.services.generics.fixed_machine.fixed_service import FixedService
+from uds.core.services.generics.fixed_machine.fixed_userservice import FixedUserService
 from uds.core.ui import gui
 from uds.core.util import log
 

server/src/uds/services/Proxmox/service_linked.py

@@ -34,9 +34,9 @@ import typing
 
 from django.utils.translation import gettext_noop as _
 from uds.core import types
-from uds.core.services.specializations.dynamic_machine.dynamic_publication import DynamicPublication
-from uds.core.services.specializations.dynamic_machine.dynamic_service import DynamicService
-from uds.core.services.specializations.dynamic_machine.dynamic_userservice import DynamicUserService
+from uds.core.services.generics.dynamic_machine.dynamic_publication import DynamicPublication
+from uds.core.services.generics.dynamic_machine.dynamic_service import DynamicService
+from uds.core.services.generics.dynamic_machine.dynamic_userservice import DynamicUserService
 from uds.core.ui import gui
 from uds.core.util import validators, log, fields
 
@@ -48,9 +48,9 @@ from .publication import ProxmoxPublication
 if typing.TYPE_CHECKING:
     from . import client
     from .provider import ProxmoxProvider
-    from uds.core.services.specializations.dynamic_machine.dynamic_publication import DynamicPublication
-    from uds.core.services.specializations.dynamic_machine.dynamic_service import DynamicService
-    from uds.core.services.specializations.dynamic_machine.dynamic_userservice import DynamicUserService
+    from uds.core.services.generics.dynamic_machine.dynamic_publication import DynamicPublication
+    from uds.core.services.generics.dynamic_machine.dynamic_service import DynamicService
+    from uds.core.services.generics.dynamic_machine.dynamic_userservice import DynamicUserService
 
 logger = logging.getLogger(__name__)
 

server/src/uds/services/ProxmoxOrig/deployment_fixed.py

@@ -34,7 +34,7 @@ import logging
 import typing
 
 from uds.core import types
-from uds.core.services.specializations.fixed_machine.fixed_userservice import FixedUserService, Operation
+from uds.core.services.generics.fixed_machine.fixed_userservice import FixedUserService, Operation
 from uds.core.util import autoserializable
 
 from . import client

server/src/uds/services/ProxmoxOrig/service_fixed.py

@@ -35,8 +35,8 @@ import typing
 from django.utils.translation import gettext_noop as _
 
 from uds.core import services, types
-from uds.core.services.specializations.fixed_machine.fixed_service import FixedService
-from uds.core.services.specializations.fixed_machine.fixed_userservice import FixedUserService
+from uds.core.services.generics.fixed_machine.fixed_service import FixedService
+from uds.core.services.generics.fixed_machine.fixed_userservice import FixedUserService
 from uds.core.ui import gui
 from uds.core.util import log
 

server/src/uds/services/Xen/deployment_fixed.py

@@ -34,7 +34,7 @@ import logging
 import typing
 
 from uds.core import types
-from uds.core.services.specializations.fixed_machine.fixed_userservice import FixedUserService, Operation
+from uds.core.services.generics.fixed_machine.fixed_userservice import FixedUserService, Operation
 from uds.core.util import log, autoserializable
 
 from . import xen_client

server/src/uds/services/Xen/service_fixed.py

@@ -35,8 +35,8 @@ import collections.abc
 from django.utils.translation import gettext_noop as _
 
 from uds.core import consts, services, types
-from uds.core.services.specializations.fixed_machine.fixed_service import FixedService
-from uds.core.services.specializations.fixed_machine.fixed_userservice import FixedUserService
+from uds.core.services.generics.fixed_machine.fixed_service import FixedService
+from uds.core.services.generics.fixed_machine.fixed_userservice import FixedUserService
 from uds.core.ui import gui
 from uds.core.util import log
 from uds.core.util.decorators import cached

server/tests/services/openstack/test_userservice_fixed.py

@@ -58,8 +58,8 @@ class TestOpenstackLiveService(UDSTransactionTestCase):
                 userservice.db_obj = mock.MagicMock(return_value=userservice_db)
                 # Test Deploy for cache, should raise Exception due
                 # to the fact fixed services cannot have cached items
-                with self.assertRaises(Exception):
-                    userservice.deploy_for_cache(level=types.services.CacheLevel.L1)
+                state = userservice.deploy_for_cache(level=types.services.CacheLevel.L1)
+                self.assertEqual(state, types.states.TaskState.ERROR)
 
                 state = userservice.deploy_for_user(models.User())
 

server/tests/services/physical_machines/test_serialization_deployment.py

@@ -8,19 +8,14 @@
 """
 Author: Adolfo Gómez, dkmaster at dkmon dot com
 """
-import typing
-
 # We use commit/rollback
 
 from tests.utils.test import UDSTestCase
 from uds.core.util import autoserializable
 from uds.core.environment import Environment
-from uds.core.managers import crypto
-
-from django.conf import settings
 
 
-from uds.services.PhysicalMachines import provider, deployment
+from uds.services.PhysicalMachines import deployment
 
 
 class IPMachineUserServiceSerializationTest(UDSTestCase):