Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos.core
Commits
89e09478
Commit
89e09478
authored
May 28, 2012
by
Romain Courteaud
🐸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be consistent with hosting subscription creation.
Directly provide the instance document in the request.
parent
75f81343
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
9 deletions
+6
-9
master/bt5/vifib_slapos_core/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/scripts/RequesterInstance_request.xml
..._interface_workflow/scripts/RequesterInstance_request.xml
+1
-1
master/bt5/vifib_slapos_core/bt/revision
master/bt5/vifib_slapos_core/bt/revision
+1
-1
master/product/Vifib/Tool/SlapTool.py
master/product/Vifib/Tool/SlapTool.py
+2
-3
master/product/Vifib/tests/testVifibSlapWebService.py
master/product/Vifib/tests/testVifibSlapWebService.py
+2
-4
No files found.
master/bt5/vifib_slapos_core/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/scripts/RequesterInstance_request.xml
View file @
89e09478
...
...
@@ -170,7 +170,7 @@ promise_kw = {\n
\'shared\': is_slave,\n
}\n
request_software_instance_url = request_software_instance.getRelativeUrl()\n
context.REQUEST.set(\'request_instance\', request_software_instance
_url
)\n
context.REQUEST.set(\'request_instance\', request_software_instance)\n
if (root_state == "started"):\n
request_software_instance.requestStart(**promise_kw)\n
elif (root_state == "stopped"):\n
...
...
master/bt5/vifib_slapos_core/bt/revision
View file @
89e09478
34
\ No newline at end of file
35
\ No newline at end of file
master/product/Vifib/Tool/SlapTool.py
View file @
89e09478
...
...
@@ -834,11 +834,10 @@ class SlapTool(BaseTool):
sla_xml
=
sla_xml
,
state
=
state
)
requested_software_instance
_url
=
self
.
REQUEST
.
get
(
'request_instance'
)
if
requested_software_instance
_url
is
None
:
requested_software_instance
=
self
.
REQUEST
.
get
(
'request_instance'
)
if
requested_software_instance
is
None
:
raise
SoftwareInstanceNotReady
else
:
requested_software_instance
=
portal
.
restrictedTraverse
(
requested_software_instance_url
)
if
not
requested_software_instance
.
getAggregate
(
portal_type
=
"Computer Partition"
):
raise
SoftwareInstanceNotReady
else
:
...
...
master/product/Vifib/tests/testVifibSlapWebService.py
View file @
89e09478
...
...
@@ -604,10 +604,8 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
software_instance_portal_type
=
kw
.
get
(
"instance_portal_type"
,
self
.
software_instance_portal_type
)
software_instance
=
self
.
portal
.
unrestrictedTraverse
(
self
.
portal
.
REQUEST
.
get
(
'request_instance'
))
hosting_subscription
=
self
.
portal
.
unrestrictedTraverse
(
self
.
portal
.
REQUEST
.
get
(
'request_hosting_subscription'
))
software_instance
=
self
.
portal
.
REQUEST
.
get
(
'request_instance'
)
hosting_subscription
=
self
.
portal
.
REQUEST
.
get
(
'request_hosting_subscription'
)
sequence
.
edit
(
root_software_instance_title
=
software_title
,
software_instance_uid
=
software_instance
.
getUid
(),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment