renaming

Author: sanderegg

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

@@ -53,7 +53,7 @@
 )
 from ...utils.warm_buffer_machines import (
     get_activated_warm_buffer_ec2_tags,
-    get_deactivated_buffer_ec2_tags,
+    get_deactivated_warm_buffer_ec2_tags,
     is_warm_buffer_machine,
 )
 from ..docker import get_docker_client
@@ -91,7 +91,7 @@ async def _analyze_current_cluster(
 
     warm_buffer_ec2_instances = await get_ec2_client(app).get_instances(
         key_names=[app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_KEY_NAME],
-        tags=get_deactivated_buffer_ec2_tags(auto_scaling_mode.get_ec2_tags(app)),
+        tags=get_deactivated_warm_buffer_ec2_tags(auto_scaling_mode.get_ec2_tags(app)),
         state_names=["stopped"],
     )
 

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

@@ -44,8 +44,8 @@
 from ...models import WarmBufferPool, WarmBufferPoolManager
 from ...utils.warm_buffer_machines import (
     dump_pre_pulled_images_as_tags,
-    ec2_buffer_startup_script,
-    get_deactivated_buffer_ec2_tags,
+    ec2_warm_buffer_startup_script,
+    get_deactivated_warm_buffer_ec2_tags,
     load_pre_pulled_images_from_tags,
 )
 from ..ec2 import get_ec2_client
@@ -156,7 +156,7 @@ async def _analyse_current_state(
 
     all_buffer_instances = await ec2_client.get_instances(
         key_names=[app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_KEY_NAME],
-        tags=get_deactivated_buffer_ec2_tags(auto_scaling_mode.get_ec2_tags(app)),
+        tags=get_deactivated_warm_buffer_ec2_tags(auto_scaling_mode.get_ec2_tags(app)),
         state_names=["stopped", "pending", "running", "stopping"],
     )
     buffers_manager = WarmBufferPoolManager()
@@ -302,10 +302,10 @@ async def _add_remove_buffer_instances(
                     name=ec2_type,
                     resources=Resources.create_as_empty(),  # fake resources
                 ),
-                tags=get_deactivated_buffer_ec2_tags(
+                tags=get_deactivated_warm_buffer_ec2_tags(
                     auto_scaling_mode.get_ec2_tags(app)
                 ),
-                startup_script=ec2_buffer_startup_script(
+                startup_script=ec2_warm_buffer_startup_script(
                     ec2_boot_specific, app_settings
                 ),
                 ami_id=ec2_boot_specific.ami_id,

services/autoscaling/src/simcore_service_autoscaling/utils/warm_buffer_machines.py

@@ -25,7 +25,7 @@ def get_activated_warm_buffer_ec2_tags(base_ec2_tags: EC2Tags) -> EC2Tags:
     return base_ec2_tags | ACTIVATED_BUFFER_MACHINE_EC2_TAGS
 
 
-def get_deactivated_buffer_ec2_tags(base_ec2_tags: EC2Tags) -> EC2Tags:
+def get_deactivated_warm_buffer_ec2_tags(base_ec2_tags: EC2Tags) -> EC2Tags:
     new_base_ec2_tags = base_ec2_tags | DEACTIVATED_BUFFER_MACHINE_EC2_TAGS
     new_base_ec2_tags[_NAME_EC2_TAG_KEY] = TypeAdapter(AWSTagValue).validate_python(
         f"{new_base_ec2_tags[_NAME_EC2_TAG_KEY]}-buffer"
@@ -90,7 +90,7 @@ def load_pre_pulled_images_from_tags(tags: EC2Tags) -> list[DockerGenericTag]:
     return []
 
 
-def ec2_buffer_startup_script(
+def ec2_warm_buffer_startup_script(
     ec2_boot_specific: EC2InstanceBootSpecific, app_settings: ApplicationSettings
 ) -> str:
     startup_commands = ec2_boot_specific.custom_boot_scripts.copy()

services/autoscaling/tests/unit/conftest.py

@@ -40,6 +40,9 @@
 )
 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,
@@ -49,7 +52,6 @@
     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
@@ -87,7 +89,7 @@
     _OSPARC_SERVICES_READY_DATETIME_LABEL_KEY,
 )
 from simcore_service_autoscaling.utils.warm_buffer_machines import (
-    get_deactivated_buffer_ec2_tags,
+    get_deactivated_warm_buffer_ec2_tags,
 )
 from tenacity import after_log, before_sleep_log, retry
 from tenacity.retry import retry_if_exception_type
@@ -753,9 +755,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']}",
@@ -982,9 +984,7 @@ 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)
@@ -1125,12 +1125,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()
@@ -1154,9 +1154,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
 
 
@@ -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(
+            for tag_key, tag_value in get_deactivated_warm_buffer_ec2_tags(
                 DynamicAutoscalingProvider().get_ec2_tags(initialized_app)
             ).items()
         ]

services/autoscaling/tests/unit/test_utils_warm_buffer_machines.py

@@ -23,7 +23,7 @@
 from simcore_service_autoscaling.utils.warm_buffer_machines import (
     dump_pre_pulled_images_as_tags,
     get_activated_warm_buffer_ec2_tags,
-    get_deactivated_buffer_ec2_tags,
+    get_deactivated_warm_buffer_ec2_tags,
     is_warm_buffer_machine,
     load_pre_pulled_images_from_tags,
 )
@@ -56,7 +56,7 @@ def test_get_deactivated_buffer_ec2_tags_dynamic(
     initialized_app: FastAPI,
 ):
     auto_scaling_mode = DynamicAutoscalingProvider()
-    deactivated_buffer_tags = get_deactivated_buffer_ec2_tags(
+    deactivated_buffer_tags = get_deactivated_warm_buffer_ec2_tags(
         auto_scaling_mode.get_ec2_tags(initialized_app)
     )
     # when deactivated the buffer EC2 name has an additional -buffer suffix
@@ -98,7 +98,7 @@ def test_get_deactivated_buffer_ec2_tags_computational(
     initialized_app: FastAPI,
 ):
     auto_scaling_mode = ComputationalAutoscalingProvider()
-    deactivated_buffer_tags = get_deactivated_buffer_ec2_tags(
+    deactivated_buffer_tags = get_deactivated_warm_buffer_ec2_tags(
         auto_scaling_mode.get_ec2_tags(initialized_app)
     )
     # when deactivated the buffer EC2 name has an additional -buffer suffix