slapos_accounting: project needed on assignment/compute node

master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSConsumptionSkins.py

@@ -265,19 +265,29 @@ class TestSlapOSComputerConsumptionTioXMLFile_solveInvoicingGeneration(
     return document
 
   def createAllocatedComputeNode(self):
+    project = self.addProject()
+
     # Create person
     reference = 'test_%s' % self.generateNewId()
     person = self.portal.person_module.newContent(portal_type='Person',
       title=reference,
       reference=reference)
-    person.newContent(portal_type='Assignment', role='member').open()
+    person.newContent(
+      portal_type='Assignment',
+      function='customer',
+      destination_project_value=project
+    ).open()
 
     # Create second person
     reference = 'test_%s' % self.generateNewId()
     second_person = self.portal.person_module.newContent(portal_type='Person',
       title=reference,
       reference=reference)
-    second_person.newContent(portal_type='Assignment', role='member').open()
+    second_person.newContent(
+      portal_type='Assignment',
+      function='customer',
+      destination_project_value=project
+    ).open()
 
     self.commit()
     self.person = person
@@ -293,14 +303,14 @@ class TestSlapOSComputerConsumptionTioXMLFile_solveInvoicingGeneration(
     self.compute_node.edit(
       title="Compute Node %s" % new_id,
       reference="TESTCOMP-%s" % new_id,
-      source_administration_value=person
+      follow_up_value=project
     )
 
     self.compute_node.validate()
 
     self.tic()
 
-    self._makeComplexComputeNode()
+    self._makeComplexComputeNode(project)
     self.tic()
 
     self.start_requested_software_instance.getSpecialiseValue().edit(

master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSConsumptionSkins.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>testSlapOSConsumptionSkins</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>