diff --git a/server/src/uds/core/managers/userservice.py b/server/src/uds/core/managers/userservice.py index efa516f90..3bd1c8ee2 100644 --- a/server/src/uds/core/managers/userservice.py +++ b/server/src/uds/core/managers/userservice.py @@ -741,7 +741,7 @@ def is_userservice_removal_allowed(self, service_pool: ServicePool) -> bool: ) or service_pool.service.provider.is_in_maintenance() or service_pool.is_restrained() - or not service_instance.is_avaliable() + or not service_instance.is_available() ): return False @@ -1243,7 +1243,7 @@ def _ensure_transport( if meta.ha_policy == types.pools.HighAvailabilityPolicy.ENABLED: # Check that servide is accessible if ( - not already_assigned.deployed_service.service.get_instance().is_avaliable() + not already_assigned.deployed_service.service.get_instance().is_available() ): # Not available, mark for removal already_assigned.release() raise Exception() # And process a new access @@ -1267,7 +1267,7 @@ def _ensure_transport( for pool in pools: # Pools are already sorted, and "full" pools are filtered out if meta.ha_policy == types.pools.HighAvailabilityPolicy.ENABLED: # If not available, skip it - if pool.service.get_instance().is_avaliable() is False: + if pool.service.get_instance().is_available() is False: continue # Ensure transport is available for the OS diff --git a/server/src/uds/core/services/service.py b/server/src/uds/core/services/service.py index fe68802e2..09a4f44c1 100644 --- a/server/src/uds/core/services/service.py +++ b/server/src/uds/core/services/service.py @@ -265,7 +265,7 @@ def provider(self) -> 'services.ServiceProvider': """ return self._provider - def is_avaliable(self) -> bool: + def is_available(self) -> bool: """ Returns if this service is reachable (that is, we can operate with it). This is used, for example, to check if a service is "operable" before removing an user service (pass from "waiting for removal" to "removing") diff --git a/server/src/uds/services/OVirt/service_linked.py b/server/src/uds/services/OVirt/service_linked.py index e98962162..1bea36ca6 100644 --- a/server/src/uds/services/OVirt/service_linked.py +++ b/server/src/uds/services/OVirt/service_linked.py @@ -338,7 +338,7 @@ def get_display(self) -> str: def get_console_connection(self, vmid: str) -> typing.Optional[types.services.ConsoleConnectionInfo]: return self.provider().api.get_console_connection_info(vmid) - def is_avaliable(self) -> bool: + def is_available(self) -> bool: return self.provider().is_available() def try_graceful_shutdown(self) -> bool: diff --git a/server/src/uds/services/OpenGnsys/service.py b/server/src/uds/services/OpenGnsys/service.py index bafe72575..1bec040af 100644 --- a/server/src/uds/services/OpenGnsys/service.py +++ b/server/src/uds/services/OpenGnsys/service.py @@ -203,5 +203,5 @@ def get_relase_url(self, uuid: str, token: str) -> str: def try_start_if_unavailable(self) -> bool: return self.start_if_unavailable.as_bool() - def is_avaliable(self) -> bool: + def is_available(self) -> bool: return self.provider().is_available() diff --git a/server/src/uds/services/OpenNebula/service.py b/server/src/uds/services/OpenNebula/service.py index 95cb07dfc..1a6387949 100644 --- a/server/src/uds/services/OpenNebula/service.py +++ b/server/src/uds/services/OpenNebula/service.py @@ -310,5 +310,5 @@ def desktop_login( ) -> typing.Optional[types.services.ConsoleConnectionInfo]: return self.provider().desktop_login(vmid, username, password, domain) - def is_avaliable(self) -> bool: + def is_available(self) -> bool: return self.provider().is_available() diff --git a/server/src/uds/services/OpenStack/service.py b/server/src/uds/services/OpenStack/service.py index eac81b26c..aff2c1b58 100644 --- a/server/src/uds/services/OpenStack/service.py +++ b/server/src/uds/services/OpenStack/service.py @@ -356,5 +356,5 @@ def deploy_from_template(self, name: str, snapshot_id: str) -> openstack_types.S security_groups_names=self.security_groups.value, ) - def is_avaliable(self) -> bool: + def is_available(self) -> bool: return self.provider().is_available() diff --git a/server/src/uds/services/OpenStack/service_fixed.py b/server/src/uds/services/OpenStack/service_fixed.py index 8157732a2..2c6714400 100644 --- a/server/src/uds/services/OpenStack/service_fixed.py +++ b/server/src/uds/services/OpenStack/service_fixed.py @@ -146,7 +146,7 @@ def init_gui(self) -> None: def provider(self) -> 'AnyOpenStackProvider': return typing.cast('AnyOpenStackProvider', super().provider()) - def is_avaliable(self) -> bool: + def is_available(self) -> bool: return self.provider().is_available() def enumerate_assignables(self) -> collections.abc.Iterable[types.ui.ChoiceItem]: diff --git a/server/src/uds/services/PhysicalMachines/service_multi.py b/server/src/uds/services/PhysicalMachines/service_multi.py index f8638d0e6..babf2f32a 100644 --- a/server/src/uds/services/PhysicalMachines/service_multi.py +++ b/server/src/uds/services/PhysicalMachines/service_multi.py @@ -279,5 +279,5 @@ def wakeup(self, host: str, mac: str, verify_ssl: bool = False) -> None: # Phisical machines does not have "real" providers, so # always is available - def is_avaliable(self) -> bool: + def is_available(self) -> bool: return True diff --git a/server/src/uds/services/PhysicalMachines/service_single.py b/server/src/uds/services/PhysicalMachines/service_single.py index c7de68250..f481e15d5 100644 --- a/server/src/uds/services/PhysicalMachines/service_single.py +++ b/server/src/uds/services/PhysicalMachines/service_single.py @@ -121,5 +121,5 @@ def get_counter_and_inc(self) -> int: # Phisical machines does not have "real" providers, so # always is available - def is_avaliable(self) -> bool: + def is_available(self) -> bool: return True diff --git a/server/src/uds/services/Xen/service.py b/server/src/uds/services/Xen/service.py index 3cc2474ca..471c0acfd 100644 --- a/server/src/uds/services/Xen/service.py +++ b/server/src/uds/services/Xen/service.py @@ -216,7 +216,7 @@ def has_datastore_space(self) -> None: ) ) - def is_avaliable(self) -> bool: + def is_available(self) -> bool: return self.provider().is_available() def sanitized_name(self, name: str) -> str: diff --git a/server/src/uds/services/Xen/service_fixed.py b/server/src/uds/services/Xen/service_fixed.py index 96cf042c1..8f6b11f94 100644 --- a/server/src/uds/services/Xen/service_fixed.py +++ b/server/src/uds/services/Xen/service_fixed.py @@ -164,7 +164,7 @@ def shutdown_vm(self, vmid: str) -> str: return '' # Already stopped - def is_avaliable(self) -> bool: + def is_available(self) -> bool: return self.provider().is_available() def enumerate_assignables(self) -> collections.abc.Iterable[types.ui.ChoiceItem]: diff --git a/server/tests/services/openstack/test_service.py b/server/tests/services/openstack/test_service.py index 53848abd1..b43376dee 100644 --- a/server/tests/services/openstack/test_service.py +++ b/server/tests/services/openstack/test_service.py @@ -102,7 +102,7 @@ def test_service(self) -> None: service.api.delete_server(server.id) api.delete_server.assert_called_once_with(server.id) - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) api.is_available.assert_called_once_with() self.assertEqual(service.get_basename(), service.basename.value) diff --git a/server/tests/services/openstack/test_service_fixed.py b/server/tests/services/openstack/test_service_fixed.py index 58862a7ab..77831d746 100644 --- a/server/tests/services/openstack/test_service_fixed.py +++ b/server/tests/services/openstack/test_service_fixed.py @@ -53,7 +53,7 @@ def test_service_fixed(self) -> None: userservice = fixtures.create_fixed_userservice(service) # Test service is_available method - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) api.is_available.assert_called() # assignables should be same as service.macines diff --git a/server/tests/services/ovirt/test_service_linked.py b/server/tests/services/ovirt/test_service_linked.py index e6801970f..d70198a04 100644 --- a/server/tests/services/ovirt/test_service_linked.py +++ b/server/tests/services/ovirt/test_service_linked.py @@ -59,17 +59,17 @@ def test_service_is_available(self) -> None: with fixtures.patch_provider_api() as api: service = fixtures.create_linked_service() - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) api.test.assert_called_with() # With data cached, even if test fails, it will return True api.test.return_value = False - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) # Data is cached, so we need to reset it api.test.reset_mock() service.provider().is_available.cache_clear() # type: ignore # Now should return False as we have reset the cache - self.assertFalse(service.is_avaliable()) + self.assertFalse(service.is_available()) api.test.assert_called_with() def test_verify_free_storage(self) -> None: diff --git a/server/tests/services/physical_machines/test_service_multi.py b/server/tests/services/physical_machines/test_service_multi.py index 0a313ac81..aafe6a2f4 100644 --- a/server/tests/services/physical_machines/test_service_multi.py +++ b/server/tests/services/physical_machines/test_service_multi.py @@ -68,7 +68,7 @@ def test_service_is_available(self) -> None: Test the provider """ service = fixtures.create_service_multi() - self.assertTrue(service.is_avaliable()) # Always available + self.assertTrue(service.is_available()) # Always available def test_wakeup(self) -> None: # Patch security.secure_requests_session diff --git a/server/tests/services/physical_machines/test_service_single.py b/server/tests/services/physical_machines/test_service_single.py index e901d7751..0924afc52 100644 --- a/server/tests/services/physical_machines/test_service_single.py +++ b/server/tests/services/physical_machines/test_service_single.py @@ -48,7 +48,7 @@ def test_service_is_available(self) -> None: Test the provider """ service = fixtures.create_service_single() - self.assertTrue(service.is_avaliable()) # Always available + self.assertTrue(service.is_available()) # Always available def test_wakeup(self) -> None: # Patch security.secure_requests_session diff --git a/server/tests/services/proxmox/test_service_fixed.py b/server/tests/services/proxmox/test_service_fixed.py index fb6be5305..b82c83023 100644 --- a/server/tests/services/proxmox/test_service_fixed.py +++ b/server/tests/services/proxmox/test_service_fixed.py @@ -53,17 +53,17 @@ def test_service_is_available(self) -> None: api = typing.cast(mock.MagicMock, provider.api) service = fixtures.create_service_fixed(provider=provider) - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) api.test.assert_called_with() # With data cached, even if test fails, it will return True api.test.return_value = False - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) # Data is cached, so we need to reset it api.test.reset_mock() service.provider().is_available.cache_clear() # type: ignore # Now should return False as we have reset the cache - self.assertFalse(service.is_avaliable()) + self.assertFalse(service.is_available()) api.test.assert_called_with() def test_service_methods_1(self) -> None: diff --git a/server/tests/services/proxmox/test_service_linked.py b/server/tests/services/proxmox/test_service_linked.py index f17f7cad9..d56adccad 100644 --- a/server/tests/services/proxmox/test_service_linked.py +++ b/server/tests/services/proxmox/test_service_linked.py @@ -61,17 +61,17 @@ def test_service_is_available(self) -> None: api = typing.cast(mock.MagicMock, provider.api) service = fixtures.create_service_linked(provider=provider) - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) api.test.assert_called_with() # With data cached, even if test fails, it will return True api.test.return_value = False - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) # Data is cached, so we need to reset it api.test.reset_mock() service.provider().is_available.cache_clear() # type: ignore # Now should return False as we have reset the cache - self.assertFalse(service.is_avaliable()) + self.assertFalse(service.is_available()) api.test.assert_called_with() def test_service_is_deleted(self) -> None: @@ -159,4 +159,4 @@ def test_service_methods_2(self) -> None: self.assertEqual(service.get_console_connection('1'), fixtures.CONSOLE_CONNECTION_INFO) # Is available - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) diff --git a/server/tests/services/xen/test_service_fixed.py b/server/tests/services/xen/test_service_fixed.py index ced5a3014..bb4c08fb8 100644 --- a/server/tests/services/xen/test_service_fixed.py +++ b/server/tests/services/xen/test_service_fixed.py @@ -55,17 +55,17 @@ def test_service_is_available(self) -> None: api = typing.cast(mock.MagicMock, provider.api) service = fixtures.create_service_fixed(provider=provider) - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) api.test.assert_called_with() # With data cached, even if test fails, it will return True api.test.side_effect = Exception('Testing exception') - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) # Data is cached, so we need to reset it api.test.reset_mock() service.provider().is_available.cache_clear() # type: ignore # Now should return False as we have reset the cache - self.assertFalse(service.is_avaliable()) + self.assertFalse(service.is_available()) api.test.assert_called_with() def test_service_vm_methods(self) -> None: diff --git a/server/tests/services/xen/test_service_linked.py b/server/tests/services/xen/test_service_linked.py index 87e97a670..2b83fec0d 100644 --- a/server/tests/services/xen/test_service_linked.py +++ b/server/tests/services/xen/test_service_linked.py @@ -84,17 +84,17 @@ def test_service_is_available(self) -> None: api = typing.cast(mock.MagicMock, provider.api) service = fixtures.create_service_linked(provider=provider) - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) api.test.assert_called_with() # With data cached, even if test fails, it will return True api.test.side_effect = Exception('Testing exception') - self.assertTrue(service.is_avaliable()) + self.assertTrue(service.is_available()) # Data is cached, so we need to reset it api.test.reset_mock() service.provider().is_available.cache_clear() # type: ignore # Now should return False as we have reset the cache - self.assertFalse(service.is_avaliable()) + self.assertFalse(service.is_available()) api.test.assert_called_with() def test_start_deploy_of_template(self) -> None: