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
Léo-Paul Géneau
slapos.core
Commits
0695c0d4
Commit
0695c0d4
authored
Jul 13, 2011
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tinny style changes
parent
d1d71065
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
slapos/proxy/views.py
slapos/proxy/views.py
+7
-7
No files found.
slapos/proxy/views.py
View file @
0695c0d4
...
...
@@ -30,10 +30,10 @@ def xml2dict(xml):
def
partitiondict2partition
(
partition
):
# XXX-Cedric : change function name, as it does no longer create a
# Partition instance, but rather create a dict ready to be sent in json
slap_partition
=
dict
(
computer_id
=
app
.
config
[
'computer_id'
],
computer_partition_id
=
partition
[
'reference'
],
requested_state
=
'started'
,
partition_reference
=
partition
[
'partition_reference'
])
slap_partition
=
dict
(
computer_id
=
app
.
config
[
'computer_id'
],
computer_partition_id
=
partition
[
'reference'
],
requested_state
=
'started'
,
partition_reference
=
partition
[
'partition_reference'
])
if
partition
[
'software_release'
]:
slap_partition
[
'need_modification'
]
=
1
else
:
...
...
@@ -146,7 +146,7 @@ def requestComputerPartition(partition_reference = ''):
if
(
software_type
is
None
):
software_type
=
'RootSoftwareInstance'
software_type
=
software_type
.
encode
()
if
partition_reference
is
''
:
if
partition_reference
is
''
:
partition_reference
=
request_dict
.
get
(
'partition_reference'
,
''
).
encode
()
partition_id
=
request_dict
.
get
(
'computer_partition_id'
,
''
)
if
(
partition_id
is
None
):
...
...
@@ -253,8 +253,8 @@ def loadComputerConfigurationFromXML():
else
:
raise
UnauthorizedError
,
"Only accept request for: %s"
%
\
app
.
config
[
'computer_id'
]
#XXX-Cedric : We still use XML for formatting for now.
#XXX-Cedric : We still use XML for formatting for now.
#@app.route('/loadComputerConfiguration', methods=['POST'])
#def loadComputerConfigurationFromJson():
# json_document = request.form['json']
...
...
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