Commit 338d5585 authored by Romain Courteaud's avatar Romain Courteaud

slapos_cloud: project needed in compute node / instance

parent 7be88836
...@@ -269,11 +269,10 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -269,11 +269,10 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
instance_xml=self.generateSafeXml(), instance_xml=self.generateSafeXml(),
sla_xml=self.generateEmptyXml(), sla_xml=self.generateEmptyXml(),
shared=False, shared=False,
state="started" state="started",
project_reference=project.getReference()
) )
self.person_user = self.makePerson(project, new_id=new_id, index=False)
self.commit()
# prepare part of tree # prepare part of tree
self.instance_tree = self.portal.instance_tree_module\ self.instance_tree = self.portal.instance_tree_module\
.template_instance_tree.Base_createCloneDocument(batch_mode=1) .template_instance_tree.Base_createCloneDocument(batch_mode=1)
...@@ -289,7 +288,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -289,7 +288,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
sla_xml=self.request_kw['sla_xml'], sla_xml=self.request_kw['sla_xml'],
root_slave=self.request_kw['shared'], root_slave=self.request_kw['shared'],
successor=self.software_instance.getRelativeUrl(), successor=self.software_instance.getRelativeUrl(),
destination_section=self.person_user.getRelativeUrl() follow_up_value=project
) )
self.instance_tree.validate() self.instance_tree.validate()
self.portal.portal_workflow._jumpToStateFor(self.instance_tree, 'start_requested') self.portal.portal_workflow._jumpToStateFor(self.instance_tree, 'start_requested')
...@@ -304,7 +303,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -304,7 +303,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
text_content=self.request_kw['instance_xml'], text_content=self.request_kw['instance_xml'],
sla_xml=self.request_kw['sla_xml'], sla_xml=self.request_kw['sla_xml'],
specialise=self.instance_tree.getRelativeUrl(), specialise=self.instance_tree.getRelativeUrl(),
successor=self.requested_software_instance.getRelativeUrl() successor=self.requested_software_instance.getRelativeUrl(),
follow_up_value=project
) )
self.portal.portal_workflow._jumpToStateFor(self.software_instance, 'start_requested') self.portal.portal_workflow._jumpToStateFor(self.software_instance, 'start_requested')
self.software_instance.validate() self.software_instance.validate()
...@@ -318,6 +318,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -318,6 +318,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
text_content=self.request_kw['instance_xml'], text_content=self.request_kw['instance_xml'],
sla_xml=self.request_kw['sla_xml'], sla_xml=self.request_kw['sla_xml'],
specialise=self.instance_tree.getRelativeUrl(), specialise=self.instance_tree.getRelativeUrl(),
follow_up_value=project
) )
self.portal.portal_workflow._jumpToStateFor(self.requested_software_instance, 'start_requested') self.portal.portal_workflow._jumpToStateFor(self.requested_software_instance, 'start_requested')
self.requested_software_instance.validate() self.requested_software_instance.validate()
......
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