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
Guillaume Hervier
slapos.core
Commits
94146a07
Commit
94146a07
authored
Aug 04, 2014
by
Alain Takoudjou
Committed by
Rafael Monnerat
Aug 05, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SlapOSRestAPIV1: Also return status for Software Installation
parent
d479f1bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
master/bt5/slapos_rest_api/DocumentTemplateItem/portal_components/SlapOSRestAPIV1.py
...DocumentTemplateItem/portal_components/SlapOSRestAPIV1.py
+4
-3
master/bt5/slapos_rest_api/bt/revision
master/bt5/slapos_rest_api/bt/revision
+1
-1
No files found.
master/bt5/slapos_rest_api/DocumentTemplateItem/portal_components/SlapOSRestAPIV1.py
View file @
94146a07
...
@@ -609,12 +609,13 @@ class StatusPublisher(GenericPublisher):
...
@@ -609,12 +609,13 @@ class StatusPublisher(GenericPublisher):
kw
=
dict
(
kw
=
dict
(
validation_state
=
"validated"
,
validation_state
=
"validated"
,
portal_type
=
[
'Computer'
,
'Software Instance'
]
portal_type
=
[
'Computer'
,
'Software Insta
llation'
,
'Software Insta
nce'
]
)
)
d
=
{
"list"
:
[]}
d
=
{
"list"
:
[]}
a
=
d
[
'list'
].
append
a
=
d
[
'list'
].
append
for
si
in
self
.
getPortalObject
().
portal_catalog
(
**
kw
):
for
si
in
self
.
getPortalObject
().
portal_catalog
(
**
kw
):
if
si
.
getPortalType
()
==
"Software Instance"
and
\
if
(
si
.
getPortalType
()
==
"Software Instance"
or
\
si
.
getPortalType
()
==
"Software Installation"
)
and
\
si
.
getSlapState
()
not
in
[
'start_requested'
,
'stop_requested'
]:
si
.
getSlapState
()
not
in
[
'start_requested'
,
'stop_requested'
]:
continue
continue
if
si
.
getPortalType
()
==
"Computer"
and
\
if
si
.
getPortalType
()
==
"Computer"
and
\
...
@@ -635,7 +636,7 @@ class StatusPublisher(GenericPublisher):
...
@@ -635,7 +636,7 @@ class StatusPublisher(GenericPublisher):
return
self
.
REQUEST
.
response
return
self
.
REQUEST
.
response
# XXX Use a decated document to keep the history
# XXX Use a decated document to keep the history
@
extractDocument
([
'Computer'
,
'Software Instance'
])
@
extractDocument
([
'Computer'
,
'Software Insta
llation'
,
'Software Insta
nce'
])
# @supportModifiedSince('document_url')
# @supportModifiedSince('document_url')
def
__status_info
(
self
):
def
__status_info
(
self
):
certificate
=
False
certificate
=
False
...
...
master/bt5/slapos_rest_api/bt/revision
View file @
94146a07
1
7
1
8
\ No newline at end of file
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