slapos_crm: Project_isSupportRequestCreationClosed fixup

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

@@ -20,4 +20,4 @@ def isSupportRequestCreationClosed(project_uid):
 
 return CachingMethod(isSupportRequestCreationClosed,
          "isSupportRequestCreationClosed",
-         cache_factory="erp5_content_short")(project_uid=project_uid)
+         cache_factory="erp5_content_short")(project_uid=context.getUid())

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

@@ -1314,7 +1314,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     self._test_alarm_check_compute_node_state_selected(
       allocation_scope='close/noallocation')
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
   def test_ComputeNode_checkState_script_oldAccessStatus(self):
     compute_node, _ = self._makeComputeNode(self.addProject())
     d = DateTime() - 1.1
@@ -1330,7 +1330,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     self.assertIn(d.strftime("%Y/%m/%d %H:%M:%S"),
       compute_node_support_request.getDescription())
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   def test_ComputeNode_checkState_script_noAccessStatus(self):
     compute_node, _ = self._makeComputeNode(self.addProject())
     compute_node_support_request = compute_node.ComputeNode_checkState()
@@ -1359,7 +1359,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     )
     return support_request
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-compute_node_check_state.notification", reference\n' \
@@ -1400,7 +1400,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     self.assertEqual(event.getSimulationState(), "delivered")
     self.assertEqual(event.getPortalType(), "Web Message")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-compute_node_check_state.notification"\n' \
@@ -1437,7 +1437,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     self.assertEqual(event.getSimulationState(), "delivered")
     self.assertEqual(event.getPortalType(), "Web Message")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-compute_node_check_stalled_instance_state.notification", reference\n' \
@@ -1482,7 +1482,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(SlapOSTestCaseMixinWithAbort)
     self.assertEqual(event.getSimulationState(), "delivered")
     self.assertEqual(event.getPortalType(), "Web Message")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-compute_node_check_stalled_instance_state.notification", reference\n' \
@@ -1578,7 +1578,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
       causality__uid=compute_node_uid
     )
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-compute_node_software_installation_state.notification", reference\n' \
@@ -1625,7 +1625,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
     self.assertEqual(event.getPortalType(), "Web Message")
     """
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-compute_node_software_installation_state.notification", reference\n' \
@@ -1671,7 +1671,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
     self.assertEqual(event.getSimulationState(), "delivered")
     self.assertEqual(event.getPortalType(), "Web Message")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-compute_node_software_installation_state.notification", reference\n' \
@@ -1699,7 +1699,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
 
     self.assertEqual(ticket, None)
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-compute_node_software_installation_state.notification", reference\n' \
@@ -1745,7 +1745,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeSoftwareInstallation(SlapOSTestCase
     self.assertEqual(event.getSimulationState(), "delivered")
     self.assertEqual(event.getPortalType(), "Web Message")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-compute_node_software_installation_state.notification", reference\n' \
@@ -1794,7 +1794,6 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(SlapOSTestCaseMixinWithAbort):
 
     return instance_tree
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 0')
   def test_InstanceTree_checkSoftwareInstanceState_alarm_validated(self):
     host_sub = self._makeInstanceTree()
     self.tic()
@@ -1802,7 +1801,6 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(SlapOSTestCaseMixinWithAbort):
           slapos_crm_check_instance_in_error
     self._test_alarm(alarm, host_sub, "InstanceTree_checkSoftwareInstanceState")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 0')
   def test_InstanceTree_checkSoftwareInstanceState_alarm_archived(self):
     host_sub = self._makeInstanceTree()
     host_sub.archive()
@@ -1828,7 +1826,7 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(SlapOSTestCaseMixinWithAbort):
       causality__uid=compute_node_uid
     )
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-instance-tree-instance-state.notification", reference\n' \
@@ -1875,7 +1873,7 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(SlapOSTestCaseMixinWithAbort):
     self.assertEqual(event.getSimulationState(), "delivered")
     self.assertEqual(event.getPortalType(), "Web Message")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '', 'return 0')
   def test_InstanceTree_checkSoftwareInstanceState_script_notifyErrorTolerance(self):
     with PinnedDateTime(self, DateTime()-1.1):
       self._makeComputeNode(self.addProject())
@@ -1900,7 +1898,7 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(SlapOSTestCaseMixinWithAbort):
 
     self.assertEqual(ticket, None)
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-instance-tree-instance-allocation.notification", reference\n' \
@@ -1947,7 +1945,7 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(SlapOSTestCaseMixinWithAbort):
     self.assertEqual(event.getSimulationState(), "delivered")
     self.assertEqual(event.getPortalType(), "Web Message")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '', 'return 0')
   def test_InstanceTree_checkSoftwareInstanceState_script_tooEarly(self):
     with PinnedDateTime(self, DateTime()):
       self._makeComputeNode(self.addProject())
@@ -1971,7 +1969,7 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(SlapOSTestCaseMixinWithAbort):
 
     self.assertEqual(ticket, None)
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 1')
+  @simulate('Project_isSupportRequestCreationClosed', '', 'return 1')
   def test_InstanceTree_checkSoftwareInstanceState_script_closed(self):
     with PinnedDateTime(self, DateTime()-1):
       self._makeComputeNode(self.addProject())
@@ -2083,7 +2081,7 @@ class TestSlaposCrmUpdateSupportRequestState(SlapOSTestCaseMixinWithAbort):
       )
     return notification_message.getRelativeUrl()
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '', 'return 0')
   @simulate('NotificationTool_getDocumentValue',
             'reference=None, **kw',
   'assert reference == "slapos-crm-support-request-close-destroyed-notification", reference\n' \
@@ -2125,7 +2123,7 @@ class TestSlaposCrmUpdateSupportRequestState(SlapOSTestCaseMixinWithAbort):
     self.assertEqual(event.getSimulationState(), "delivered")
     self.assertEqual(event.getPortalType(), "Web Message")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '', 'return 0')
   def test_SupportRequest_updateMonitoringState_script_notDestroyed(self):
     support_request = self._makeSupportRequest()
     support_request.setResource("service_module/slapos_crm_monitoring")
@@ -2147,7 +2145,7 @@ class TestSlaposCrmUpdateSupportRequestState(SlapOSTestCaseMixinWithAbort):
     self.assertEqual(len(event_list), 0)
     self.assertEqual(ticket.getSimulationState(), "submitted")
 
-  @simulate('ERP5Site_isSupportRequestCreationClosed', '','return 0')
+  @simulate('Project_isSupportRequestCreationClosed', '', 'return 0')
   def test_SupportRequest_updateMonitoringState_script_invalidated(self):
     support_request = self._makeSupportRequest()
     support_request.setResource("service_module/slapos_crm_monitoring")