Commit 35dfe3f1 authored by Romain Courteaud's avatar Romain Courteaud

slapos_cloud: drop template_software_installation

parent 7b9695e6
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Software Installation" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>template_software_installation</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Software Installation</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -428,7 +428,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -428,7 +428,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
p.validate() p.validate()
self.start_requested_software_installation = self.portal.software_installation_module\ self.start_requested_software_installation = self.portal.software_installation_module\
.template_software_installation.Base_createCloneDocument(batch_mode=1) .newContent(portal_type="Software Installation")
self.start_requested_software_installation.edit( self.start_requested_software_installation.edit(
url_string=self.generateNewSoftwareReleaseUrl(), url_string=self.generateNewSoftwareReleaseUrl(),
aggregate=self.compute_node.getRelativeUrl(), aggregate=self.compute_node.getRelativeUrl(),
...@@ -440,7 +440,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -440,7 +440,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
self.start_requested_software_installation.requestStart() self.start_requested_software_installation.requestStart()
self.destroy_requested_software_installation = self.portal.software_installation_module\ self.destroy_requested_software_installation = self.portal.software_installation_module\
.template_software_installation.Base_createCloneDocument(batch_mode=1) .newContent(portal_type="Software Installation")
self.destroy_requested_software_installation.edit( self.destroy_requested_software_installation.edit(
url_string=self.generateNewSoftwareReleaseUrl(), url_string=self.generateNewSoftwareReleaseUrl(),
aggregate=self.compute_node.getRelativeUrl(), aggregate=self.compute_node.getRelativeUrl(),
...@@ -453,7 +453,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -453,7 +453,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
self.destroy_requested_software_installation.requestDestroy() self.destroy_requested_software_installation.requestDestroy()
self.destroyed_software_installation = self.portal.software_installation_module\ self.destroyed_software_installation = self.portal.software_installation_module\
.template_software_installation.Base_createCloneDocument(batch_mode=1) .newContent(portal_type="Software Installation")
self.destroyed_software_installation.edit( self.destroyed_software_installation.edit(
url_string=self.generateNewSoftwareReleaseUrl(), url_string=self.generateNewSoftwareReleaseUrl(),
aggregate=self.compute_node.getRelativeUrl(), aggregate=self.compute_node.getRelativeUrl(),
......
...@@ -53,7 +53,7 @@ class TestSlapOSAllocation(SlapOSTestCaseMixin): ...@@ -53,7 +53,7 @@ class TestSlapOSAllocation(SlapOSTestCaseMixin):
def _installSoftware(self, compute_node, url): def _installSoftware(self, compute_node, url):
software_installation = self.portal.software_installation_module\ software_installation = self.portal.software_installation_module\
.template_software_installation.Base_createCloneDocument(batch_mode=1) .newContent(portal_type="Software Installation")
software_installation.edit(url_string=url, software_installation.edit(url_string=url,
reference='TESTSOFTINST-%s' % self.generateNewId(), reference='TESTSOFTINST-%s' % self.generateNewId(),
aggregate=compute_node.getRelativeUrl()) aggregate=compute_node.getRelativeUrl())
......
...@@ -24,5 +24,4 @@ portal_caches/compute_node_information_cache_factory/persistent_cache_plugin ...@@ -24,5 +24,4 @@ portal_caches/compute_node_information_cache_factory/persistent_cache_plugin
portal_caches/last_stored_data_cache_factory portal_caches/last_stored_data_cache_factory
portal_caches/last_stored_data_cache_factory/volatile_cache_plugin portal_caches/last_stored_data_cache_factory/volatile_cache_plugin
product_module/compute_node product_module/compute_node
software_installation_module/template_software_installation
software_instance_module/template_software_instance software_instance_module/template_software_instance
\ 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