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
Titouan Soulard
slapos.core
Commits
5bf78616
Commit
5bf78616
authored
Apr 05, 2023
by
Romain Courteaud
🐸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: ensure that alarm propagate parameters of orphaned Instance Tree
parent
f7e60568
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
2 deletions
+25
-2
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_assertInstanceTreeHasSuccessor.py
...kins/slapos_cloud/Alarm_assertInstanceTreeHasSuccessor.py
+11
-0
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAlarm.py
...eItem/portal_components/test.erp5.testSlapOSCloudAlarm.py
+14
-2
No files found.
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_assertInstanceTreeHasSuccessor.py
View file @
5bf78616
...
...
@@ -9,4 +9,15 @@ portal.portal_catalog.searchAndActivate(
method_id
=
'InstanceTree_assertSuccessor'
,
activate_kw
=
{
'tag'
:
tag
})
# Instance tree without any Software Instance
select_dict
=
{
'successor__uid'
:
None
}
portal
.
portal_catalog
.
searchAndActivate
(
portal_type
=
'Instance Tree'
,
validation_state
=
'validated'
,
method_id
=
'InstanceTree_assertSuccessor'
,
activate_kw
=
{
'tag'
:
tag
},
left_join_list
=
select_dict
.
keys
(),
**
select_dict
)
context
.
activate
(
after_tag
=
tag
).
getId
()
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAlarm.py
View file @
5bf78616
...
...
@@ -67,7 +67,19 @@ class TestSlapOSCoreSlapOSAssertInstanceTreeSuccessorAlarm(
self
.
assertFalse
(
self
.
instance_tree
.
getTitle
()
in
self
.
instance_tree
.
getSuccessorTitleList
())
def
test_alarm_renamed
(
self
):
def
test_InstanceTree_assertSuccessor_alarm_orphaned
(
self
):
instance_tree
=
self
.
portal
.
instance_tree_module
.
newContent
(
portal_type
=
'Instance Tree'
)
instance_tree
.
validate
()
self
.
tic
()
self
.
_test_alarm
(
self
.
portal
.
portal_alarms
.
slapos_assert_instance_tree_successor
,
instance_tree
,
'InstanceTree_assertSuccessor'
)
def
test_InstanceTree_assertSuccessor_alarm_renamed
(
self
):
self
.
software_instance
.
edit
(
title
=
self
.
generateNewSoftwareTitle
())
self
.
_test_alarm
(
self
.
portal
.
portal_alarms
.
slapos_assert_instance_tree_successor
,
...
...
@@ -75,7 +87,7 @@ class TestSlapOSCoreSlapOSAssertInstanceTreeSuccessorAlarm(
'InstanceTree_assertSuccessor'
)
def
test_alarm_not_renamed
(
self
):
def
test_
InstanceTree_assertSuccessor_
alarm_not_renamed
(
self
):
self
.
_test_alarm_not_visited
(
self
.
portal
.
portal_alarms
.
slapos_assert_instance_tree_successor
,
self
.
instance_tree
,
...
...
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