Commit 64eeb3b8 authored by Romain Courteaud's avatar Romain Courteaud

No need to create update packing list if previous has not been done yet.

parent 085ac44f
...@@ -69,13 +69,14 @@ for tag in tag_list:\n ...@@ -69,13 +69,14 @@ for tag in tag_list:\n
return\n return\n
portal_preferences = portal.portal_preferences\n portal_preferences = portal.portal_preferences\n
\n \n
update_resource_relative_url = portal.restrictedTraverse(portal_preferences.getPreferredInstanceUpdateResource()).getUid()\n update_resource_uid = portal.restrictedTraverse(portal_preferences.getPreferredInstanceUpdateResource()).getUid()\n
setup_resource_uid = portal.restrictedTraverse(portal_preferences.getPreferredInstanceSetupResource()).getUid()\n setup_resource_uid = portal.restrictedTraverse(portal_preferences.getPreferredInstanceSetupResource()).getUid()\n
hosting_resource_uid = portal.restrictedTraverse(portal_preferences.getPreferredInstanceHostingResource()).getUid()\n hosting_resource_uid = portal.restrictedTraverse(portal_preferences.getPreferredInstanceHostingResource()).getUid()\n
\n \n
service_uid_state_mapping = {\n service_uid_state_mapping = {\n
setup_resource_uid: [\'stopped\'],\n setup_resource_uid: [\'stopped\'],\n
hosting_resource_uid: [\'started\', \'delivered\']\n hosting_resource_uid: [\'started\', \'delivered\'],\n
update_resource_uid: [\'started\', \'stopped\', \'delivered\'],\n
}\n }\n
try:\n try:\n
previous_packing_list_line = context.SoftwareInstance_getInstancePackingListLine(state_change)\n previous_packing_list_line = context.SoftwareInstance_getInstancePackingListLine(state_change)\n
...@@ -83,12 +84,16 @@ except ValueError:\n ...@@ -83,12 +84,16 @@ except ValueError:\n
# no packing list yet, no need to update\n # no packing list yet, no need to update\n
return\n return\n
\n \n
if previous_packing_list_line.getResourceUid() == hosting_resource_uid:\n resource_uid = previous_packing_list_line.getResourceUid()\n
if resource_uid == hosting_resource_uid:\n
if previous_packing_list_line.getSimulationState() not in service_uid_state_mapping[hosting_resource_uid]:\n if previous_packing_list_line.getSimulationState() not in service_uid_state_mapping[hosting_resource_uid]:\n
return\n return\n
elif previous_packing_list_line.getResourceUid() == setup_resource_uid:\n elif resource_uid == setup_resource_uid:\n
if previous_packing_list_line.getSimulationState() not in service_uid_state_mapping[setup_resource_uid]:\n if previous_packing_list_line.getSimulationState() not in service_uid_state_mapping[setup_resource_uid]:\n
return\n return\n
elif resource_uid == update_resource_uid:\n
if previous_packing_list_line.getSimulationState() not in service_uid_state_mapping[update_resource_uid]:\n
return\n
else:\n else:\n
# not "supported" resource, eg. cleanup\n # not "supported" resource, eg. cleanup\n
return\n return\n
......
382 383
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment