Commit 8964e6b9 authored by Romain Courteaud's avatar Romain Courteaud

slapos_cloud: ensure Compute Node has no related project security group

parent d40fbbf8
...@@ -42,6 +42,7 @@ class TestSlapOSSecurityMixin(SlapOSTestCaseMixin): ...@@ -42,6 +42,7 @@ class TestSlapOSSecurityMixin(SlapOSTestCaseMixin):
portal_type.replace(" ", "_").lower(), random.random()) portal_type.replace(" ", "_").lower(), random.random())
result_list = self.portal.portal_catalog( result_list = self.portal.portal_catalog(
portal_type=portal_type, portal_type=portal_type,
limit=[0, 1],
**{search_key: random_user_id} **{search_key: random_user_id}
) )
if not len(result_list): if not len(result_list):
...@@ -83,12 +84,15 @@ class TestSlapOSSecurityMixin(SlapOSTestCaseMixin): ...@@ -83,12 +84,15 @@ class TestSlapOSSecurityMixin(SlapOSTestCaseMixin):
(plugin_name, login, password)) (plugin_name, login, password))
class TestSlapOSComputeNodeSecurity(TestSlapOSSecurityMixin): class TestSlapOSComputeNodeSecurity(TestSlapOSSecurityMixin):
def test_active(self, login_portal_type="Certificate Login"): def test_active(self, login_portal_type="Certificate Login"):
user_id = self._generateRandomUniqueUserId('Compute Node') user_id = self._generateRandomUniqueUserId('Compute Node')
reference = self._generateRandomUniqueReference('Compute Node') reference = self._generateRandomUniqueReference('Compute Node')
project = self.addProject()
compute_node = self.portal.compute_node_module.newContent( compute_node = self.portal.compute_node_module.newContent(
portal_type='Compute Node', reference=reference) portal_type='Compute Node', reference=reference, follow_up_value=project)
compute_node.setUserId(user_id) compute_node.setUserId(user_id)
compute_node.validate() compute_node.validate()
compute_node.newContent(portal_type=login_portal_type, compute_node.newContent(portal_type=login_portal_type,
......
...@@ -6,12 +6,6 @@ ...@@ -6,12 +6,6 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>testSlapOSCloudSecurityGroup</string> </value> <value> <string>testSlapOSCloudSecurityGroup</string> </value>
...@@ -55,28 +49,13 @@ ...@@ -55,28 +49,13 @@
<item> <item>
<key> <string>workflow_history</string> </key> <key> <string>workflow_history</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -89,7 +68,7 @@ ...@@ -89,7 +68,7 @@
<item> <item>
<key> <string>component_validation_workflow</string> </key> <key> <string>component_validation_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -98,7 +77,7 @@ ...@@ -98,7 +77,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
......
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