Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Boxiang Sun
slapos.core
Commits
b111279b
Commit
b111279b
authored
Aug 06, 2014
by
Alain Takoudjou
Committed by
Rafael Monnerat
Nov 10, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve upgrade decision creation
parent
2d16a9e0
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
409 additions
and
522 deletions
+409
-522
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/Computer_checkAndCreateUpgradeDecision.xml
...ins/slapos_pdm/Computer_checkAndCreateUpgradeDecision.xml
+20
-14
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/Computer_hostingSubscriptionCreateUpgradeDecision.xml
...pdm/Computer_hostingSubscriptionCreateUpgradeDecision.xml
+28
-22
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/SoftwareRelease_createUpgradeDecision.xml
...kins/slapos_pdm/SoftwareRelease_createUpgradeDecision.xml
+3
-5
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/SoftwareRelease_getUpgradeDecisionInProgress.xml
...apos_pdm/SoftwareRelease_getUpgradeDecisionInProgress.xml
+90
-0
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/UpgradeDecision_tryToCancel.xml
...m/portal_skins/slapos_pdm/UpgradeDecision_tryToCancel.xml
+15
-24
master/bt5/slapos_pdm/TestTemplateItem/testSlapOSPDMSkins.py
master/bt5/slapos_pdm/TestTemplateItem/testSlapOSPDMSkins.py
+252
-456
master/bt5/slapos_pdm/bt/revision
master/bt5/slapos_pdm/bt/revision
+1
-1
No files found.
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/Computer_checkAndCreateUpgradeDecision.xml
View file @
b111279b
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
<value>
<string>
computer = context\n
<value>
<string>
computer = context\n
portal = context.getPortalObject()\n
portal = context.getPortalObject()\n
\n
\n
full_software_release_list = [si.getUrlString() for si in
\n
full_software_release_list = [si.getUrlString() for si in\n
portal.portal_catalog(\n
portal.portal_catalog(\n
portal_type=\'Software Installation\',\n
portal_type=\'Software Installation\',\n
default_aggregate_uid=computer.getUid(),\n
default_aggregate_uid=computer.getUid(),\n
...
@@ -68,7 +68,7 @@ software_release_list = portal.portal_catalog(\n
...
@@ -68,7 +68,7 @@ software_release_list = portal.portal_catalog(\n
url_string=full_software_release_list,\n
url_string=full_software_release_list,\n
group_by=\'default_aggregate_uid\'\n
group_by=\'default_aggregate_uid\'\n
)\n
)\n
\n
upgrade_decision_list = []
\n
for software_release in software_release_list:\n
for software_release in software_release_list:\n
software_product_reference = software_release.getAggregateReference()\n
software_product_reference = software_release.getAggregateReference()\n
sorted_list = portal.SoftwareProduct_getSortedSoftwareReleaseList(\n
sorted_list = portal.SoftwareProduct_getSortedSoftwareReleaseList(\n
...
@@ -81,15 +81,21 @@ for software_release in software_release_list:\n
...
@@ -81,15 +81,21 @@ for software_release in software_release_list:\n
newer_release = sorted_list[0]\n
newer_release = sorted_list[0]\n
title = \'A new software release is available for %s\' % \\\n
title = \'A new software release is available for %s\' % \\\n
software_product_reference\n
software_product_reference\n
# Search if exist upgrade decision for this software product (by title)\n
# If exist upgrade decision in progress try to cancel it\n
is_decision_in_progress = newer_release.\\\n
decision_in_progress = newer_release.\\\n
SoftwareRelease_isUpgradeDecisionInProgress(title=title)\n
SoftwareRelease_getUpgradeDecisionInProgress(computer.getUid())\n
if is_decision_in_progress:\n
if decision_in_progress and \\\n
not decision_in_progress.UpgradeDecision_tryToCancel(\n
newer_release.getUrlString()):\n
continue\n
continue\n
\n
\n
return newer_release.SoftwareRelease_createUpgradeDecision(\n
upgrade_decision = newer_release.SoftwareRelease_createUpgradeDecision(\n
source_url=computer.getRelativeUrl(), title=title\n
source_url=computer.getRelativeUrl(),\n
)\n
title=title)\n
upgrade_decision.confirm()\n
upgrade_decision_list.append(upgrade_decision)\n
\n
return upgrade_decision_list\n
</string>
</value>
</string>
</value>
</item>
</item>
<item>
<item>
...
...
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/Computer_hostingSubscriptionCreateUpgradeDecision.xml
View file @
b111279b
...
@@ -50,30 +50,30 @@
...
@@ -50,30 +50,30 @@
</item>
</item>
<item>
<item>
<key>
<string>
_body
</string>
</key>
<key>
<string>
_body
</string>
</key>
<value>
<string>
computer = context\n
<value>
<string>
portal = context.getPortalObject()\n
portal = context.getPortalObject()\n
\n
\n
partition_list = portal.portal_catalog(portal_type=\'Computer Partition\',\n
partition_list = portal.portal_catalog(portal_type=\'Computer Partition\',\n
free_for_request=0,\n
free_for_request=0,\n
parent_uid=computer.getUid())\n
parent_uid=context.getUid())\n
valid_slap_state = [\'start_requested\', \'stop_requested\']\n
\n
\n
# Get Hosting Subscription for all allocated partition\n
hosting_subscription_list = []\n
hosting_subscription_list = []\n
upgrade_decision_list = []\n
for partition in partition_list:\n
for partition in partition_list:\n
software_instance = partition.getAggregateRelatedValue(\n
software_instance = partition.getAggregateRelatedValue(\n
portal_type=\'Software Instance\')\n
portal_type=\'Software Instance\')\n
if software_instance:\n
if not software_instance:\n
hs = software_instance.getSpecialiseValue(\n
continue\n
portal_type=\'Hosting Subscription\')\n
if hs and hs.getSlapState() in \\\n
[\'start_requested\', \'stop_requested\'] and \\\n
not hs in hosting_subscription_list:\n
hosting_subscription_list.append(hs)\n
\n
\n
if len(hosting_subscription_list) == 0:\n
hosting_subscription = software_instance.getSpecialiseValue(\n
return\n
portal_type=\'Hosting Subscription\')\n
if hosting_subscription and hosting_subscription.getSlapState() \\\n
in valid_slap_state and not \\\n
hosting_subscription in hosting_subscription_list:\n
hosting_subscription_list.append(hosting_subscription)\n
else:\n
continue\n
\n
\n
for hosting_subscription in hosting_subscription_list:\n
is_upgradable = hosting_subscription.HostingSubscription_isUpgradable()\n
is_upgradable = hosting_subscription.HostingSubscription_isUpgradable()\n
if not is_upgradable:\n
if not is_upgradable:\n
continue\n
continue\n
...
@@ -82,7 +82,8 @@ for hosting_subscription in hosting_subscription_list:\n
...
@@ -82,7 +82,8 @@ for hosting_subscription in hosting_subscription_list:\n
HostingSubscription_getNewerSofwareRelease()\n
HostingSubscription_getNewerSofwareRelease()\n
if not newer_release_string:\n
if not newer_release_string:\n
continue\n
continue\n
\n
# XXX - Should try to change method HostingSubscription_getNewerSofwareRelease\n
# to return software_release object directly\n
software_release = portal.portal_catalog.getResultValue(\n
software_release = portal.portal_catalog.getResultValue(\n
portal_type=\'Software Release\',\n
portal_type=\'Software Release\',\n
url_string=newer_release_string)\n
url_string=newer_release_string)\n
...
@@ -91,15 +92,20 @@ for hosting_subscription in hosting_subscription_list:\n
...
@@ -91,15 +92,20 @@ for hosting_subscription in hosting_subscription_list:\n
\n
\n
title = \'A new software release is available for %s\' % \\\n
title = \'A new software release is available for %s\' % \\\n
hosting_subscription.getReference()\n
hosting_subscription.getReference()\n
# Search if exist upgrade decision for this Hosting Subscription (by title)\n
decision_in_progress = software_release.\\\n
is_decision_in_progress = software_release.\\\n
SoftwareRelease_getUpgradeDecisionInProgress(hosting_subscription.getUid())\n
SoftwareRelease_isUpgradeDecisionInProgress(title=title)\n
\n
if is_decision_in_progress:\n
if decision_in_progress and \\\n
not decision_in_progress.UpgradeDecision_tryToCancel(newer_release_string):\n
continue\n
continue\n
\n
upgrade_decision = software_release.SoftwareRelease_createUpgradeDecision(\n
source_url=hosting_subscription.getRelativeUrl(),\n
title=title)\n
upgrade_decision.confirm()\n
upgrade_decision_list.append(upgrade_decision)\n
\n
\n
return software_release.SoftwareRelease_createUpgradeDecision(\n
return upgrade_decision_list\n
source_url=hosting_subscription.getRelativeUrl(), title=title\n
)\n
</string>
</value>
</string>
</value>
</item>
</item>
<item>
<item>
...
...
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/SoftwareRelease_createUpgradeDecision.xml
View file @
b111279b
...
@@ -55,8 +55,8 @@
...
@@ -55,8 +55,8 @@
from DateTime import DateTime\n
from DateTime import DateTime\n
\n
\n
portal = context.getPortalObject()\n
portal = context.getPortalObject()\n
\n
software_release = context\n
software_release = context\n
\n
source_product = portal.restrictedTraverse(source_url, None)\n
source_product = portal.restrictedTraverse(source_url, None)\n
if not source_product:\n
if not source_product:\n
return\n
return\n
...
@@ -73,14 +73,12 @@ if not person_url:\n
...
@@ -73,14 +73,12 @@ if not person_url:\n
return\n
return\n
\n
\n
upgrade_decision = portal.upgrade_decision_module.\\\n
upgrade_decision = portal.upgrade_decision_module.\\\n
template_upgrade_decision.Base_createCloneDocument(batch_mode=1)
\n
template_upgrade_decision.Base_createCloneDocument(batch_mode=1)\n
upgrade_decision.edit(\n
upgrade_decision.edit(\n
title=title,\n
title=title,\n
destination_section=person_url,\n
destination_section=person_url,\n
destination_decision=person_url,\n
destination_decision=person_url\n
start_date=DateTime()\n
)\n
)\n
upgrade_decision.confirm()\n
decision_line_list = upgrade_decision.contentValues(\n
decision_line_list = upgrade_decision.contentValues(\n
portal_type=\'Upgrade Decision Line\')\n
portal_type=\'Upgrade Decision Line\')\n
if len(decision_line_list) >
0:\n
if len(decision_line_list) >
0:\n
...
...
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/SoftwareRelease_getUpgradeDecisionInProgress.xml
0 → 100644
View file @
b111279b
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"PythonScript"
module=
"Products.PythonScripts.PythonScript"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
Script_magic
</string>
</key>
<value>
<int>
3
</int>
</value>
</item>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_body
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
portal = context.getPortalObject()\n
product_reference = context.getAggregateReference()\n
\n
decision_line_in_progress_list = portal.portal_catalog(\n
portal_type=\'Upgrade Decision Line\',\n
aggregate_uid=aggregate_uid)\n
\n
for decision_line in decision_line_in_progress_list:\n
upgrade_decision = decision_line.getParentValue()\n
if upgrade_decision.getSimulationState() not in [\'planned\',\n
\'confirmed\', \'started\', \'stopped\']:\n
continue\n
release_list = decision_line.getAggregateValueList(portal_type="Software Release")\n
if len(release_list) >
1:\n
continue\n
if not release_list[0]:\n
continue\n
# If both software release belong to the same software product, there is an upgrade decision in progress \n
if product_reference == release_list[0].getAggregateReference():\n
return upgrade_decision\n
]]>
</string>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
aggregate_uid
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
SoftwareRelease_getUpgradeDecisionInProgress
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/
SoftwareRelease_isUpgradeDecisionInProgress
.xml
→
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/
UpgradeDecision_tryToCancel
.xml
View file @
b111279b
...
@@ -50,39 +50,30 @@
...
@@ -50,39 +50,30 @@
</item>
</item>
<item>
<item>
<key>
<string>
_body
</string>
</key>
<key>
<string>
_body
</string>
</key>
<value>
<string>
u
rl_string = context.getUrlString()
\n
<value>
<string>
u
pgrade_decision = context
\n
portal = context.getPortalObject()
\n
cancel_state_list = [\'confirmed\', \'planned\']
\n
\n
\n
# Check if there is an upgrade decision in progress\n
if upgrade_decision.getSimulationState() in cancel_state_list:\n
kw[\'portal_type\'] = \'Upgrade Decision\'\n
current_release = upgrade_decision.UpgradeDecision_getSoftwareRelease()\n
upgrade_decision_in_progress = portal.portal_catalog(**kw)\n
if not current_release:\n
\n
# This upgrade decision is not valid\n
if len(upgrade_decision_in_progress) == 0:\n
return True\n
if current_release.getUrlString() == new_url_string:\n
# Cannot cancel because the software releases are the same\n
return False\n
upgrade_decision.cancel()\n
return True\n
else:\n
return False\n
return False\n
\n
in_progress = False\n
for decision_in_progress in upgrade_decision_in_progress:\n
try:\n
software_release = decision_in_progress.\\\n
UpgradeDecision_getSoftwareRelease()\n
except ValueError:\n
continue\n
if not software_release:\n
continue\n
if url_string == software_release.getUrlString():\n
in_progress = True\n
break\n
\n
return in_progress\n
</string>
</value>
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
**kw
</string>
</value>
<value>
<string>
new_url_string
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
SoftwareRelease_isUpgradeDecisionInProgress
</string>
</value>
<value>
<string>
UpgradeDecision_tryToCancel
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_pdm/TestTemplateItem/testSlapOSPDMSkins.py
View file @
b111279b
This diff is collapsed.
Click to expand it.
master/bt5/slapos_pdm/bt/revision
View file @
b111279b
28
29
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment