renamed classes

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/_provider_computational.py

@@ -41,7 +41,7 @@ def _scheduler_auth(app: FastAPI) -> ClusterAuthentication:
     return app_settings.AUTOSCALING_DASK.DASK_SCHEDULER_AUTH
 
 
-class ComputationalAutoscaling:
+class ComputationalAutoscalingProvider:
     async def get_monitored_nodes(self, app: FastAPI) -> list[Node]:
         return await utils_docker.get_worker_nodes(get_docker_client(app))
 

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/_provider_dynamic.py

@@ -10,7 +10,7 @@
 from ..docker import get_docker_client
 
 
-class DynamicAutoscaling:
+class DynamicAutoscalingProvider:
     async def get_monitored_nodes(self, app: FastAPI) -> list[Node]:
         app_settings = get_application_settings(app)
         assert app_settings.AUTOSCALING_NODES_MONITORING  # nosec

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/auto_scaling_task.py

@@ -11,8 +11,8 @@
 from ...utils.redis import create_lock_key_and_value
 from ..redis import get_redis_client
 from ._auto_scaling_core import auto_scale_cluster
-from ._provider_computational import ComputationalAutoscaling
-from ._provider_dynamic import DynamicAutoscaling
+from ._provider_computational import ComputationalAutoscalingProvider
+from ._provider_dynamic import DynamicAutoscalingProvider
 
 _TASK_NAME: Final[str] = "Autoscaling EC2 instances"
 
@@ -33,9 +33,9 @@ async def _startup() -> None:
             task_name=_TASK_NAME,
             app=app,
             auto_scaling_mode=(
-                DynamicAutoscaling()
+                DynamicAutoscalingProvider()
                 if app_settings.AUTOSCALING_NODES_MONITORING is not None
-                else ComputationalAutoscaling()
+                else ComputationalAutoscalingProvider()
             ),
         )
 

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/buffer_machines_pool_task.py

@@ -11,7 +11,7 @@
 from ...utils.redis import create_lock_key_and_value
 from ..redis import get_redis_client
 from ._buffer_machines_pool_core import monitor_buffer_machines
-from ._provider_dynamic import DynamicAutoscaling
+from ._provider_dynamic import DynamicAutoscalingProvider
 
 _TASK_NAME_BUFFER: Final[str] = "Autoscaling Buffer Machines Pool"
 
@@ -35,7 +35,7 @@ async def _startup() -> None:
             interval=app_settings.AUTOSCALING_POLL_INTERVAL,
             task_name=_TASK_NAME_BUFFER,
             app=app,
-            auto_scaling_mode=(DynamicAutoscaling()),
+            auto_scaling_mode=(DynamicAutoscalingProvider()),
         )
 
     return _startup

services/autoscaling/tests/unit/conftest.py

@@ -80,7 +80,7 @@
 )
 from simcore_service_autoscaling.modules.cluster_scaling import _auto_scaling_core
 from simcore_service_autoscaling.modules.cluster_scaling._provider_dynamic import (
-    DynamicAutoscaling,
+    DynamicAutoscalingProvider,
 )
 from simcore_service_autoscaling.modules.docker import AutoscalingDocker
 from simcore_service_autoscaling.modules.ec2 import SimcoreEC2API
@@ -1185,7 +1185,7 @@ async def _do(
         resource_tags: list[TagTypeDef] = [
             {"Key": tag_key, "Value": tag_value}
             for tag_key, tag_value in get_deactivated_buffer_ec2_tags(
-                DynamicAutoscaling().get_ec2_tags(initialized_app)
+                DynamicAutoscalingProvider().get_ec2_tags(initialized_app)
             ).items()
         ]
         if pre_pull_images is not None and instance_state_name == "stopped":

services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py

@@ -50,7 +50,7 @@
     auto_scale_cluster,
 )
 from simcore_service_autoscaling.modules.cluster_scaling._provider_computational import (
-    ComputationalAutoscaling,
+    ComputationalAutoscalingProvider,
 )
 from simcore_service_autoscaling.modules.dask import DaskTaskResources
 from simcore_service_autoscaling.modules.docker import get_docker_client
@@ -333,7 +333,7 @@ async def test_cluster_scaling_with_no_tasks_does_nothing(
     dask_spec_local_cluster: distributed.SpecCluster,
 ):
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     mock_launch_instances.assert_not_called()
     mock_terminate_instances.assert_not_called()
@@ -371,7 +371,7 @@ async def test_cluster_scaling_with_disabled_ssm_does_not_block_autoscaling(
     dask_spec_local_cluster: distributed.SpecCluster,
 ):
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     mock_launch_instances.assert_not_called()
     mock_terminate_instances.assert_not_called()
@@ -412,7 +412,7 @@ async def test_cluster_scaling_with_task_with_too_much_resources_starts_nothing(
     assert dask_future
 
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     mock_launch_instances.assert_not_called()
     mock_terminate_instances.assert_not_called()
@@ -504,7 +504,7 @@ async def test_cluster_scaling_up_and_down(  # noqa: PLR0915
     assert dask_futures
     # this should trigger a scaling up as we have no nodes
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
 
     # check the instance was started and we have exactly 1
@@ -538,7 +538,7 @@ async def test_cluster_scaling_up_and_down(  # noqa: PLR0915
 
     # 2. running this again should not scale again, but tag the node and make it available
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     mock_dask_get_worker_has_results_in_memory.assert_called_once()
     mock_dask_get_worker_has_results_in_memory.reset_mock()
@@ -636,7 +636,7 @@ async def test_cluster_scaling_up_and_down(  # noqa: PLR0915
     assert fake_attached_node.description
     fake_attached_node.description.hostname = internal_dns_name
 
-    auto_scaling_mode = ComputationalAutoscaling()
+    auto_scaling_mode = ComputationalAutoscalingProvider()
     mocker.patch.object(
         auto_scaling_mode,
         "get_monitored_nodes",
@@ -880,7 +880,7 @@ async def test_cluster_does_not_scale_up_if_defined_instance_is_not_allowed(
 
     # this should trigger a scaling up as we have no nodes
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
 
     # nothing runs
@@ -931,7 +931,7 @@ async def test_cluster_does_not_scale_up_if_defined_instance_is_not_fitting_reso
 
     # this should trigger a scaling up as we have no nodes
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
 
     # nothing runs
@@ -998,7 +998,7 @@ async def test_cluster_scaling_up_starts_multiple_instances(
 
     # run the code
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
 
     # check the instances were started
@@ -1090,7 +1090,7 @@ async def test_cluster_scaling_up_more_than_allowed_max_starts_max_instances_and
 
     # this should trigger a scaling up as we have no nodes
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     await assert_autoscaled_computational_ec2_instances(
         ec2_client,
@@ -1122,7 +1122,7 @@ async def test_cluster_scaling_up_more_than_allowed_max_starts_max_instances_and
     num_useless_calls = 10
     for _ in range(num_useless_calls):
         await auto_scale_cluster(
-            app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+            app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
         )
     await assert_autoscaled_computational_ec2_instances(
         ec2_client,
@@ -1191,7 +1191,7 @@ async def test_cluster_scaling_up_more_than_allowed_with_multiple_types_max_star
 
     # this should trigger a scaling up as we have no nodes
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
 
     # one of each type is created with some that will have 2 instances
@@ -1235,7 +1235,7 @@ async def test_cluster_scaling_up_more_than_allowed_with_multiple_types_max_star
     num_useless_calls = 10
     for _ in range(num_useless_calls):
         await auto_scale_cluster(
-            app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+            app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
         )
     all_instances = await ec2_client.describe_instances()
     assert len(all_instances["Reservations"]) == len(
@@ -1301,7 +1301,7 @@ async def test_long_pending_ec2_is_detected_as_broken_terminated_and_restarted(
 
     # this should trigger a scaling up as we have no nodes
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
 
     # check the instance was started and we have exactly 1
@@ -1345,7 +1345,7 @@ async def test_long_pending_ec2_is_detected_as_broken_terminated_and_restarted(
     # 2. running again several times the autoscaler, the node does not join
     for i in range(7):
         await auto_scale_cluster(
-            app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+            app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
         )
         # there should be no scaling up, since there is already a pending instance
         instances = await assert_autoscaled_computational_ec2_instances(
@@ -1389,7 +1389,7 @@ async def test_long_pending_ec2_is_detected_as_broken_terminated_and_restarted(
     )
     # scaling now will terminate the broken ec2 that did not connect, and directly create a replacement
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     # we have therefore 2 reservations, first instance is terminated and a second one started
     all_instances = await ec2_client.describe_instances()
@@ -1492,7 +1492,7 @@ async def test_cluster_adapts_machines_on_the_fly(
 
     # it will only scale once and do nothing else
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     await assert_autoscaled_computational_ec2_instances(
         ec2_client,
@@ -1519,7 +1519,7 @@ async def test_cluster_adapts_machines_on_the_fly(
     #
     # 2. now the machines are associated
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     analyzed_cluster = assert_cluster_state(
         spied_cluster_analysis,
@@ -1542,7 +1542,7 @@ async def test_cluster_adapts_machines_on_the_fly(
     # scaling will do nothing since we have hit the maximum number of machines
     for _ in range(3):
         await auto_scale_cluster(
-            app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+            app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
         )
         await assert_autoscaled_computational_ec2_instances(
             ec2_client,
@@ -1576,7 +1576,7 @@ async def test_cluster_adapts_machines_on_the_fly(
         autospec=True,
     ) as mock_docker_set_node_found_empty:
         await auto_scale_cluster(
-            app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+            app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
         )
     analyzed_cluster = assert_cluster_state(
         spied_cluster_analysis,
@@ -1601,7 +1601,7 @@ async def test_cluster_adapts_machines_on_the_fly(
         * app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_TIME_BEFORE_DRAINING,
     ) as mocked_get_node_empty_since:
         await auto_scale_cluster(
-            app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+            app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
         )
     mocked_get_node_empty_since.assert_called_once()
     analyzed_cluster = assert_cluster_state(
@@ -1617,7 +1617,7 @@ async def test_cluster_adapts_machines_on_the_fly(
         create_fake_node, drained_machine_instance_id, None
     )
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     analyzed_cluster = assert_cluster_state(
         spied_cluster_analysis,
@@ -1637,7 +1637,7 @@ async def test_cluster_adapts_machines_on_the_fly(
     ):
         mock_docker_tag_node.reset_mock()
         await auto_scale_cluster(
-            app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+            app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
         )
     analyzed_cluster = assert_cluster_state(
         spied_cluster_analysis,
@@ -1656,7 +1656,7 @@ async def test_cluster_adapts_machines_on_the_fly(
         create_fake_node, drained_machine_instance_id, drained_machine_instance_id
     )
     await auto_scale_cluster(
-        app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+        app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
     )
     analyzed_cluster = assert_cluster_state(
         spied_cluster_analysis,
@@ -1681,7 +1681,7 @@ async def test_cluster_adapts_machines_on_the_fly(
             autospec=True,
         )
         await auto_scale_cluster(
-            app=initialized_app, auto_scaling_mode=ComputationalAutoscaling()
+            app=initialized_app, auto_scaling_mode=ComputationalAutoscalingProvider()
         )
         mocked_docker_remove_node.assert_called_once()