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
1
Merge Requests
1
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
Romain Courteaud
slapos.core
Commits
6ff45304
Commit
6ff45304
authored
Nov 30, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapproxy: also return instance title and root-intance-title in partition information
parent
410dfb50
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
slapos/proxy/views.py
slapos/proxy/views.py
+6
-0
No files found.
slapos/proxy/views.py
View file @
6ff45304
...
@@ -99,6 +99,8 @@ def partitiondict2partition(partition):
...
@@ -99,6 +99,8 @@ def partitiondict2partition(partition):
slap_partition
.
_need_modification
=
0
slap_partition
.
_need_modification
=
0
slap_partition
.
_instance_guid
=
'%s-%s'
%
(
partition
[
'computer_reference'
],
partition
[
'reference'
])
slap_partition
.
_instance_guid
=
'%s-%s'
%
(
partition
[
'computer_reference'
],
partition
[
'reference'
])
root_partition
=
getRootPartition
(
partition
[
'reference'
])
if
partition
[
'software_release'
]:
if
partition
[
'software_release'
]:
slap_partition
.
_need_modification
=
1
slap_partition
.
_need_modification
=
1
slap_partition
.
_requested_state
=
partition
[
'requested_state'
]
slap_partition
.
_requested_state
=
partition
[
'requested_state'
]
...
@@ -113,6 +115,10 @@ def partitiondict2partition(partition):
...
@@ -113,6 +115,10 @@ def partitiondict2partition(partition):
slap_partition
.
_parameter_dict
[
'full_address_list'
]
=
full_address_list
slap_partition
.
_parameter_dict
[
'full_address_list'
]
=
full_address_list
slap_partition
.
_parameter_dict
[
'slap_software_type'
]
=
\
slap_partition
.
_parameter_dict
[
'slap_software_type'
]
=
\
partition
[
'software_type'
]
partition
[
'software_type'
]
slap_partition
.
_parameter_dict
[
'instance_title'
]
=
\
partition
[
'partition_reference'
]
slap_partition
.
_parameter_dict
[
'root_instance_title'
]
=
\
root_partition
[
'partition_reference'
]
if
partition
[
'slave_instance_list'
]
is
not
None
:
if
partition
[
'slave_instance_list'
]
is
not
None
:
slap_partition
.
_parameter_dict
[
'slave_instance_list'
]
=
\
slap_partition
.
_parameter_dict
[
'slave_instance_list'
]
=
\
xml_marshaller
.
xml_marshaller
.
loads
(
partition
[
'slave_instance_list'
])
xml_marshaller
.
xml_marshaller
.
loads
(
partition
[
'slave_instance_list'
])
...
...
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