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
Ophélie Gagnard
slapos.core
Commits
f97375bd
Commit
f97375bd
authored
Oct 02, 2021
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_slap_tool: fix up computer renaming
parent
4090d9c5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
master/bt5/slapos_slap_tool/TestTemplateItem/portal_components/test.erp5.testSlapOSSlapTool.py
...ateItem/portal_components/test.erp5.testSlapOSSlapTool.py
+4
-4
master/bt5/slapos_slap_tool/ToolComponentTemplateItem/portal_components/tool.erp5.SlapTool.py
...onentTemplateItem/portal_components/tool.erp5.SlapTool.py
+5
-5
No files found.
master/bt5/slapos_slap_tool/TestTemplateItem/portal_components/test.erp5.testSlapOSSlapTool.py
View file @
f97375bd
...
@@ -716,7 +716,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
...
@@ -716,7 +716,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
[{
'recargs'
:
args
,
'reckwargs'
:
kwargs
,
[{
'recargs'
:
args
,
'reckwargs'
:
kwargs
,
'recmethod'
:
'reportComputeNodeBang'
}])
'recmethod'
:
'reportComputeNodeBang'
}])
def
test_compute
_node
Bang
(
self
):
def
test_compute
r
Bang
(
self
):
self
.
_makeComplexComputeNode
()
self
.
_makeComplexComputeNode
()
self
.
compute_node_bang_simulator
=
tempfile
.
mkstemp
()[
1
]
self
.
compute_node_bang_simulator
=
tempfile
.
mkstemp
()[
1
]
try
:
try
:
...
@@ -724,7 +724,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
...
@@ -724,7 +724,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSSlapToolMixin):
self
.
compute_node
.
reportComputeNodeBang
=
Simulator
(
self
.
compute_node
.
reportComputeNodeBang
=
Simulator
(
self
.
compute_node_bang_simulator
,
'reportComputeNodeBang'
)
self
.
compute_node_bang_simulator
,
'reportComputeNodeBang'
)
error_log
=
'Please bang me'
error_log
=
'Please bang me'
response
=
self
.
portal_slap
.
compute
_node
Bang
(
self
.
compute_node_id
,
response
=
self
.
portal_slap
.
compute
r
Bang
(
self
.
compute_node_id
,
error_log
)
error_log
)
self
.
assertEqual
(
'None'
,
response
)
self
.
assertEqual
(
'None'
,
response
)
created_at
=
rfc1123_date
(
DateTime
())
created_at
=
rfc1123_date
(
DateTime
())
...
@@ -2567,14 +2567,14 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
...
@@ -2567,14 +2567,14 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
[{
'recargs'
:
args
,
'reckwargs'
:
kwargs
,
[{
'recargs'
:
args
,
'reckwargs'
:
kwargs
,
'recmethod'
:
'reportComputeNodeBang'
}])
'recmethod'
:
'reportComputeNodeBang'
}])
def
test_compute
_node
Bang
(
self
):
def
test_compute
r
Bang
(
self
):
self
.
login
(
self
.
person_user_id
)
self
.
login
(
self
.
person_user_id
)
self
.
compute_node_bang_simulator
=
tempfile
.
mkstemp
()[
1
]
self
.
compute_node_bang_simulator
=
tempfile
.
mkstemp
()[
1
]
try
:
try
:
self
.
compute_node
.
reportComputeNodeBang
=
Simulator
(
self
.
compute_node
.
reportComputeNodeBang
=
Simulator
(
self
.
compute_node_bang_simulator
,
'reportComputeNodeBang'
)
self
.
compute_node_bang_simulator
,
'reportComputeNodeBang'
)
error_log
=
'Please bang me'
error_log
=
'Please bang me'
response
=
self
.
portal_slap
.
compute
_node
Bang
(
self
.
compute_node_id
,
response
=
self
.
portal_slap
.
compute
r
Bang
(
self
.
compute_node_id
,
error_log
)
error_log
)
self
.
assertEqual
(
'None'
,
response
)
self
.
assertEqual
(
'None'
,
response
)
created_at
=
rfc1123_date
(
DateTime
())
created_at
=
rfc1123_date
(
DateTime
())
...
...
master/bt5/slapos_slap_tool/ToolComponentTemplateItem/portal_components/tool.erp5.SlapTool.py
View file @
f97375bd
...
@@ -443,7 +443,7 @@ class SlapTool(BaseTool):
...
@@ -443,7 +443,7 @@ class SlapTool(BaseTool):
return
self
.
REQUEST
.
response
return
self
.
REQUEST
.
response
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
'getCompute
Node
Information'
)
'getCompute
r
Information'
)
getComputerInformation
=
getFullComputerInformation
getComputerInformation
=
getFullComputerInformation
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
...
@@ -767,7 +767,7 @@ class SlapTool(BaseTool):
...
@@ -767,7 +767,7 @@ class SlapTool(BaseTool):
return
self
.
REQUEST
.
response
return
self
.
REQUEST
.
response
@
convertToREST
@
convertToREST
def
_compute
_n
odeBang
(
self
,
compute_node_id
,
message
):
def
_compute
N
odeBang
(
self
,
compute_node_id
,
message
):
"""
"""
Fire up bung on Compute Node
Fire up bung on Compute Node
"""
"""
...
@@ -778,12 +778,12 @@ class SlapTool(BaseTool):
...
@@ -778,12 +778,12 @@ class SlapTool(BaseTool):
comment
=
message
)
comment
=
message
)
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
'compute
_node
Bang'
)
'compute
r
Bang'
)
def
compute
_node
Bang
(
self
,
computer_id
,
message
):
def
compute
r
Bang
(
self
,
computer_id
,
message
):
"""
"""
Fire up bang on this Software Instance
Fire up bang on this Software Instance
"""
"""
return
self
.
_compute
_n
odeBang
(
computer_id
,
message
)
return
self
.
_compute
N
odeBang
(
computer_id
,
message
)
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
'loadComputerConfigurationFromXML'
)
'loadComputerConfigurationFromXML'
)
...
...
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