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
Labels
Merge Requests
20
Merge Requests
20
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
945e47cb
Commit
945e47cb
authored
Jul 28, 2014
by
Alain Takoudjou
Committed by
Rafael Monnerat
Jul 30, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename HostingSubscription_checkSofwareInstanceState, set alarm period to 30 minutes
parent
3e25c3f6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
master/bt5/slapos_crm/PathTemplateItem/portal_alarms/slapos_crm_check_partially_allocated_instance.xml
..._alarms/slapos_crm_check_partially_allocated_instance.xml
+5
-5
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/Alarm_findAndNofitiyUnallocatedSoftwareInstance.xml
...s_crm/Alarm_findAndNofitiyUnallocatedSoftwareInstance.xml
+5
-4
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/HostingSubscription_checkSofwareInstanceAllocationState.xml
...stingSubscription_checkSofwareInstanceAllocationState.xml
+4
-5
master/bt5/slapos_crm/bt/revision
master/bt5/slapos_crm/bt/revision
+1
-1
No files found.
master/bt5/slapos_crm/PathTemplateItem/portal_alarms/slapos_crm_check_partially_allocated_instance.xml
View file @
945e47cb
...
...
@@ -26,13 +26,15 @@
<key>
<string>
periodicity_hour
</string>
</key>
<value>
<tuple>
<int>
1
</int>
<int>
0
</int>
</tuple>
</value>
</item>
<item>
<key>
<string>
periodicity_hour_frequency
</string>
</key>
<value>
<int>
1
</int>
</value>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
periodicity_minute
</string>
</key>
...
...
@@ -44,9 +46,7 @@
</item>
<item>
<key>
<string>
periodicity_minute_frequency
</string>
</key>
<value>
<none/>
</value>
<value>
<int>
30
</int>
</value>
</item>
<item>
<key>
<string>
periodicity_month
</string>
</key>
...
...
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/Alarm_findAndNofitiyUnallocatedSoftwareInstance.xml
View file @
945e47cb
...
...
@@ -63,20 +63,21 @@ software_instance_list = context.portal_catalog(\n
# XXX slap_state=["start_requested", "stop_requested"],\n
default_aggregate_uid=None,\n
select_dict=select_dict,\n
left_join_list=select_dict.keys()\n
left_join_list=select_dict.keys(),\n
group_by="specialise_uid"\n
)\n
\n
#Get the list of concerned Hosting Subscription reference\n
hs_reference_list =
set(
[si.getSpecialiseReference() for si in software_instance_list \n
hs_reference_list = [si.getSpecialiseReference() for si in software_instance_list \n
if si.getSlapState() in [\'start_requested\', \'stop_requested\']\n
]
)
\n
]\n
\n
if len(hs_reference_list) >
0:\n
portal.portal_catalog.searchAndActivate(\n
portal_type=\'Hosting Subscription\',\n
validation_state=\'validated\',\n
reference=hs_reference_list,\n
method_id=\'HostingSubscription_checkSofwareInstanceState\',\n
method_id=\'HostingSubscription_checkSofwareInstance
Allocation
State\',\n
activate_kw = {\'tag\':tag}\n
)\n
\n
...
...
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/HostingSubscription_checkSofwareInstanceState.xml
→
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/HostingSubscription_checkSofwareInstance
Allocation
State.xml
View file @
945e47cb
...
...
@@ -88,11 +88,10 @@ for instance in software_instance_list:\n
\n
if
has_unallocated_instance
and
has_newest_allocated_instance:\n
return
context.Base_generateSupportRequestForSlapOS(\n
"Hosting
Subscription
%s
(%s)
is
partially
allocated"
%
(hs_title,\n
hosting_subscription.getReference()),\n
"%s
has
allocated
instance(s)
but,
instance
%s
(%s)
has
been
unallocated
for
more
than
4
hours."
%
(\n
"Hosting
Subscription
%s
is
partially
allocated"
%
hs_title,\n
"%s
has
allocated
instance(s)
but,
the
instance
%s
(%s)
has
been
unallocated
for
more
than
4
hours."
%
(\n
hs_title,
failing_instance.getTitle(),
failing_instance.getAbsoluteUrl()),\n
source_instance
.getRelativeUrl())\n
hosting_subscription
.getRelativeUrl())\n
else:\n
return\n
...
...
@@ -105,7 +104,7 @@ else:\n
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
HostingSubscription_checkSofwareInstanceState
</string>
</value>
<value>
<string>
HostingSubscription_checkSofwareInstance
Allocation
State
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
master/bt5/slapos_crm/bt/revision
View file @
945e47cb
38
\ No newline at end of file
39
\ 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