feat: merge DeploymentModel.from_stale_hosted_entities and _get_recon…

…figure_operation_hosts

tdp/core/models/deployment_model.py

@@ -342,13 +342,33 @@ def from_stale_hosted_entities(
         Raises:
             NothingToReconfigureError: If no component needs to be reconfigured.
         """
-        operation_hosts = _get_reconfigure_operation_hosts(
-            stale_hosted_entity_statuses, collections
+        operation_hosts: set[OperationHostTuple] = set()
+        for status in stale_hosted_entity_statuses:
+            if status.to_config:
+                operation_hosts.add(
+                    OperationHostTuple(
+                        collections.operations[f"{status.entity.name}_config"],
+                        status.entity.host,
+                    )
+                )
+            if status.to_restart:
+                operation_hosts.add(
+                    OperationHostTuple(
+                        collections.operations[f"{status.entity.name}_start"],
+                        status.entity.host,
+                    )
+                )
+        if len(operation_hosts) == 0:
+            raise NothingToReconfigureError("No component needs to be reconfigured.")
+
+        # Sort by hosts to improve readability
+        operation_hosts_sorted = sorted(
+            operation_hosts, key=lambda x: f"{x.operation.name}_{x.host_name}"
         )
 
         # Sort operations using DAG topological sort.
         reconfigure_operations_sorted = Dag(collections).topological_sort_key(
-            operation_hosts, key=lambda x: x.operation.name
+            operation_hosts_sorted, key=lambda x: x.operation.name
         )
 
         # Generate deployment
@@ -472,36 +492,3 @@ class OperationHostTuple(NamedTuple):
 
     operation: Operation
     host_name: Optional[str]
-
-
-def _get_reconfigure_operation_hosts(
-    hosted_entity_statuses: list[HostedEntityStatus],
-    collections: Collections,
-) -> list[OperationHostTuple]:
-    """Generate a list of config and restart operation associated with their host.
-
-    Args:
-        hosted_entity_statuses: List of hosted entities statuses.
-
-    Returns: List of tuple (operation, host) ordered <operation-name>_<host>.
-    """
-    operation_hosts: set[OperationHostTuple] = set()
-    for status in hosted_entity_statuses:
-        if status.to_config:
-            operation_hosts.add(
-                OperationHostTuple(
-                    collections.operations[f"{status.entity.name}_config"],
-                    status.entity.host,
-                )
-            )
-        if status.to_restart:
-            operation_hosts.add(
-                OperationHostTuple(
-                    collections.operations[f"{status.entity.name}_start"],
-                    status.entity.host,
-                )
-            )
-    if len(operation_hosts) == 0:
-        raise NothingToReconfigureError("No component needs to be reconfigured.")
-    # Sort by hosts to improve readability
-    return sorted(operation_hosts, key=lambda x: f"{x.operation.name}_{x.host_name}")