slapos_subscription_request: update cdn subscription test

project reference needed

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionCDNScenario.py

@@ -62,13 +62,14 @@ class TestSlapOSSubscriptionCDNScenarioMixin(TestSlapOSSubscriptionScenarioMixin
 
 
     # now instantiate it on compute_node and set some nice connection dict
-    self.setServerOpenPersonal(subscription_server)
+    self.setServerOpenPublic(subscription_server)
 
     self.login(self.admin_user.getUserId())
     self.personRequestInstanceNotReady(
       software_release=self.subscription_condition.getUrlString(),
       software_type=self.subscription_condition.getSourceReference(),
-      partition_reference="InstanceForSlave%s" % self.new_id
+      partition_reference="InstanceForSlave%s" % self.new_id,
+      project_reference=self.subscription_project.getReference()
     )
 
     self.stepCallSlaposAllocateInstanceAlarm()
@@ -77,7 +78,8 @@ class TestSlapOSSubscriptionCDNScenarioMixin(TestSlapOSSubscriptionScenarioMixin
     self.personRequestInstance(
       software_release=self.subscription_condition.getUrlString(),
       software_type=self.subscription_condition.getSourceReference(),
-      partition_reference="InstanceForSlave%s" % self.new_id
+      partition_reference="InstanceForSlave%s" % self.new_id,
+      project_reference=self.subscription_project.getReference()
     )
 
     # now instantiate it on compute_node and set some nice connection dict
@@ -85,7 +87,7 @@ class TestSlapOSSubscriptionCDNScenarioMixin(TestSlapOSSubscriptionScenarioMixin
 
     self.tic()
     self.login()
-    self.setServerOpenSubscription(subscription_server)
+    #self.setServerOpenSubscription(subscription_server)
     self.setAccessToMemcached(subscription_server)
     self.tic()
     self.simulateSlapgridCP(subscription_server)

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionCDNScenario.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>testSlapOSSubscriptionCDNScenario</string> </value>
@@ -61,28 +55,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>
@@ -95,7 +74,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>
@@ -104,7 +83,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>