slapos_cloud: do NOT markFree the SHARED_REMOTE partition

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

@@ -14,6 +14,13 @@ if partition is not None:
   if (portal.portal_activities.countMessageWithTag(tag) == 0):
     # No concurrency issue
     instance.unallocatePartition()
+
+    if (partition.getId() == 'SHARED_REMOTE') and (partition.getParentValue().getPortalType() == 'Remote Node'):
+      # Do not free the SHARED_REMOTE partition on Remote Node
+      # used to allocate Slave Instance
+      # This partition is always busy, as no Software Instance is allocated on it
+      return
+
     instance_sql_list = portal.portal_catalog(
                           portal_type=["Software Instance", "Slave Instance"],
                           aggregate__uid=partition.getUid(),

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAlarm.py

@@ -333,6 +333,24 @@ class TestSlapOSFreeComputePartitionAlarm(SlapOSTestCaseMixin):
     self.assertEqual(partition.getRelativeUrl(), software_instance.getAggregate())
     self.assertEqual('busy', partition.getSlapState())
 
+  def test_SoftwareInstance_tryToUnallocatePartition_script_sharedAndAllocatedOnRemoteNode(self):
+    instance_tree = self.addInstanceTree(shared=True)
+    software_instance = instance_tree.getSuccessorValue()
+    remote_node, _ = self.addComputeNodeAndPartition(portal_type='Remote Node',
+                                                   project=instance_tree.getFollowUpValue())
+    partition = remote_node.restrictedTraverse('SHARED_REMOTE')
+
+    software_instance.setAggregateValue(partition)
+    self.portal.portal_workflow._jumpToStateFor(software_instance,
+        'destroy_requested')
+    self.portal.portal_workflow._jumpToStateFor(software_instance,
+        'invalidated')
+    self.tic()
+
+    software_instance.SoftwareInstance_tryToUnallocatePartition()
+    self.assertEqual(None, software_instance.getAggregate())
+    self.assertEqual('busy', partition.getSlapState())
+
 
 class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
   #################################################################