slapos_cloud: invalidate Slave Instance allocation on a Compute Node

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

@@ -6,7 +6,17 @@ if context.getPortalType() not in ('Software Instance', 'Slave Instance'):
   raise TypeError('%s is not supported' % context.getPortalType())
 
 software_instance = context
-if software_instance.getValidationState() == 'validated' \
-  and software_instance.getSlapState() == 'destroy_requested' \
-  and software_instance.getAggregateValue(portal_type='Compute Partition') is None:
-  software_instance.invalidate(comment='Invalidated as unallocated and destroyed')
+if (software_instance.getValidationState() == 'validated') \
+  and (software_instance.getSlapState() == 'destroy_requested'):
+
+  partition = software_instance.getAggregateValue(portal_type='Compute Partition')
+
+  if partition is None:
+    software_instance.invalidate(comment='Invalidated as unallocated and destroyed')
+
+  elif (partition.getParentValue().getPortalType() == 'Compute Node') and \
+    (software_instance.getPortalType() == 'Slave Instance'):
+    # Invalidate ONLY IF the partition is inside a Compute Node, which does not report destruction
+    software_instance.invalidate(comment='Invalidated as Compute Node does not report destruction of Slave Instance')
+
+  # Software Instance allocated on a Compute Node is invalidated by SlapTool

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

@@ -1201,6 +1201,54 @@ class TestSlapOSInvalidateDestroyedInstance(SlapOSTestCaseMixin):
     self.assertEqual(software_instance.getValidationState(), "validated")
     self.assertEqual(software_instance.getSlapState(), "destroy_requested")
 
+  def test_tryToInvalidateIfDestroyed_script_allocatedSlaveInstance(self):
+    instance_tree = self.addInstanceTree(shared=True)
+    software_instance = instance_tree.getSuccessorValue()
+
+    _, partition = self.addComputeNodeAndPartition(project=instance_tree.getFollowUpValue())
+    software_instance.setAggregateValue(partition)
+    partition.markBusy()
+
+    self.portal.portal_workflow._jumpToStateFor(software_instance, 'validated')
+    self.portal.portal_workflow._jumpToStateFor(software_instance, 'destroy_requested')
+    software_instance.SoftwareInstance_tryToInvalidateIfDestroyed()
+    self.assertEqual(software_instance.getValidationState(), "invalidated")
+    self.assertEqual(software_instance.getSlapState(), "destroy_requested")
+
+  def test_tryToInvalidateIfDestroyed_script_allocatedInstanceOnRemoteNode(self):
+    instance_tree = self.addInstanceTree()
+    software_instance = instance_tree.getSuccessorValue()
+
+    _, partition = self.addComputeNodeAndPartition(
+      project=instance_tree.getFollowUpValue(),
+      portal_type="Remote Node"
+    )
+    software_instance.setAggregateValue(partition)
+    partition.markBusy()
+
+    self.portal.portal_workflow._jumpToStateFor(software_instance, 'validated')
+    self.portal.portal_workflow._jumpToStateFor(software_instance, 'destroy_requested')
+    software_instance.SoftwareInstance_tryToInvalidateIfDestroyed()
+    self.assertEqual(software_instance.getValidationState(), "validated")
+    self.assertEqual(software_instance.getSlapState(), "destroy_requested")
+
+  def test_tryToInvalidateIfDestroyed_script_allocatedSlaveInstanceOnRemoteNode(self):
+    instance_tree = self.addInstanceTree(shared=True)
+    software_instance = instance_tree.getSuccessorValue()
+
+    _, partition = self.addComputeNodeAndPartition(
+      project=instance_tree.getFollowUpValue(),
+      portal_type="Remote Node"
+    )
+    software_instance.setAggregateValue(partition)
+    partition.markBusy()
+
+    self.portal.portal_workflow._jumpToStateFor(software_instance, 'validated')
+    self.portal.portal_workflow._jumpToStateFor(software_instance, 'destroy_requested')
+    software_instance.SoftwareInstance_tryToInvalidateIfDestroyed()
+    self.assertEqual(software_instance.getValidationState(), "validated")
+    self.assertEqual(software_instance.getSlapState(), "destroy_requested")
+
 
 class TestSlapOSPropagateRemoteNodeInstance(SlapOSTestCaseMixin):
   #################################################################