slapos_erp5: No need to auto close capacity except for close allocation scope

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

@@ -37,6 +37,19 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
     self.commit()
     self.assertEqual(compute_node.getCapacityScope(), 'close')
     self.assertEqual(compute_node.getMonitorScope(), 'enabled')
+    self.commit()
+    compute_node.edit(allocation_scope=None)
+    self.commit()
+    
+    compute_node.edit(capacity_scope="open", monitor_scope='enabled')
+    self.commit()
+
+    compute_node.edit(allocation_scope=allocation_scope)
+    self.commit()
+
+    self.assertEqual(compute_node.getCapacityScope(), 'open')
+    self.assertEqual(compute_node.getMonitorScope(), 'enabled')
+
     return compute_node
 
   def test_ComputeNode_setAllocationScope_public_no_source_adm(self):
@@ -82,6 +95,18 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
     compute_node.edit(allocation_scope='open/personal')
 
     self.commit()
+    self.assertEqual(compute_node.getCapacityScope(), 'close')
+    self.assertEqual(compute_node.getMonitorScope(), 'disabled')
+    self.commit()
+    compute_node.edit(allocation_scope=None)
+    self.commit()
+    
+    compute_node.edit(capacity_scope="open")
+    self.commit()
+
+    compute_node.edit(allocation_scope='open/personal')
+    self.commit()
+
     self.assertEqual(compute_node.getCapacityScope(), 'open')
     self.assertEqual(compute_node.getMonitorScope(), 'disabled')
     return compute_node
@@ -132,6 +157,18 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
     compute_node.edit(allocation_scope='open/friend')
 
     self.commit()
+    self.assertEqual(compute_node.getCapacityScope(), 'close')
+    self.assertEqual(compute_node.getMonitorScope(), 'enabled')
+    self.commit()
+    compute_node.edit(allocation_scope=None)
+    self.commit()
+    
+    compute_node.edit(capacity_scope="open")
+    self.commit()
+
+    compute_node.edit(allocation_scope='open/friend')
+    self.commit()
+
     self.assertEqual(compute_node.getCapacityScope(), 'open')
     self.assertEqual(compute_node.getMonitorScope(), 'enabled')
     return compute_node
@@ -179,6 +216,19 @@ class TestSlapOSERP5InteractionWorkflowComputeNodeSetAllocationScope(
     compute_node.edit(allocation_scope=allocation_scope)
 
     self.commit()
+    self.assertEqual(compute_node.getCapacityScope(), 'close')
+    self.assertEqual(compute_node.getMonitorScope(), 'disabled')
+
+    self.commit()
+    compute_node.edit(allocation_scope=None)
+    self.commit()
+    
+    compute_node.edit(capacity_scope="open")
+    self.commit()
+
+    compute_node.edit(allocation_scope=allocation_scope)
+    self.commit()
+
     self.assertEqual(compute_node.getCapacityScope(), 'close')
     self.assertEqual(compute_node.getMonitorScope(), 'disabled')
     return compute_node

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5InteractionWorkflow.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>testSlapOSERP5InteractionWorkflow</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_erp5/WorkflowTemplateItem/portal_workflow/slapos_erp5_interaction_workflow/script_ComputeNode_updateAllocation.py

 compute_node = state_object["object"]
 allocation_scope = compute_node.getAllocationScope()
 
-if allocation_scope in ['open/public', 'open/subscription']:
-  # Public compute_node capacity is handle by an alarm
-  capacity_scope = 'close'
-  monitor_scope = 'enabled'
-elif allocation_scope == 'open/friend':
-  # Capacity is not handled for 'private' compute_nodes
-  capacity_scope = 'open'
+edit_kw = {}
+
+if compute_node.getCapacityScope() is None:
+  edit_kw['capacity_scope'] = 'close'
+
+if allocation_scope in ['open/public', 'open/subscription', 'open/friend']:
   monitor_scope = 'enabled'
 elif allocation_scope == 'open/personal':
-  capacity_scope = 'open'
-  # Keep the same.
   monitor_scope = compute_node.getMonitorScope("disabled")
 else:
   monitor_scope = 'disabled'
-  capacity_scope = 'close'
+  edit_kw['capacity_scope'] = 'close'
 
-edit_kw = {
-  'capacity_scope': capacity_scope,
-  'monitor_scope': monitor_scope
-}
+edit_kw['monitor_scope'] = monitor_scope
 
 self_person = compute_node.getSourceAdministrationValue(portal_type="Person")
 if self_person is None: