Mass upgrade: Live Tests

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareRelease_getUsage.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return context.portal_catalog.countResults(portal_type=\'Computer Partition\', software_release_url=context.getUrlString(), free_for_request=0)[0][0]\n
+            <value> <string>return context.portal_catalog.countResults(portal_type=(\'Software Instance\',\'Slave Instance\'), url_string=context.getUrlString())[0][0]\n
 </string> </value>
         </item>
         <item>

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareRelease_requestInstanceUpgrade.xml

@@ -61,11 +61,11 @@ if comp_reference_list != []:\n
     portal_type = \'Hosting Subscription\',\n
     default_specialise_related_uid = [x.getUid() for x in portal.portal_catalog(\n
       portal_type = [\'Software Instance\', \'Slave Instance\'],\n
+      url_string = old_sr_url,\n
       default_aggregate_uid = [y.getUid() for y in portal.portal_catalog(\n
         portal_type = \'Computer Partition\',\n
         parent_reference = comp_reference_list,\n
-        free_for_request = 0,\n
-        software_release_url = old_sr_url\n
+        free_for_request = 0\n
       )]\n
     )],\n
     method_id = \'HostingSubscription_changeSoftwareRelease\',\n

master/bt5/slapos_cloud/bt/revision

-291
+292
\ No newline at end of file

master/bt5/slapos_cloud/bt/template_test_id_list

@@ -3,4 +3,5 @@ testSlapOSCloudConstraint
 testSlapOSCloudSecurityGroup
 testSlapOSCloudShadow
 testSlapOSCloudWorkflow
-testSlapOSCloudDocument
+testSlapOSCloudDocument
\ No newline at end of file
+testSlapOSCloudMassUpgrade
\ No newline at end of file