slapos_cloud: drop template_software_instance

master/bt5/slapos_cloud/PathTemplateItem/software_instance_module/template_software_instance.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Software Instance" 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>categories</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_xml</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<?xml version=\'1.0\' encoding=\'utf-8\'?>\n
-<instance>\n
-  <parameter id="parameter1">valueof1</parameter>\n
-  <parameter id="parameter2">https://niut:pass@example.com:4567/arfarf/oink?m=1#4.5</parameter>\n
-</instance>\n
-
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>default_destination_reference</string> </key>
-            <value> <string>02</string> </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>SItestVifibSlaposRestAPIV1.TestVifibSlaposRestAPIV1.test_instance_destruction_started0.325656030454</string> </value>
-        </item>
-        <item>
-            <key> <string>default_source_reference</string> </key>
-            <value> <string>RootSoftwareInstance</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>template_software_instance</string> </value>
-        </item>
-        <item>
-            <key> <string>language</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Software Instance</string> </value>
-        </item>
-        <item>
-            <key> <string>sla_xml</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<?xml version=\'1.0\' encoding=\'utf-8\'?>\n
-<instance>\n
-<parameter id="computer_guid">SOMECOMP</parameter>\n
-</instance>\n
-
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>ssl_certificate</string> </key>
-            <value> <string>Certificate:\n
-    Data:\n
-        Version: 3 (0x2)\n
-        Serial Number: 2 (0x2)\n
-    Signature Algorithm: sha1WithRSAEncryption\n
-        Issuer: C=PL, ST=Silesia, L=Bytom, O=Luke Ltd, CN=Certificate Authority bdbe24bc-889b-11e1-973b-00215dc2e59c/emailAddress=luke@nexedi.com\n
-        Validity\n
-            Not Before: Apr 19 14:28:02 2012 GMT\n
-            Not After : Apr 17 14:28:02 2022 GMT\n
-        Subject: C=PL, ST=Silesia, O=Luke Ltd, CN=SOFTINST-0/emailAddress=luke@nexedi.com\n
-        Subject Public Key Info:\n
-            Public Key Algorithm: rsaEncryption\n
-                Public-Key: (2048 bit)\n
-                Modulus:\n
-                    00:b8:98:81:1c:ba:85:f3:d0:a6:bd:83:06:5a:06:\n
-                    4a:b6:1e:ed:32:44:81:9e:97:b9:33:0a:e1:cd:7c:\n
-                    02:f8:1e:c5:56:8e:e6:75:c5:a2:44:a8:60:3d:f1:\n
-                    be:b4:c5:91:00:21:a4:89:a7:00:c3:9f:3d:49:1e:\n
-                    ed:be:37:3b:06:95:56:2f:2f:0a:7f:80:e8:69:13:\n
-                    57:51:54:6e:c6:16:bf:3d:74:3a:84:68:10:ec:be:\n
-                    bc:60:5a:d9:07:dd:00:0a:55:78:d9:6d:42:12:c3:\n
-                    ba:93:f4:8f:16:29:00:21:4c:86:cc:40:0f:61:ad:\n
-                    27:aa:42:8a:ff:59:94:21:c0:d1:25:dc:99:c6:20:\n
-                    3b:43:e0:60:0c:e7:86:e1:18:bc:44:eb:12:77:5f:\n
-                    f8:a7:57:61:e4:63:63:f8:20:48:6e:3b:64:c9:97:\n
-                    ab:4b:ea:3a:e8:96:e9:ff:98:36:aa:d8:c6:77:c5:\n
-                    eb:48:24:05:a9:b0:45:34:ea:81:57:df:64:29:a0:\n
-                    fa:0e:5c:d2:ff:47:5a:90:63:a6:3d:27:19:31:88:\n
-                    07:0e:d0:17:ae:17:1a:c8:fc:e8:75:ca:17:24:33:\n
-                    99:4d:51:c2:6b:26:69:35:94:88:97:3c:68:d1:b5:\n
-                    6b:84:75:55:fa:0c:15:d1:8a:80:d1:7e:aa:0a:4e:\n
-                    4e:e7\n
-                Exponent: 65537 (0x10001)\n
-        X509v3 extensions:\n
-            X509v3 Basic Constraints: \n
-                CA:FALSE\n
-            Netscape Comment: \n
-                OpenSSL Generated Certificate\n
-            X509v3 Subject Key Identifier: \n
-                DE:9F:89:65:E1:7C:A3:88:A1:EE:79:A4:81:A8:97:C5:F5:E5:6B:DA\n
-            X509v3 Authority Key Identifier: \n
-                keyid:98:C1:BA:FC:AE:0A:0E:B1:0D:80:79:95:1A:7B:BE:6E:F4:DE:31:9E\n
-\n
-    Signature Algorithm: sha1WithRSAEncryption\n
-         73:b2:c7:a9:e2:75:b7:69:a7:11:1b:8b:8a:eb:1f:bd:37:a8:\n
-         73:d0:67:00:d9:54:ca:c3:82:f5:f4:e1:6f:0d:ad:2c:50:b2:\n
-         ec:74:ae:c1:87:bc:33:4e:8e:e7:56:be:1c:77:7f:7c:2d:90:\n
-         19:54:ed:ac:a7:99:cb:01:4c:df:ca:c7:9f:56:32:3e:7a:98:\n
-         fe:bf:73:fc:12:d3:33:dc:f4:10:16:0a:1f:c4:10:33:e0:14:\n
-         0a:2f:dd:7a:5d:34:ec:1a:b0:68:d1:ec:91:cb:9a:c6:b7:8a:\n
-         04:b8:69:50:b0:ef:34:2a:62:af:95:43:86:5b:6c:92:65:25:\n
-         e5:6d:0c:95:f3:f7:19:0f:33:71:12:80:fe:21:da:f1:8a:24:\n
-         bb:ae:75:3d:af:b6:22:f4:01:26:31:23:1f:a9:8d:6a:7c:a8:\n
-         1a:81:7b:38:12:e1:95:62:3c:22:f1:66:81:8e:88:6b:a6:e0:\n
-         0e:9a:54:69:08:96:ad:42:d4:43:0c:8a:48:7b:fc:72:9c:b8:\n
-         7c:f9:7b:6f:55:35:86:66:26:92:2c:5f:8d:0a:85:94:87:c4:\n
-         41:cb:b7:35:52:80:a6:5a:f4:0d:a8:93:bc:88:41:29:d5:cf:\n
-         af:bd:f2:e5:28:a1:cb:d6:d2:aa:c3:e4:0e:0b:11:e9:85:ea:\n
-         7b:2d:7b:14\n
------BEGIN CERTIFICATE-----\n
-MIIEBTCCAu2gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBpzELMAkGA1UEBhMCUEwx\n
-EDAOBgNVBAgMB1NpbGVzaWExDjAMBgNVBAcMBUJ5dG9tMREwDwYDVQQKDAhMdWtl\n
-IEx0ZDFDMEEGA1UEAww6Q2VydGlmaWNhdGUgQXV0aG9yaXR5IGJkYmUyNGJjLTg4\n
-OWItMTFlMS05NzNiLTAwMjE1ZGMyZTU5YzEeMBwGCSqGSIb3DQEJARYPbHVrZUBu\n
-ZXhlZGkuY29tMB4XDTEyMDQxOTE0MjgwMloXDTIyMDQxNzE0MjgwMlowZzELMAkG\n
-A1UEBhMCUEwxEDAOBgNVBAgMB1NpbGVzaWExETAPBgNVBAoMCEx1a2UgTHRkMRMw\n
-EQYDVQQDDApTT0ZUSU5TVC0wMR4wHAYJKoZIhvcNAQkBFg9sdWtlQG5leGVkaS5j\n
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4mIEcuoXz0Ka9gwZa\n
-Bkq2Hu0yRIGel7kzCuHNfAL4HsVWjuZ1xaJEqGA98b60xZEAIaSJpwDDnz1JHu2+\n
-NzsGlVYvLwp/gOhpE1dRVG7GFr89dDqEaBDsvrxgWtkH3QAKVXjZbUISw7qT9I8W\n
-KQAhTIbMQA9hrSeqQor/WZQhwNEl3JnGIDtD4GAM54bhGLxE6xJ3X/inV2HkY2P4\n
-IEhuO2TJl6tL6jrolun/mDaq2MZ3xetIJAWpsEU06oFX32QpoPoOXNL/R1qQY6Y9\n
-JxkxiAcO0BeuFxrI/Oh1yhckM5lNUcJrJmk1lIiXPGjRtWuEdVX6DBXRioDRfqoK\n
-Tk7nAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg\n
-R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTen4ll4XyjiKHueaSBqJfF\n
-9eVr2jAfBgNVHSMEGDAWgBSYwbr8rgoOsQ2AeZUae75u9N4xnjANBgkqhkiG9w0B\n
-AQUFAAOCAQEAc7LHqeJ1t2mnERuLiusfvTeoc9BnANlUysOC9fThbw2tLFCy7HSu\n
-wYe8M06O51a+HHd/fC2QGVTtrKeZywFM38rHn1YyPnqY/r9z/BLTM9z0EBYKH8QQ\n
-M+AUCi/del007BqwaNHskcuaxreKBLhpULDvNCpir5VDhltskmUl5W0MlfP3GQ8z\n
-cRKA/iHa8Yoku651Pa+2IvQBJjEjH6mNanyoGoF7OBLhlWI8IvFmgY6Ia6bgDppU\n
-aQiWrULUQwyKSHv8cpy4fPl7b1U1hmYmkixfjQqFlIfEQcu3NVKAplr0DaiTvIhB\n
-KdXPr73y5Sihy9bSqsPkDgsR6YXqey17FA==\n
------END CERTIFICATE-----\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>ssl_key</string> </key>
-            <value> <string>-----BEGIN PRIVATE KEY-----\n
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC4mIEcuoXz0Ka9\n
-gwZaBkq2Hu0yRIGel7kzCuHNfAL4HsVWjuZ1xaJEqGA98b60xZEAIaSJpwDDnz1J\n
-Hu2+NzsGlVYvLwp/gOhpE1dRVG7GFr89dDqEaBDsvrxgWtkH3QAKVXjZbUISw7qT\n
-9I8WKQAhTIbMQA9hrSeqQor/WZQhwNEl3JnGIDtD4GAM54bhGLxE6xJ3X/inV2Hk\n
-Y2P4IEhuO2TJl6tL6jrolun/mDaq2MZ3xetIJAWpsEU06oFX32QpoPoOXNL/R1qQ\n
-Y6Y9JxkxiAcO0BeuFxrI/Oh1yhckM5lNUcJrJmk1lIiXPGjRtWuEdVX6DBXRioDR\n
-fqoKTk7nAgMBAAECggEAMh9et3FCHADktYKVP+6DbM4a89I8K9bgt6ZVx5jLqZmZ\n
-VbZ5hzMBq4jYkRlKAgW/KHz6E1JgV72uQ2N9hG+0vEXiX+9y90oGUTmqNPArH+hf\n
-Rw1/MiKbrdzgg31HfuYYM7YfmVIcZcH1sGTwUUESwvfnhiBCzO/aXFWzLkChg0RE\n
-l3Nk732x5EhY1TdwzWP74QMFOfSfg63LC0+nJByxOYyBZorV16v1VRqGzghRTeGP\n
-v/OpsvhMYXm7kh0kfq7qbXpaeWPnWS06qWM1ekBmdYSgzw4wShgeUrOeb23VmjOW\n
-I8ICPcl4jlrO2tVK1aHupcTZCAvl8SW+0c4jB1qk8QKBgQDjwT/Qz8WKhRw25wlx\n
-I1vJMR1WeoF2FBESojLY3ZZPr035KOM8PjIPPLcjQIvOdOsHhrlvdiI0FYj+3I6q\n
-jB8X3Lq6xBEw7F5516+xVxsfxEE8itMJXK6QNMaeOO2mrnJv6j6Ss6SXQRliqJlO\n
-AQTKeghYWmLlKERpPzPmkGXy2QKBgQDPfQpJQkZbfmKbb+TusycsHj/XVgWTasJS\n
-SuIW9DeFMYfbBLLunzVjBy87XbXpyHeR1XqoPEM6ICDQlUJS5IDwsttJJfrF1iJ3\n
-scGgFg4JIzruqG2t8RLLXKsWpgxQz2Qxqx5DgCdXXAbVdjHkJjQ+PdWb6kDvN+bX\n
-qR+UOa23vwKBgQDaoehgyxMWpjEvgxnNQeQafstq+K7OavT4rjuhcxWX6PEw/c8l\n
-RY9IkUA81vled14nG21nUkADP6kC/zb1AQ3YGkwmfZEDJeSLkkFWPAgNtpfpRlrP\n
-4eixBfikaoG4QD4asQLgURLvH87+plqERvYSaJMaPaox0TXa0pFAA93aAQKBgC6o\n
-LnT0yz9ttxy+15r5fDiGgNKaTFyu6A17O0XwGr//uE3+y4GvGWEwT2WpF+v/ISwQ\n
-9ij4jCF48ggVWDmtmnUFsxvKx45PLab+uMyXyQYy/uCFzUwM5q4GI47PPfu59wzY\n
-LtD881vInNzJXESydpL8cplB3uIsDuO16xz4r2CfAoGBAM57WPeUCBoGUzDXKPR/\n
-XDcGie2q0bRdlCAUMdCucO2A6Nh3WkDu+ZEMW/JwpwYJGTIZ/kN9158Gn4qPYRtg\n
-ZtyrVc7LkDpSHECXGMnvVN8pHoF8bKUS6r1yCvq9Ta+JM7S1M1hwTCkKPACLa7hC\n
-wEsr7FKBunKvatC4k/gNd6dc\n
------END PRIVATE KEY-----\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>text_content</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<?xml version="1.0" encoding="utf-8"?>\n
-<instance>\n
-<parameter id="parameter1">valueof1</parameter>\n
-<parameter id="parameter2">valueof2</parameter>\n
-</instance>
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Template Software Instance</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py

@@ -137,12 +137,6 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
     self.portal.portal_activities.unsubscribe()
     self.new_id = self.generateNewId()
 
-    instance_template = self.portal.software_instance_module.template_software_instance		 
-    if len(instance_template.objectValues()):
-      instance_template.manage_delObjects(		 
-        ids=[i.getId() for i in instance_template.objectValues()])
-
-
   def beforeDumpExpectedConfiguration(self):
     """Overwrite this function on project context to tweak production focus tests"""
     pass
@@ -279,7 +273,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
       person_user.requestSoftwareInstance(**request_kw)
     return person_user.REQUEST.get('request_instance_tree')
 
-  def _makeTree(self, project, requested_template_id='template_software_instance'):
+  def _makeTree(self, project):
     new_id = self.generateNewId()
 
     self.request_kw = dict(
@@ -299,7 +293,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
     self.instance_tree = self.portal.instance_tree_module\
         .newContent(portal_type="Instance Tree")
     self.software_instance = self.portal.software_instance_module\
-        [requested_template_id].Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
 
     self.instance_tree.edit(
         title=self.request_kw['software_title'],
@@ -317,7 +311,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
     self.portal.portal_workflow._jumpToStateFor(self.instance_tree, 'start_requested')
 
     self.requested_software_instance = self.portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
     self.software_instance.edit(
         title=self.request_kw['software_title'],
         reference="TESTSI-%s" % new_id,

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAllocationAlarm.py

@@ -385,7 +385,7 @@ class TestSlapOSAllocation(SlapOSTestCaseMixin):
         portal_type='Compute Partition'))
 
     software_instance2 = self.portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
     software_instance2.edit(
       title=self.generateNewSoftwareTitle(),
       reference="TESTSI-%s" % self.generateNewId(),
@@ -478,7 +478,7 @@ class TestSlapOSAllocation(SlapOSTestCaseMixin):
     )
 
     software_instance2 = self.portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
     software_instance2.edit(
       title=self.generateNewSoftwareTitle(),
       reference="TESTSI-%s" % self.generateNewId(),
@@ -499,7 +499,7 @@ class TestSlapOSAllocation(SlapOSTestCaseMixin):
     )
 
     software_instance3 = self.portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
     software_instance3.edit(
       title=self.generateNewSoftwareTitle(),
       reference="TESTSI-%s" % self.generateNewId(),
@@ -605,7 +605,7 @@ class TestSlapOSAllocation(SlapOSTestCaseMixin):
         portal_type='Compute Partition'))
 
     software_instance2 = self.portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
     software_instance2.edit(
       title=self.generateNewSoftwareTitle(),
       reference="TESTSI-%s" % self.generateNewId(),

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudConstraint.py

@@ -50,7 +50,7 @@ class TestSlapOSComputePartitionConstraint(TestSlapOSConstraintMixin):
     partition = compute_node.newContent(portal_type='Compute Partition')
     self.portal.portal_workflow._jumpToStateFor(partition, 'free')
     software_instance = self.portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
     slave_instance = self.portal.software_instance_module.newContent(
         portal_type='Slave Instance')
 
@@ -89,10 +89,10 @@ class TestSlapOSComputePartitionConstraint(TestSlapOSConstraintMixin):
     partition = compute_node.newContent(portal_type='Compute Partition')
     self.portal.portal_workflow._jumpToStateFor(partition, 'busy')
     software_instance = self.portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
     software_instance.edit(aggregate=partition.getRelativeUrl())
     software_instance_2 = self.portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
     slave_instance = self.portal.software_instance_module.newContent(
         portal_type='Slave Instance')
     slave_instance_2 = self.portal.software_instance_module.newContent(

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudInstanceSlapInterfaceWorkflow.py

@@ -46,7 +46,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflow(SlapOSTestCaseMixin):
     instance_tree = portal.instance_tree_module\
         .newContent(portal_type="Instance Tree")
     self.software_instance = portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
 
     instance_tree.edit(
         title=self.request_kw['software_title'],
@@ -889,7 +889,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
     self.instance_tree = portal.instance_tree_module\
         .newContent(portal_type="Instance Tree")
     self.software_instance = portal.software_instance_module\
-        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+        .newContent(portal_type="Software Instance")
 
     self.instance_tree.edit(
         title=self.request_kw['software_title'],

master/bt5/slapos_cloud/bt/template_path_list

@@ -20,5 +20,4 @@ portal_caches/compute_node_information_cache_factory
 portal_caches/compute_node_information_cache_factory/persistent_cache_plugin
 portal_caches/last_stored_data_cache_factory
 portal_caches/last_stored_data_cache_factory/volatile_cache_plugin
-product_module/compute_node
-software_instance_module/template_software_instance
+product_module/compute_node
\ No newline at end of file
\ No newline at end of file