slapos_crm: More tests for ComputePartition_checkAllocatedSlaState

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/ComputePartition_checkAllocatedSlaState.py

 compute_partition = context
+sla_error_list = []
 
 compute_node = compute_partition.getParentValue()
 assert compute_node.getPortalType() == 'Compute Node'
 
 instance = compute_partition.getAggregateRelatedValue(portal_type='Software Instance')
 assert instance is not None, 'Instance is None'
-assert instance.getValidationState() != 'validated', 'Instance is invalid'
+if instance.getValidationState() != 'validated' or \
+      instance.getSlapState() == 'destroy_requested':
+  # Outdated catalog or instance under garbage collection,
+  # we skip for now.
+  return sla_error_list
 
-sla_error_list = []
 sla_dict = instance.getSlaXmlAsDict()
 if not sla_dict:
   return sla_error_list

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/ComputePartition_checkAllocatedSupplyState.py

@@ -5,7 +5,11 @@ assert compute_node.getPortalType() == 'Compute Node'
 
 instance = compute_partition.getAggregateRelatedValue(portal_type='Software Instance')
 assert instance is not None, 'Instance is None'
-assert instance.getValidationState() != 'validated', 'Instance is invalid'
+if instance.getValidationState() != 'validated' or \
+      instance.getSlapState() == 'destroy_requested':
+  # Outdated catalog or instance under garbage collection,
+  # we skip for now.
+  return
 
 project = instance.getFollowUpValue()
 assert project is not None, 'Project is None'

master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCRMMonitoringAlarm.py

@@ -98,7 +98,29 @@ class TestSlapOSCrmCheckProjectAllocationConsistencyState(TestSlapOSCrmMonitorin
     self._test_alarm_not_visited(alarm, self.compute_node,
                            "ComputeNode_checkProjectAllocationConsistencyState")
 
-################################################################################
+  def test_ComputeNode_checkProjectAllocationConsistencyState_alarm_2_node_1_call(self):
+    project = self.addProject()
+    self._makeComputeNode(project)
+    compute_node_a = self.compute_node
+    compute_node_a.edit(monitor_scope='enabled')
+    self._makeComputeNode(project)
+    compute_node_b = self.compute_node
+    compute_node_b.edit(monitor_scope='enabled')
+
+    self.assertNotEqual(compute_node_a.getUid(), compute_node_b.getUid())
+    self.tic()
+    alarm = self.portal.portal_alarms.slapos_crm_project_allocation_consistency
+    script_name = "ComputeNode_checkProjectAllocationConsistencyState"
+    with TemporaryAlarmScript(self.portal, script_name, attribute=None):
+      alarm.activeSense()
+      self.tic()
+      content_a = compute_node_a.workflow_history['edit_workflow'][-1]['comment']
+      content_b = compute_node_b.workflow_history['edit_workflow'][-1]['comment']
+
+      # The alarm should group by project, so only one out of many should reached.
+      self.assertNotEqual(content_a, content_b)
+      self.assertIn('Visited by %s' % script_name, [content_a, content_b])
+
 
 class TestSlapOSCrmMonitoringCheckComputeNodeProjectState(TestSlapOSCrmMonitoringMixin):
   launch_caucase = 1