slapos_crm: Stop to check for Allocation Scope when monitor

   Only Monitor Scope should be taken into account.

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

@@ -7,10 +7,6 @@ if not person or \
    portal.ERP5Site_isSupportRequestCreationClosed():
   return
 
-if context.getAllocationScope("open").startswith("close"):
-  context.setMonitorScope("disabled")
-  return
-
 reference = context.getReference()
 compute_node_title = context.getTitle()
 

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

-#
-# XXX This ticket contains dupplicated coded found arround SlapOS
-#     It is required to rewrite this in a generic way.
-#     See also: InstanceTree_checkSoftwareInstanceState
-#     See also: ComputeNode_checkState
-#
-
 from DateTime import DateTime
 
 if context.getSimulationState() == "invalidated":
@@ -103,17 +96,11 @@ if aggregate_portal_type == "Instance Tree":
     if instance.getAggregate() is not None:
       compute_node = instance.getAggregateValue().getParentValue()
       if instance.getPortalType() == "Software Instance" and \
-          compute_node.getAllocationScope() in ["open/public", "open/friend", "open/subscription"] and \
           instance.getSlapState() == "start_requested" and \
           instance.SoftwareInstance_hasReportedError():
         message_list.append("%s has error (%s, %s at %s scope %s)" % (instance.getReference(), instance.getTitle(),
                                                                       instance.getUrlString(), compute_node.getReference(),
                                                                       compute_node.getAllocationScope()))
-      if instance.getPortalType() == "Software Instance" and \
-          compute_node.getAllocationScope() in ["closed/outdated", "open/personal"] and \
-          instance.getSlapState() == "start_requested" and \
-          instance.SoftwareInstance_hasReportedError():
-        message_list.append("%s on a %s compute_node" % (instance.getReference(), compute_node.getAllocationScope()) )
     else:
       message_list.append("%s is not allocated" % instance.getReference())
   return ",".join(message_list)