Speedup preparation.

Jump directly into proper inital state of the tree.

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

@@ -71,9 +71,7 @@
         <item>
             <key> <string>categories</string> </key>
             <value>
-              <tuple>
-                <string>specialise/hosting_subscription_module/template_hosting_subscription</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreSoftwareInstanceRequest.py

@@ -25,10 +25,9 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.setupPortalCertificateAuthority()
 
     safe_xml = '<?xml version="1.0" encoding="utf-8"?><instance></instance>'
-    title = self.generateNewSoftwareTitle()
     self.request_kw = dict(
         software_release=self.generateNewSoftwareReleaseUrl(),
-        software_title=title,
+        software_title=self.generateNewSoftwareTitle(),
         software_type=self.generateNewSoftwareType(),
         instance_xml=safe_xml,
         sla_xml=safe_xml,
@@ -39,18 +38,36 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     # prepare part of tree
     hosting_subscription = portal.hosting_subscription_module\
         .template_hosting_subscription.Base_createCloneDocument(batch_mode=1)
+    self.software_instance = portal.software_instance_module\
+        .template_software_instance.Base_createCloneDocument(batch_mode=1)
+
 
     hosting_subscription.edit(
-        title=title,
-        reference="TESTHS-%s" % new_id
+        title=self.request_kw['software_title'],
+        reference="TESTHS-%s" % new_id,
+        root_software_release_url=self.request_kw['software_release'],
+        source_reference=self.request_kw['software_type'],
+        text_content=self.request_kw['instance_xml'],
+        sla_xml=self.request_kw['sla_xml'],
+        root_slave=self.request_kw['shared'],
+        predecessor=self.software_instance.getRelativeUrl()
     )
     hosting_subscription.updateLocalRolesOnSecurityGroups()
     hosting_subscription.validate()
-    hosting_subscription.requestStart(**self.request_kw)
-    hosting_subscription.requestInstance(**self.request_kw)
-
-    self.software_instance = hosting_subscription.getPredecessorValue(
-        portal_type='Software Instance')
+    self.portal.portal_workflow._jumpToStateFor(hosting_subscription, 'start_requested')
+
+    self.software_instance.edit(
+        title=self.request_kw['software_title'],
+        reference="TESTSI-%s" % new_id,
+        root_software_release_url=self.request_kw['software_release'],
+        source_reference=self.request_kw['software_type'],
+        text_content=self.request_kw['instance_xml'],
+        sla_xml=self.request_kw['sla_xml'],
+        specialise=hosting_subscription.getRelativeUrl()
+    )
+    self.portal.portal_workflow._jumpToStateFor(self.software_instance, 'start_requested')
+    self.software_instance.validate()
+    self.software_instance.updateLocalRolesOnSecurityGroups()
     self.tic()
 
     # Login as new Software Instance

master/bt5/slapos_cloud/bt/revision

-69
\ No newline at end of file
+70
\ No newline at end of file

master/bt5/slapos_cloud/bt/template_path_list

@@ -4,3 +4,4 @@ computer_module/template_computer/**
 hosting_subscription_module/template_hosting_subscription
 person_module/template_member
 person_module/template_member/**
+software_instance_module/template_software_instance
\ No newline at end of file

master/bt5/vifib_slapos_rest_api_v1_test/bt/revision

-84
\ No newline at end of file
+85
\ No newline at end of file

master/bt5/vifib_slapos_rest_api_v1_test/bt/template_path_list

-software_instance_module/template_software_instance
\ No newline at end of file