fix: duplicate deployments in the non-lazy but early deployment case

In that case, we need to 'exfiltrate' the used_deployments hash from the network
generation step to pass to runtime network adaptation.

Author: doudou

lib/syskit/network_generation/engine.rb

@@ -89,6 +89,7 @@ def initialize(
                     event_logger: event_logger,
                     resolution_control: resolution_control
                 )
+                @used_deployments = {}
                 @required_instances = {}
             end
 
@@ -127,10 +128,11 @@ def compute_deployed_network(
                         resolution_control: @resolution_control
                     )
 
-                    @used_deployments, = deployer.deploy(
+                    used_deployments, = deployer.deploy(
                         error_handler: error_handler, validate: validate_deployed_network,
                         lazy: lazy_deploy
                     )
+                    @used_deployments = @used_deployments.merge(used_deployments)
                     resolution_errors = error_handler.process_failures(
                         required_instances, cleanup_failed_tasks: true
                     )
@@ -392,7 +394,7 @@ def compute_system_network(
                         instance_requirements
                     )
 
-                system_network_generator.resolve_system_network(
+                _, @used_deployments = system_network_generator.resolve_system_network(
                     garbage_collect: garbage_collect,
                     validate_abstract_network: validate_abstract_network,
                     validate_generated_network: validate_generated_network,

lib/syskit/network_generation/runtime_network_adaptation.rb

@@ -470,6 +470,7 @@ def adapt_existing_deployed_task(
                 task, existing_tasks, existing_deployment_task
             )
                 existing_task = find_current_deployed_task(existing_tasks)
+                return if task == existing_task
 
                 if !existing_task || !task.can_be_deployed_by?(existing_task)
                     new_task = adapt_existing_create_new(

lib/syskit/network_generation/system_network_generator.rb

@@ -268,6 +268,7 @@ def resolve_system_network(
                 validate_deployed_network: true
             )
                 deployment_tasks = {}
+                @used_deployments = {}
                 early_deploy(deployment_tasks)
 
                 merge_solver.merge_identical_tasks
@@ -322,13 +323,16 @@ def resolve_system_network(
                         early_deploy? && validate_deployed_network
                 )
                 interruption_point("syskit-netgen:validation")
-                @toplevel_tasks
+
+                @used_deployments.transform_keys! { @merge_solver.replacement_for(_1) }
+                [@toplevel_tasks, @used_deployments]
             end
 
             def early_deploy(deployment_tasks)
                 return unless early_deploy?
 
-                deploy(deployment_tasks)
+                used_deployments, = deploy(deployment_tasks)
+                @used_deployments.merge!(used_deployments)
                 interruption_point "syskit-netgen:early-deploy"
             end