Move not related scipts and tests from slapos_cloud to slapos_pdm

master/bt5/slapos_cloud/bt/revision

-321
+322
\ No newline at end of file

master/bt5/slapos_cloud/bt/template_test_id_list

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

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/HostingSubscription_getNewerSofwareRelease.xml → master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/HostingSubscription_getNewerSofwareRelease.xml

@@ -55,17 +55,17 @@ portal = context.getPortalObject()\n
 \n
 software_instance = hosting_subscription.getPredecessorValue()\n
 if not software_instance:\n
-  return ""\n
+  return None\n
 software_release_list = context.SoftwareProduct_getSortedSoftwareReleaseList(\n
                           software_release_url=software_instance.getUrlString())\n
 \n
 if not software_release_list:\n
-  return ""\n
+  return None\n
 latest_software_release = software_release_list[0]\n
-if software_release_list[0].getUrlString() == software_instance.getUrlString():\n
-  return ""\n
+if latest_software_release.getUrlString() == software_instance.getUrlString():\n
+  return None\n
 else:\n
-  return latest_software_release.getUrlString()\n
+  return latest_software_release\n
 </string> </value>
         </item>
         <item>

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/HostingSubscription_isUpgradable.xml → master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/HostingSubscription_getUpgradableSoftwareRelease.xml

@@ -50,42 +50,46 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>hosting_subscription = context\n
+            <value> <string>"""\n
+Check if this hosting subscription is upgradable to the latest version,\n
+and return the software release to upgrade with.\n
+"""\n
+\n
+hosting_subscription = context\n
 portal = context.getPortalObject()\n
 \n
 slap_state = [\'start_requested\', \'stop_requested\']\n
 \n
 if not hosting_subscription.getSlapState() in slap_state:\n
-  return False\n
+  return None\n
 \n
 source_instance = hosting_subscription.getPredecessorValue()\n
 if not source_instance or source_instance.getSlapState() not in slap_state:\n
-  return False\n
+  return None\n
 \n
-latest_software_url = hosting_subscription.HostingSubscription_getNewerSofwareRelease()\n
-if latest_software_url == "":\n
-  return False\n
+software_release = hosting_subscription.HostingSubscription_getNewerSofwareRelease()\n
+if not software_release:\n
+  return None\n
 \n
 computer = source_instance.getAggregateValue().getParentValue()\n
 if computer.getValidationState() != \'validated\':\n
-  return False\n
-isUpgradable = True\n
+  return None\n
       \n
 #Find Software Installation\n
 software_installation_list = portal.portal_catalog(\n
     portal_type="Software Installation",\n
     validation_state="validated",\n
-    url_string=latest_software_url,\n
+    url_string=software_release.getUrlString(),\n
     default_aggregate_uid=computer.getUid(),\n
     #XXX - don\'t select destroyed Software Installation\n
     slap_state=\'start_requested\'\n
   )\n
 # check again slap_state because it might be ignored in previous request!\n
-if not \'start_requested\' in [software_installation.getSlapState() \\\n
+if \'start_requested\' in [software_installation.getSlapState() \\\n
              for software_installation in software_installation_list]:\n
-  isUpgradable = False\n
+  return software_release\n
 \n
-return isUpgradable\n
+return None\n
 </string> </value>
         </item>
         <item>
@@ -94,7 +98,7 @@ return isUpgradable\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>HostingSubscription_isUpgradable</string> </value>
+            <value> <string>HostingSubscription_getUpgradableSoftwareRelease</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_pdm/bt/revision

-33
+34