Skip to content

S
slapos.core
Commit 5d27efe4 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Avoid checking consistency on template objects. 

isIndexable is reseted during Business Template installation so just ignore
such objects during checking.

Note: it is impossible to do "NOT LIKE '%module/template%'" in consistency
alarm configuration query_string parameter.
parent ea2ef504
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 141 deletions
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Base_checkAlarmConsistency.xml
View file @ 5d27efe4
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
<value> <string>from Products.ERP5Type.Constraint import PropertyTypeValidity\n <value> <string>from Products.ERP5Type.Constraint import PropertyTypeValidity\n
from Products.CMFActivity.ActiveResult import ActiveResult\n from Products.CMFActivity.ActiveResult import ActiveResult\n
\n \n
if context.getId().startswith(\'template_\'):\n
return\n
\n
constraint_message_list = []\n constraint_message_list = []\n
\n \n
if context.providesIConstraint():\n if context.providesIConstraint():\n
......
master/bt5/vifib_slap/bt/revision
View file @ 5d27efe4
733 734
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_slapos_core_test/PathTemplateItem/person_module/template_member.xml
View file @ 5d27efe4
...@@ -104,33 +104,6 @@ ...@@ -104,33 +104,6 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>template_member</string> </value> <value> <string>template_member</string> </value>
</item> </item>
<item>
<key> <string>isIndexable</string> </key>
<value>
<object>
<klass>
<global name="PropertyGetter" module="Products.ERP5Type.Accessor.Constant"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>_id</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>value</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item> <item>
<key> <string>last_name</string> </key> <key> <string>last_name</string> </key>
<value> <string>Template</string> </value> <value> <string>Template</string> </value>
......
master/bt5/vifib_slapos_core_test/PathTemplateItem/software_release_module/template_software_release.xml
View file @ 5d27efe4
...@@ -69,33 +69,6 @@ ...@@ -69,33 +69,6 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>template_software_release</string> </value> <value> <string>template_software_release</string> </value>
</item> </item>
<item>
<key> <string>isIndexable</string> </key>
<value>
<object>
<klass>
<global name="PropertyGetter" module="Products.ERP5Type.Accessor.Constant"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>_id</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>value</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item> <item>
<key> <string>language</string> </key> <key> <string>language</string> </key>
<value> <value>
......
master/bt5/vifib_slapos_core_test/TestTemplateItem/testSlapOSCorePersonRequest.py
View file @ 5d27efe4
...@@ -23,7 +23,6 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -23,7 +23,6 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
reference="live_test_%s" % new_id, reference="live_test_%s" % new_id,
url_string=self.generateNewSoftwareReleaseUrl(), url_string=self.generateNewSoftwareReleaseUrl(),
) )
del software_release.isIndexable
software_release.publish() software_release.publish()
self.software_release = software_release self.software_release = software_release
...@@ -35,7 +34,6 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -35,7 +34,6 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
reference="live_test_%s" % new_id, reference="live_test_%s" % new_id,
url_string=self.generateNewSoftwareReleaseUrl(), url_string=self.generateNewSoftwareReleaseUrl(),
) )
del software_release.isIndexable
software_release.publish() software_release.publish()
self.software_release2 = software_release self.software_release2 = software_release
...@@ -47,7 +45,6 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -47,7 +45,6 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
reference="live_test_%s" % new_id, reference="live_test_%s" % new_id,
default_email_text="live_test_%s@example.org" % new_id, default_email_text="live_test_%s@example.org" % new_id,
) )
del person_user.isIndexable
person_user.updateLocalRolesOnSecurityGroups() person_user.updateLocalRolesOnSecurityGroups()
person_user.validate() person_user.validate()
......
master/bt5/vifib_slapos_core_test/bt/revision
View file @ 5d27efe4
8 9
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_slapos_rest_api_v1_test/PathTemplateItem/computer_module/template_computer.xml
View file @ 5d27efe4
...@@ -64,33 +64,6 @@ ...@@ -64,33 +64,6 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>template_computer</string> </value> <value> <string>template_computer</string> </value>
</item> </item>
<item>
<key> <string>isIndexable</string> </key>
<value>
<object>
<klass>
<global name="PropertyGetter" module="Products.ERP5Type.Accessor.Constant"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>_id</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>value</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Computer</string> </value> <value> <string>Computer</string> </value>
......
master/bt5/vifib_slapos_rest_api_v1_test/PathTemplateItem/hosting_subscription_module/template_hosting_subscription.xml
View file @ 5d27efe4
...@@ -101,33 +101,6 @@ ...@@ -101,33 +101,6 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>template_hosting_subscription</string> </value> <value> <string>template_hosting_subscription</string> </value>
</item> </item>
<item>
<key> <string>isIndexable</string> </key>
<value>
<object>
<klass>
<global name="PropertyGetter" module="Products.ERP5Type.Accessor.Constant"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>_id</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>value</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item> <item>
<key> <string>language</string> </key> <key> <string>language</string> </key>
<value> <value>
......
master/bt5/vifib_slapos_rest_api_v1_test/PathTemplateItem/software_instance_module/template_software_instance.xml
View file @ 5d27efe4
...@@ -103,33 +103,6 @@ ...@@ -103,33 +103,6 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>template_software_instance</string> </value> <value> <string>template_software_instance</string> </value>
</item> </item>
<item>
<key> <string>isIndexable</string> </key>
<value>
<object>
<klass>
<global name="PropertyGetter" module="Products.ERP5Type.Accessor.Constant"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>_id</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>value</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Software Instance</string> </value> <value> <string>Software Instance</string> </value>
......
master/bt5/vifib_slapos_rest_api_v1_test/bt/revision
View file @ 5d27efe4
62 63
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7