slapos_cloud: requesting an instance requires a project

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

@@ -329,14 +329,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()
@@ -374,7 +376,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(
@@ -382,7 +385,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
@@ -394,14 +398,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
@@ -477,7 +482,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)
 
@@ -485,6 +491,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,
@@ -497,6 +504,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
@@ -706,11 +714,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
     )