diff --git a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToAllocatePartition.xml b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToAllocatePartition.xml index 6522f3c2f650efca17dbae10dead46a0c4015f1d..e54e72e97d73f6e3e6c3da15457f76a37d143fb1 100644 --- a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToAllocatePartition.xml +++ b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToAllocatePartition.xml @@ -75,13 +75,18 @@ def assignComputerPartition(software_instance):\n if not person.Person_isAllowedToAllocate():\n raise Unauthorized(\'Allocation disallowed\')\n \n - computer_partition_relative_url = person.Person_restrictMethodAsShadowUser(\n - shadow_document=person,\n - callable_object=person.Person_findPartition,\n - argument_list=[software_instance.getUrlString(), software_instance.getSourceReference(),\n - software_instance.getPortalType(), software_instance.getSlaXmlAsDict()])\n + try:\n + sla_dict = software_instance.getSlaXmlAsDict()\n + except Exception:\n + # Note: it is impossible to import module exceptions from python scripts\n + computer_partition_relative_url = None\n + else:\n + computer_partition_relative_url = person.Person_restrictMethodAsShadowUser(\n + shadow_document=person,\n + callable_object=person.Person_findPartition,\n + argument_list=[software_instance.getUrlString(), software_instance.getSourceReference(),\n + software_instance.getPortalType(), sla_dict])\n return computer_partition_relative_url\n - return (None, None)\n \n software_instance = context\n if software_instance.getValidationState() != \'validated\' \\\n diff --git a/master/bt5/slapos_cloud/bt/revision b/master/bt5/slapos_cloud/bt/revision index cb37cb5c1fb749a2eaad380460a926969564408e..e3e1916cf59ce0dff1e15c2e837a89ff67d9e40d 100644 --- a/master/bt5/slapos_cloud/bt/revision +++ b/master/bt5/slapos_cloud/bt/revision @@ -1 +1 @@ -186 \ No newline at end of file +187 \ No newline at end of file