slapos_crm: More fixes

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

 from DateTime import DateTime
 portal = context.getPortalObject()
 
-if context.getMonitorScope() == "disabled":
+# Remote Node has no monitor scope.
+if context.getPortalType() == "Compute Node" and \
+         context.getMonitorScope() == "disabled":
   return
 
 project = context.getFollowUpValue()

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

@@ -34,10 +34,10 @@ for instance in instance_list:
         software_instance = compute_partition.getAggregateRelatedValue(portal_type='Software Instance')
         if software_instance is None:
           instance_sla_error_list.append('instance_guid provided on %s but no Software Instance was found' % instance.getTitle())
-
-      if software_instance.getReference() != instance_guid:
-        instance_sla_error_list.append('instance_guid do not match on: %s (%s != %s)' % (
-          instance.getTitle(), instance_guid, software_instance.getReference()))
+        else:
+          if software_instance.getReference() != instance_guid:
+            instance_sla_error_list.append('instance_guid do not match on: %s (%s != %s)' % (
+              instance.getTitle(), instance_guid, software_instance.getReference()))
 
     if 'network_guid' in sla_dict:
       network_guid = sla_dict.pop('network_guid')