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
8cde8067
Commit
8cde8067
authored
Jan 03, 2025
by
Romain Courteaud
🐸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_json_rpc_api: drop slapos_update_jio_api_revision_template usage
parent
d5a79693
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
19 deletions
+0
-19
master/bt5/slapos_json_rpc_api/TestTemplateItem/portal_components/test.erp5.testSlapOSJsonRpc.py
...lateItem/portal_components/test.erp5.testSlapOSJsonRpc.py
+0
-19
No files found.
master/bt5/slapos_json_rpc_api/TestTemplateItem/portal_components/test.erp5.testSlapOSJsonRpc.py
View file @
8cde8067
...
...
@@ -97,7 +97,6 @@ class TestSlapOSJsonRpcMixin(SlapOSTestCaseMixin):
self
.
compute_node_id
=
self
.
compute_node
.
getReference
()
self
.
compute_node_user_id
=
self
.
compute_node
.
getUserId
()
self
.
pinDateTime
(
DateTime
())
self
.
callUpdateRevisionAndTic
()
def
getAPIStateFromSlapState
(
self
,
state
):
state_dict
=
{
...
...
@@ -116,13 +115,6 @@ class TestSlapOSJsonRpcMixin(SlapOSTestCaseMixin):
env
=
{
'CONTENT_TYPE'
:
'application/json'
})
return
response
def
callUpdateRevision
(
self
):
self
.
portal
.
portal_alarms
.
slapos_update_jio_api_revision_template
.
activeSense
()
def
callUpdateRevisionAndTic
(
self
):
self
.
callUpdateRevision
()
self
.
tic
()
def
beforeTearDown
(
self
):
self
.
unpinDateTime
()
self
.
_cleaupREQUEST
()
...
...
@@ -130,7 +122,6 @@ class TestSlapOSJsonRpcMixin(SlapOSTestCaseMixin):
class
TestSlapOSSlapToolComputeNodeAccess
(
TestSlapOSJsonRpcMixin
):
def
test_ComputeNodeAccess_01_getFullComputerInformationInstanceList
(
self
):
self
.
_makeComplexComputeNode
(
self
.
project
,
with_slave
=
True
)
self
.
callUpdateRevisionAndTic
()
instance_1
=
self
.
compute_node
.
partition1
.
getAggregateRelatedValue
(
portal_type
=
'Software Instance'
)
instance_2
=
self
.
compute_node
.
partition2
.
getAggregateRelatedValue
(
portal_type
=
'Software Instance'
)
...
...
@@ -221,7 +212,6 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
def
test_ComputeNodeAccess_01_bis_getFullComputerInformationSoftwareList
(
self
):
self
.
_makeComplexComputeNode
(
self
.
project
,
with_slave
=
True
)
self
.
callUpdateRevisionAndTic
()
software_list
=
[
self
.
start_requested_software_installation
,
self
.
destroy_requested_software_installation
]
# This is the expected instance list, it is sorted by api_revision
...
...
@@ -321,7 +311,6 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
xXXX TODO Cedric Make sure we can create and modifiy when using weird url strings
"""
self
.
_makeComplexComputeNode
(
self
.
project
)
self
.
callUpdateRevisionAndTic
()
software_installation
=
self
.
start_requested_software_installation
url_string
=
software_installation
.
getUrlString
()
...
...
@@ -432,7 +421,6 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
def
test_ComputeNodeAccess_07_availableSoftwareRelease
(
self
):
self
.
_makeComplexComputeNode
(
self
.
project
)
self
.
callUpdateRevisionAndTic
()
software_installation
=
self
.
start_requested_software_installation
self
.
assertEqual
(
software_installation
.
getValidationState
(),
"validated"
)
...
...
@@ -481,7 +469,6 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
def
test_ComputeNodeAccess_08_buildingSoftwareRelease
(
self
):
self
.
_makeComplexComputeNode
(
self
.
project
)
self
.
callUpdateRevisionAndTic
()
software_installation
=
self
.
start_requested_software_installation
self
.
assertEqual
(
software_installation
.
getValidationState
(),
"validated"
)
...
...
@@ -530,7 +517,6 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
def
test_ComputeNodeAccess_09_softwareReleaseError
(
self
):
self
.
_makeComplexComputeNode
(
self
.
project
)
self
.
callUpdateRevisionAndTic
()
software_installation
=
self
.
start_requested_software_installation
self
.
assertEqual
(
software_installation
.
getValidationState
(),
"validated"
)
...
...
@@ -598,7 +584,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
def
test_InstanceAccess_11_getFullComputerInformationWithSharedInstance
(
self
,
with_slave
=
True
):
self
.
_makeComplexComputeNode
(
self
.
project
,
with_slave
=
with_slave
)
self
.
callUpdateRevisionAndTic
()
instance
=
self
.
start_requested_software_instance
# Check result_list match instance_list=
...
...
@@ -675,7 +660,6 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
def
test_InstanceAccess_12_getSharedInstance
(
self
):
self
.
_makeComplexComputeNode
(
self
.
project
,
with_slave
=
True
)
self
.
callUpdateRevisionAndTic
()
instance
=
self
.
start_requested_software_instance
# Check Slaves
# XXX It should be the same portal_type
...
...
@@ -1443,7 +1427,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
def
test_PersonAccess_31_getInstanceWithSharedInstance
(
self
,
with_slave
=
True
):
self
.
_makeComplexComputeNode
(
self
.
project
,
person
=
self
.
person
,
with_slave
=
with_slave
)
self
.
callUpdateRevisionAndTic
()
instance
=
self
.
start_requested_software_instance
response
=
self
.
callJsonRpcWebService
(
"slapos.get.slapos_jio_api_get_software_instance"
,
...
...
@@ -1670,8 +1653,6 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
)
self
.
_makeComplexComputeNode
(
self
.
project
,
person
=
self
.
person
)
instance
=
self
.
start_requested_software_instance
self
.
callUpdateRevision
()
self
.
tic
()
self
.
login
(
self
.
person_user_id
)
with
TemporaryAlarmScript
(
self
.
portal
,
'Item_getSubscriptionStatus'
,
"'subscribed'"
):
response
=
self
.
callJsonRpcWebService
(
"slapos.post.slapos_jio_api_request_software_instance"
,
{
...
...
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