renaming

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/modules/instrumentation/_models.py

@@ -110,7 +110,7 @@ def instance_terminated(self, instance_type: str) -> None:
 
 
 @dataclass(slots=True, kw_only=True)
-class BufferPoolsMetrics(MetricsBase):
+class WarmBufferPoolsMetrics(MetricsBase):
     ready_instances: TrackedGauge = field(init=False)
     pending_instances: TrackedGauge = field(init=False)
     waiting_to_pull_instances: TrackedGauge = field(init=False)
@@ -183,19 +183,15 @@ class AutoscalingInstrumentation(MetricsBase):
 
     cluster_metrics: ClusterMetrics = field(init=False)
     ec2_client_metrics: EC2ClientMetrics = field(init=False)
-    buffer_machines_pools_metrics: BufferPoolsMetrics = field(init=False)
+    buffer_machines_pools_metrics: WarmBufferPoolsMetrics = field(init=False)
 
     def __post_init__(self) -> None:
         self.cluster_metrics = ClusterMetrics(  # pylint: disable=unexpected-keyword-arg
             subsystem=self.subsystem, registry=self.registry
         )
-        self.ec2_client_metrics = (
-            EC2ClientMetrics(  # pylint: disable=unexpected-keyword-arg
-                subsystem=self.subsystem, registry=self.registry
-            )
+        self.ec2_client_metrics = EC2ClientMetrics(  # pylint: disable=unexpected-keyword-arg
+            subsystem=self.subsystem, registry=self.registry
         )
-        self.buffer_machines_pools_metrics = (
-            BufferPoolsMetrics(  # pylint: disable=unexpected-keyword-arg
-                subsystem=self.subsystem, registry=self.registry
-            )
+        self.buffer_machines_pools_metrics = WarmBufferPoolsMetrics(  # pylint: disable=unexpected-keyword-arg
+            subsystem=self.subsystem, registry=self.registry
         )

services/autoscaling/tests/unit/conftest.py

@@ -40,9 +40,6 @@
 )
 from models_library.generated_models.docker_rest_api import (
     Availability,
-)
-from models_library.generated_models.docker_rest_api import Node as DockerNode
-from models_library.generated_models.docker_rest_api import (
     NodeDescription,
     NodeSpec,
     NodeState,
@@ -52,6 +49,7 @@
     Service,
     TaskSpec,
 )
+from models_library.generated_models.docker_rest_api import Node as DockerNode
 from pydantic import ByteSize, NonNegativeInt, PositiveInt, TypeAdapter
 from pytest_mock import MockType
 from pytest_mock.plugin import MockerFixture
@@ -84,13 +82,13 @@
 )
 from simcore_service_autoscaling.modules.docker import AutoscalingDocker
 from simcore_service_autoscaling.modules.ec2 import SimcoreEC2API
-from simcore_service_autoscaling.utils.buffer_machines import (
-    get_deactivated_buffer_ec2_tags,
-)
 from simcore_service_autoscaling.utils.utils_docker import (
     _OSPARC_SERVICE_READY_LABEL_KEY,
     _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY,
 )
+from simcore_service_autoscaling.utils.warm_buffer_machines import (
+    get_deactivated_buffer_ec2_tags,
+)
 from tenacity import after_log, before_sleep_log, retry
 from tenacity.retry import retry_if_exception_type
 from tenacity.stop import stop_after_delay
@@ -754,9 +752,9 @@ async def _() -> None:
             assert tasks, f"no tasks available for {found_service['Spec']['Name']}"
             assert len(tasks) == 1
             service_task = tasks[0]
-            assert (
-                service_task["Status"]["State"] in expected_states
-            ), f"service {found_service['Spec']['Name']}'s task is {service_task['Status']['State']}"
+            assert service_task["Status"]["State"] in expected_states, (
+                f"service {found_service['Spec']['Name']}'s task is {service_task['Status']['State']}"
+            )
             ctx.logger.info(
                 "%s",
                 f"service {found_service['Spec']['Name']} is now {service_task['Status']['State']} {'.' * number_of_success['count']}",
@@ -983,7 +981,9 @@ def _creator(
         assert (
             datetime.timedelta(seconds=10)
             < app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_TIME_BEFORE_TERMINATION
-        ), "this tests relies on the fact that the time before termination is above 10 seconds"
+        ), (
+            "this tests relies on the fact that the time before termination is above 10 seconds"
+        )
         assert app_settings.AUTOSCALING_EC2_INSTANCES
         seconds_delta = (
             -datetime.timedelta(seconds=10)
@@ -1124,12 +1124,12 @@ def ec2_instances_allowed_types_with_only_1_buffered(
             allowed_ec2_types.items(),
         )
     )
-    assert (
-        allowed_ec2_types_with_buffer_defined
-    ), "one type with buffer is needed for the tests!"
-    assert (
-        len(allowed_ec2_types_with_buffer_defined) == 1
-    ), "more than one type with buffer is disallowed in this test!"
+    assert allowed_ec2_types_with_buffer_defined, (
+        "one type with buffer is needed for the tests!"
+    )
+    assert len(allowed_ec2_types_with_buffer_defined) == 1, (
+        "more than one type with buffer is disallowed in this test!"
+    )
     return {
         TypeAdapter(InstanceTypeType).validate_python(k): v
         for k, v in allowed_ec2_types_with_buffer_defined.items()
@@ -1153,9 +1153,9 @@ def _by_buffer_count(
         filter(_by_buffer_count, allowed_ec2_types.items())
     )
     assert allowed_ec2_types_with_buffer_defined, "you need one type with buffer"
-    assert (
-        len(allowed_ec2_types_with_buffer_defined) == 1
-    ), "more than one type with buffer is disallowed in this test!"
+    assert len(allowed_ec2_types_with_buffer_defined) == 1, (
+        "more than one type with buffer is disallowed in this test!"
+    )
     return next(iter(allowed_ec2_types_with_buffer_defined.values())).buffer_count
 
 

services/autoscaling/tests/unit/test_modules_instrumentation_models.py

@@ -1,22 +1,22 @@
 from dataclasses import is_dataclass
 
 import pytest
-from simcore_service_autoscaling.models import BufferPool, Cluster
+from simcore_service_autoscaling.models import Cluster, WarmBufferPool
 from simcore_service_autoscaling.modules.instrumentation._constants import (
-    BUFFER_POOLS_METRICS_DEFINITIONS,
     CLUSTER_METRICS_DEFINITIONS,
+    WARM_BUFFER_POOLS_METRICS_DEFINITIONS,
 )
 from simcore_service_autoscaling.modules.instrumentation._models import (
-    BufferPoolsMetrics,
     ClusterMetrics,
+    WarmBufferPoolsMetrics,
 )
 
 
 @pytest.mark.parametrize(
     "class_name, metrics_class_name, metrics_definitions",
     [
         (Cluster, ClusterMetrics, CLUSTER_METRICS_DEFINITIONS),
-        (BufferPool, BufferPoolsMetrics, BUFFER_POOLS_METRICS_DEFINITIONS),
+        (WarmBufferPool, WarmBufferPoolsMetrics, WARM_BUFFER_POOLS_METRICS_DEFINITIONS),
     ],
 )
 def test_models_are_in_sync(
@@ -27,9 +27,9 @@ def test_models_are_in_sync(
     assert is_dataclass(class_name)
     assert is_dataclass(metrics_class_name)
     for field in class_name.__dataclass_fields__:
-        assert (
-            field in metrics_definitions
-        ), f"{metrics_definitions.__qualname__} is missing {field}"
-        assert hasattr(
-            metrics_class_name, field
-        ), f"{metrics_class_name.__qualname__} is missing {field}"
+        assert field in metrics_definitions, (
+            f"{metrics_definitions.__qualname__} is missing {field}"
+        )
+        assert hasattr(metrics_class_name, field), (
+            f"{metrics_class_name.__qualname__} is missing {field}"
+        )

services/autoscaling/tests/unit/test_utils_buffer_machines.py

@@ -20,11 +20,11 @@
 from simcore_service_autoscaling.modules.cluster_scaling._provider_dynamic import (
     DynamicAutoscalingProvider,
 )
-from simcore_service_autoscaling.utils.buffer_machines import (
+from simcore_service_autoscaling.utils.warm_buffer_machines import (
     dump_pre_pulled_images_as_tags,
     get_activated_buffer_ec2_tags,
     get_deactivated_buffer_ec2_tags,
-    is_buffer_machine,
+    is_warm_buffer_machine,
     load_pre_pulled_images_from_tags,
 )
 
@@ -121,7 +121,7 @@ def test_get_deactivated_buffer_ec2_tags_computational(
     ],
 )
 def test_is_buffer_machine(tags: EC2Tags, expected_is_buffer: bool):
-    assert is_buffer_machine(tags) is expected_is_buffer
+    assert is_warm_buffer_machine(tags) is expected_is_buffer
 
 
 @pytest.mark.parametrize(