[slapos_cloud] Test for Capacity at Computer Models

master/bt5/slapos_cloud/PathTemplateItem/computer_model_module/template_computer_model.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Computer Model" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Access_contents_information_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Add_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_View_Permission</string> </key>
+            <value>
+              <tuple>
+                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Associate</string>
+                <string>Auditor</string>
+                <string>Author</string>
+                <string>Manager</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>capacity_quantity</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>template_computer_model</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Computer Model</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>template_computer_model</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCloudAlarm.py

@@ -1089,6 +1089,66 @@ class TestSlapOSUpdateComputerCapacityScopeAlarm(testSlapOSMixin):
     self.computer.Computer_checkAndUpdateCapacityScope()
     self.assertEqual('open', self.computer.getCapacityScope())
 
+  def _newComputerModel(self, quantity=None):
+    computer_model = self.portal.computer_model_module.\
+        template_computer_model.Base_createCloneDocument(batch_mode=1)
+    computer_model.edit(capacity_quantity=quantity,
+        reference='TESTCM-%s' % self.generateNewId(),
+    )
+    return computer_model
+
+  def _addPartitionToComputer(self):
+    partition = self.computer.newContent(portal_type='Computer Partition',
+        reference='part1')
+    partition.markFree()
+    partition.markBusy()
+    partition.validate()
+    self.software_instance.setAggregate(partition.getRelativeUrl())
+    self.tic()
+
+  def test_Computer_checkAndUpdateCapacityScope_model(self):
+    computer_model = self._newComputerModel(9999)
+
+    self.computer.edit(specialise_value=computer_model, 
+                       capacity_quantity=None)
+    transaction.commit()
+
+    self.computer.Computer_checkAndUpdateCapacityScope()
+    self.assertEqual('open', self.computer.getCapacityScope())
+    self.assertEqual(computer_model.getCapacityQuantity(),
+                     self.computer.getCapacityQuantity())
+
+  def test_Computer_checkAndUpdateCapacityScope_model_no_capacity(self):
+    self._makeTree()
+
+    computer_model = self._newComputerModel(1)
+    self.computer.edit(specialise_value=computer_model, 
+                       capacity_quantity=None)
+
+    self._addPartitionToComputer() 
+    self.computer.Computer_checkAndUpdateCapacityScope()
+    self.assertEqual('close', self.computer.getCapacityScope())
+    self.assertEqual('Computer capacity limit exceeded',
+        self.computer.workflow_history['edit_workflow'][-1]['comment'])
+
+    self.assertEqual(computer_model.getCapacityQuantity(),
+                     self.computer.getCapacityQuantity())
+
+  def test_Computer_checkAndUpdateCapacityScope_model_has_capacity(self):
+    # If capacity is set on computer, model value is ignored.
+    self._makeTree()
+
+    computer_model = self._newComputerModel(1)
+    self.computer.edit(specialise_value=computer_model, 
+                       capacity_quantity=2)
+
+    self._addPartitionToComputer()
+    self.computer.Computer_checkAndUpdateCapacityScope()
+    self.assertEqual('open', self.computer.getCapacityScope())
+
+    self.assertNotEqual(computer_model.getCapacityQuantity(),
+                     self.computer.getCapacityQuantity())
+
   def test_Computer_checkAndUpdateCapacityScope_with_old_access(self):
     memcached_dict = self.portal.portal_memcached.getMemcachedDict(
         key_prefix='slap_tool',
@@ -1106,14 +1166,7 @@ class TestSlapOSUpdateComputerCapacityScopeAlarm(testSlapOSMixin):
   def test_Computer_checkAndUpdateCapacityScope_no_capacity_quantity(self):
     self._makeTree()
     self.computer.edit(capacity_quantity=1)
-    partition = self.computer.newContent(portal_type='Computer Partition',
-        reference='part1')
-    partition.markFree()
-    partition.markBusy()
-    partition.validate()
-    self.software_instance.setAggregate(partition.getRelativeUrl())
-    self.tic()
-
+    self._addPartitionToComputer()
     self.computer.Computer_checkAndUpdateCapacityScope()
     self.assertEqual('close', self.computer.getCapacityScope())
     self.assertEqual('Computer capacity limit exceeded',

master/bt5/slapos_cloud/bt/revision

-300
\ No newline at end of file
+301
\ No newline at end of file

master/bt5/slapos_cloud/bt/template_path_list

 acl_users/slapos_access_token_extraction
 acl_users/slapos_machine
 acl_users/slapos_shadow
+computer_model_module/template_computer_model
+computer_model_module/template_computer_model/**
 computer_module/template_computer
 computer_module/template_computer/**
 hosting_subscription_module/template_hosting_subscription