slapos_cloud: allow to propagate a single instance

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputePartition_propagateRemoteNode.py

@@ -11,22 +11,26 @@ assert remote_node.getPortalType() == 'Remote Node'
 remote_project = remote_node.getDestinationProjectValue(portal_type='Project')
 remote_person = remote_node.getDestinationSectionValue(portal_type='Person')
 
-if compute_partition.getId() == 'SHARED_REMOTE':
-  # Hardcoded ID behaviour
-  local_instance_list = portal.portal_catalog(
-    portal_type='Slave Instance',
-    aggregate__uid=compute_partition.getUid(),
-    validation_state='validated'
-  )
+if local_instance_list is None:
+  if compute_partition.getId() == 'SHARED_REMOTE':
+    # Hardcoded ID behaviour
+    local_instance_list = portal.portal_catalog(
+      portal_type='Slave Instance',
+      aggregate__uid=compute_partition.getUid(),
+      validation_state='validated'
+    )
 
+  else:
+    local_instance_list = portal.portal_catalog(
+      portal_type='Software Instance',
+      aggregate__uid=compute_partition.getUid(),
+      validation_state='validated'
+    )
 else:
-  local_instance_list = portal.portal_catalog(
-    portal_type='Software Instance',
-    aggregate__uid=compute_partition.getUid(),
-    validation_state='validated'
-  )
+  local_instance_list = [portal.restrictedTraverse(x) for x in local_instance_list]
 
 for local_instance in local_instance_list:
+  assert local_instance.getAggregate() == compute_partition.getRelativeUrl()
 
   # If local instance destruction has been propagated, do nothing
   if local_instance.getValidationState() != 'validated':

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputePartition_propagateRemoteNode.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>activate_kw=None, REQUEST=None</string> </value>
+            <value> <string>local_instance_list=None, activate_kw=None, REQUEST=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>