slapos_erp5: Change how allocation scope change updates monitor and capacity scope

   Whenever allocation scope changes, the capacity is close, and the proper alarm will re-open it later a moment after. This prevents when you change from close to open, to get a miss-updated window, and something is allocated before it capacity is calculated.

     Do not touch on monitor scope, except when it is None or allocation is "Close Forever", this allow the user to keep monitoring closed computers (Maintenance, termination...), since ONLY allocation is closed, and the computer is supposed to work normally with whatever is inside.

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

@@ -147,6 +147,8 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
     server.edit(
         allocation_scope='open/public')
     self.assertEqual('open/public', server.getAllocationScope())
+    # Called by alarm
+    server.ComputeNode_checkAndUpdateCapacityScope()
     self.assertEqual('open', server.getCapacityScope())
     self.tic()
 
@@ -155,6 +157,8 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
     server.edit(
         allocation_scope='open/subscription')
     self.assertEqual('open/subscription', server.getAllocationScope())
+    # Called by alarm
+    server.ComputeNode_checkAndUpdateCapacityScope()
     self.assertEqual('open', server.getCapacityScope())
     self.tic()
 
@@ -163,6 +167,8 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
     server.edit(
         allocation_scope='open/personal', subject_list=[])
     self.assertEqual('open/personal', server.getAllocationScope())
+    # Called by alarm
+    server.ComputeNode_checkAndUpdateCapacityScope()
     self.assertEqual('open', server.getCapacityScope())
     self.tic()
 
@@ -173,6 +179,8 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
     server.edit(
         allocation_scope='open/friend', subject_list=friend_list)
     self.assertEqual('open/friend', server.getAllocationScope())
+    # Called by alarm
+    server.ComputeNode_checkAndUpdateCapacityScope()
     self.assertEqual('open', server.getCapacityScope())
     self.assertSameSet(friend_list, server.getSubjectList())
     self.tic()

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

@@ -209,6 +209,10 @@ return True""" )
         self.software_instance.getUrlString())
     self.compute_node.edit(allocation_scope='open/personal',
       source_administration=self.person_user.getRelativeUrl())
+    self.compute_node.setAccessStatus("#access ok")
+    self.tic()
+    self.compute_node.ComputeNode_checkAndUpdateCapacityScope()
+    self.assertEqual(self.compute_node.getCapacityScope(), 'open')
     self.tic()
 
     self.assertEqual(None, self.software_instance.getAggregateValue(
@@ -226,6 +230,10 @@ return True""" )
         self.partition)
     self.compute_node.edit(allocation_scope='open/personal',
       source_administration=self.person_user.getRelativeUrl())
+    self.compute_node.setAccessStatus("#access ok")
+    self.tic()
+    self.compute_node.ComputeNode_checkAndUpdateCapacityScope()
+    self.assertEqual(self.compute_node.getCapacityScope(), 'open')
     self.tic()
 
     self.assertEqual(None, self.software_instance.getAggregateValue(
@@ -259,6 +267,10 @@ return True""" )
       source_administration=person_user.getRelativeUrl(),
       destination_section=self.person_user.getRelativeUrl(),
       allocation_scope='open/friend')
+    self.compute_node.setAccessStatus("#access ok")
+    self.tic()
+    self.compute_node.ComputeNode_checkAndUpdateCapacityScope()
+    self.assertEqual(self.compute_node.getCapacityScope(), 'open')
     self.tic()
 
     self.assertEqual(None, self.software_instance.getAggregateValue(
@@ -292,6 +304,10 @@ return True""" )
       source_administration=person_user.getRelativeUrl(),
       destination_section=self.person_user.getRelativeUrl(),
       allocation_scope='open/friend')
+    self.compute_node.setAccessStatus("#access ok")
+    self.tic()
+    self.compute_node.ComputeNode_checkAndUpdateCapacityScope()
+    self.assertEqual(self.compute_node.getCapacityScope(), 'open')
     self.tic()
 
     self.assertEqual(None, self.software_instance.getAggregateValue(

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAllocationAlarm.xml

@@ -6,12 +6,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_recorded_property_dict</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>default_reference</string> </key>
             <value> <string>testSlapOSCloudAllocationAlarm</string> </value>
@@ -55,28 +49,13 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>data</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -89,7 +68,7 @@
                 <item>
                     <key> <string>component_validation_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -98,7 +77,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>

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

@@ -641,7 +641,7 @@ class TestSlapOSCorePersonRequestComputeNode(SlapOSTestCaseMixin):
     self.assertEqual('COMP-%s' % (previous_id + 1), compute_node.getReference())
     self.assertEqual('validated', compute_node.getValidationState())
     self.assertEqual('open/personal', compute_node.getAllocationScope())
-    self.assertEqual('open', compute_node.getCapacityScope())
+    self.assertEqual('close', compute_node.getCapacityScope())
 
   def test_request_notReindexedCompute(self):
     person = self.portal.portal_membership.getAuthenticatedMember().getUserValue()
@@ -682,7 +682,7 @@ class TestSlapOSCorePersonRequestComputeNode(SlapOSTestCaseMixin):
     self.assertEqual('COMP-%s' % (previous_id + 1), compute_node.getReference())
     self.assertEqual('validated', compute_node.getValidationState())
     self.assertEqual('open/personal', compute_node.getAllocationScope())
-    self.assertEqual('open', compute_node.getCapacityScope())
+    self.assertEqual('close', compute_node.getCapacityScope())
 
     self.tic()
 
@@ -708,7 +708,7 @@ class TestSlapOSCorePersonRequestComputeNode(SlapOSTestCaseMixin):
     self.assertEqual('COMP-%s' % (previous_id + 1), compute_node.getReference())
     self.assertEqual('validated', compute_node.getValidationState())
     self.assertEqual('open/personal', compute_node.getAllocationScope())
-    self.assertEqual('open', compute_node.getCapacityScope())
+    self.assertEqual('close', compute_node.getCapacityScope())
 
     # and now another one
     person.requestComputeNode(compute_node_title=compute_node_title2)
@@ -735,7 +735,7 @@ class TestSlapOSCorePersonRequestComputeNode(SlapOSTestCaseMixin):
     self.assertEqual('COMP-%s' % (previous_id + 2), compute_node2.getReference())
     self.assertEqual('validated', compute_node2.getValidationState())
     self.assertEqual('open/personal', compute_node2.getAllocationScope())
-    self.assertEqual('open', compute_node2.getCapacityScope())
+    self.assertEqual('close', compute_node2.getCapacityScope())
 
   def test_request_duplicatedComputeNode(self):
     person = self.portal.portal_membership.getAuthenticatedMember().getUserValue()

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudPersonSlapInterfaceWorkflow.xml

@@ -6,12 +6,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_recorded_property_dict</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>default_reference</string> </key>
             <value> <string>testSlapOSCloudPersonSlapInterfaceWorkflow</string> </value>
@@ -61,28 +55,13 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>data</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -95,7 +74,7 @@
                 <item>
                     <key> <string>component_validation_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -104,7 +83,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5InteractionWorkflow.py

@@ -47,7 +47,7 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
     compute_node.edit(allocation_scope=allocation_scope)
     self.commit()
 
-    self.assertEqual(compute_node.getCapacityScope(), 'open')
+    self.assertEqual(compute_node.getCapacityScope(), 'close')
     self.assertEqual(compute_node.getMonitorScope(), 'enabled')
 
     return compute_node
@@ -96,7 +96,7 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
 
     self.commit()
     self.assertEqual(compute_node.getCapacityScope(), 'close')
-    self.assertEqual(compute_node.getMonitorScope(), 'disabled')
+    self.assertEqual(compute_node.getMonitorScope(), 'enabled')
     self.commit()
     compute_node.edit(allocation_scope=None)
     self.commit()
@@ -107,8 +107,8 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
     compute_node.edit(allocation_scope='open/personal')
     self.commit()
 
-    self.assertEqual(compute_node.getCapacityScope(), 'open')
-    self.assertEqual(compute_node.getMonitorScope(), 'disabled')
+    self.assertEqual(compute_node.getCapacityScope(), 'close')
+    self.assertEqual(compute_node.getMonitorScope(), 'enabled')
     return compute_node
 
   def test_ComputeNode_setAllocationScope_personal(self):
@@ -169,7 +169,7 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
     compute_node.edit(allocation_scope='open/friend')
     self.commit()
 
-    self.assertEqual(compute_node.getCapacityScope(), 'open')
+    self.assertEqual(compute_node.getCapacityScope(), 'close')
     self.assertEqual(compute_node.getMonitorScope(), 'enabled')
     return compute_node
 
@@ -205,7 +205,8 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
   def _test_ComputeNode_setAllocationScope_closed(self,
                                               source_administration=None,
                                               allocation_scope="close/forever",
-                                              subject_list=None):
+                                              subject_list=None,
+                                              monitor_scope='enabled'):
     compute_node = self.portal.compute_node_module.newContent(portal_type='Compute Node',
                   capacity_scope=None,
                   monitor_scope=None,
@@ -217,7 +218,7 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
 
     self.commit()
     self.assertEqual(compute_node.getCapacityScope(), 'close')
-    self.assertEqual(compute_node.getMonitorScope(), 'disabled')
+    self.assertEqual(compute_node.getMonitorScope(), monitor_scope)
 
     self.commit()
     compute_node.edit(allocation_scope=None)
@@ -230,12 +231,12 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
     self.commit()
 
     self.assertEqual(compute_node.getCapacityScope(), 'close')
-    self.assertEqual(compute_node.getMonitorScope(), 'disabled')
+    self.assertEqual(compute_node.getMonitorScope(), monitor_scope)
     return compute_node
 
 
   def test_ComputeNode_setAllocationScope_closed_forever_no_source_adm(self):
-    self._test_ComputeNode_setAllocationScope_closed()
+    self._test_ComputeNode_setAllocationScope_closed(monitor_scope='disabled')
 
   def test_ComputeNode_setAllocationScope_closed_forever_with_source_adm(self):
     person = self.makePerson()
@@ -243,7 +244,7 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
     self.assertNotIn(person.getDefaultEmailCoordinateText(), [None, ""])
 
     compute_node = self._test_ComputeNode_setAllocationScope_closed(
-      source_administration=person.getRelativeUrl())
+      source_administration=person.getRelativeUrl(), monitor_scope='disabled')
 
     self.assertEqual(compute_node.getSubjectList(), [person.getDefaultEmailCoordinateText()])
     self.assertEqual(compute_node.getDestinationSectionList(),

master/bt5/slapos_erp5/WorkflowTemplateItem/portal_workflow/slapos_erp5_interaction_workflow/script_ComputeNode_updateAllocation.py

@@ -3,18 +3,17 @@ allocation_scope = compute_node.getAllocationScope()
 
 edit_kw = {}
 
-if compute_node.getCapacityScope() is None:
+# Automatically close the capacity whenever the allocation scope
+# changes, and let the alarm update it later, whenever the 
+# allocation scope is open.
+if compute_node.getCapacityScope() != "close":
   edit_kw['capacity_scope'] = 'close'
 
-if allocation_scope in ['open/public', 'open/subscription', 'open/friend']:
-  monitor_scope = 'enabled'
-elif allocation_scope == 'open/personal':
-  monitor_scope = compute_node.getMonitorScope("disabled")
-else:
-  monitor_scope = 'disabled'
-  edit_kw['capacity_scope'] = 'close'
+if compute_node.getMonitorScope() is None:
+  edit_kw['monitor_scope'] = 'enabled'
 
-edit_kw['monitor_scope'] = monitor_scope
+if allocation_scope == "close/forever":
+  edit_kw['monitor_scope'] = 'disabled'
 
 self_person = compute_node.getSourceAdministrationValue(portal_type="Person")
 if self_person is None: