slapos_cloud: requesting an instance requires a project

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

@@ -317,14 +317,16 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
     return software_instance
 
   def checkSlaveInstanceAllocation(self, person_user_id, person_reference,
-      instance_title, software_release, software_type, server):
+      instance_title, software_release, software_type, server,
+       project_reference):
 
     self.login(person_user_id)
     self.personRequestInstanceNotReady(
       software_release=software_release,
       software_type=software_type,
       partition_reference=instance_title,
-      shared_xml='<marshal><bool>1</bool></marshal>'
+      shared_xml='<marshal><bool>1</bool></marshal>',
+      project_reference=project_reference
     )
 
     self.stepCallSlaposAllocateInstanceAlarm()
@@ -362,7 +364,8 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
 
   def checkSlaveInstanceUnallocation(self, person_user_id,
       person_reference, instance_title,
-      software_release, software_type, server):
+      software_release, software_type, server,
+      project_reference):
 
     self.login(person_user_id)
     self.personRequestInstanceNotReady(
@@ -370,7 +373,8 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
       software_type=software_type,
       partition_reference=instance_title,
       shared_xml='<marshal><bool>1</bool></marshal>',
-      state='<marshal><string>destroyed</string></marshal>'
+      state='<marshal><string>destroyed</string></marshal>',
+      project_reference=project_reference
     )
 
     # let's find instances of user and check connection strings
@@ -382,14 +386,15 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
 
   def checkInstanceUnallocation(self, person_user_id,
       person_reference, instance_title,
-      software_release, software_type, server):
+      software_release, software_type, server, project_reference):
 
     self.login(person_user_id)
     self.personRequestInstanceNotReady(
       software_release=software_release,
       software_type=software_type,
       partition_reference=instance_title,
-      state='<marshal><string>destroyed</string></marshal>'
+      state='<marshal><string>destroyed</string></marshal>',
+      project_reference=project_reference
     )
 
     # now instantiate it on compute_node and set some nice connection dict
@@ -482,7 +487,8 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
 
 
   def checkInstanceAllocation(self, person_user_id, person_reference,
-      instance_title, software_release, software_type, server):
+      instance_title, software_release, software_type, server,
+      project_reference):
 
     self.login(person_user_id)
 
@@ -490,6 +496,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
       software_release=software_release,
       software_type=software_type,
       partition_reference=instance_title,
+      project_reference=project_reference
     )
 
     self.checkCloudContract(person_user_id, person_reference,
@@ -502,6 +509,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
       software_release=software_release,
       software_type=software_type,
       partition_reference=instance_title,
+      project_reference=project_reference
     )
 
     # now instantiate it on compute_node and set some nice connection dict
@@ -733,11 +741,12 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
       self.assertEqual(subscription.getSlapState(), "destroy_requested")
 
   def requestInstance(self, person_user_id, instance_title,
-      software_release, software_type):
+      software_release, software_type, project_reference):
 
     self.login(person_user_id)
     self.personRequestInstanceNotReady(
       software_release=software_release,
       software_type=software_type,
       partition_reference=instance_title,
+      project_reference=project_reference
     )

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