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
Titouan Soulard
slapos.core
Commits
1f01134f
Commit
1f01134f
authored
Sep 21, 2022
by
Cédric Le Ninivin
Committed by
Titouan Soulard
Mar 11, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapformat: fix missing portal type and missing option
parent
b3b0dd6b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
slapos/format.py
slapos/format.py
+3
-1
slapos/tests/test_slapformat.py
slapos/tests/test_slapformat.py
+1
-0
No files found.
slapos/format.py
View file @
1f01134f
...
@@ -395,7 +395,8 @@ class Computer(object):
...
@@ -395,7 +395,8 @@ class Computer(object):
return
return
slap_instance
.
jio_api_connector
.
put
({
slap_instance
.
jio_api_connector
.
put
({
"compute_node_id"
:
self
.
reference
,
"compute_node_id"
:
self
.
reference
,
"compute_partition_list"
:
partition_list
"compute_partition_list"
:
partition_list
,
"portal_type"
:
"Compute Node"
,
})
})
else
:
else
:
slap_computer
=
slap_instance
.
registerComputer
(
self
.
reference
)
slap_computer
=
slap_instance
.
registerComputer
(
self
.
reference
)
...
@@ -1744,6 +1745,7 @@ class FormatConfig(object):
...
@@ -1744,6 +1745,7 @@ class FormatConfig(object):
dry_run
=
None
# modifiable by cmdline
dry_run
=
None
# modifiable by cmdline
key_file
=
None
key_file
=
None
cert_file
=
None
cert_file
=
None
slapgrid_jio_uri
=
None
def
__init__
(
self
,
logger
):
def
__init__
(
self
,
logger
):
self
.
logger
=
logger
self
.
logger
=
logger
...
...
slapos/tests/test_slapformat.py
View file @
1f01134f
...
@@ -745,6 +745,7 @@ class TestFormatSendToMaster(SlapformatMixin):
...
@@ -745,6 +745,7 @@ class TestFormatSendToMaster(SlapformatMixin):
self
.
body_sequence
,
self
.
body_sequence
,
[
[
{
{
'portal_type'
:
'Compute Node'
,
'compute_node_id'
:
'computer'
,
'compute_node_id'
:
'computer'
,
'compute_partition_list'
:
[
'compute_partition_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