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
45ebdd88
Commit
45ebdd88
authored
Jan 17, 2025
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_json_rpc_api: rename api entry points
parent
c2a97a98
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
63 deletions
+63
-63
master/bt5/slapos_json_rpc_api/PathTemplateItem/portal_web_services/slapos_master_api.xml
...athTemplateItem/portal_web_services/slapos_master_api.xml
+15
-15
master/bt5/slapos_json_rpc_api/TestTemplateItem/portal_components/test.erp5.testSlapOSJsonRpc.py
...lateItem/portal_components/test.erp5.testSlapOSJsonRpc.py
+48
-48
No files found.
master/bt5/slapos_json_rpc_api/PathTemplateItem/portal_web_services/slapos_master_api.xml
View file @
45ebdd88
...
...
@@ -67,19 +67,19 @@
<key>
<string>
json_form
</string>
</key>
<value>
<tuple>
<string>
slapos.put.s
lapos_jio_api_put_s
oftware_instance | SoftwareInstance_updateFromJSON
</string>
<string>
slapos.put.s
lapos_jio_api_put_s
oftware_installation | SoftwareInstallation_updateFromJSON
</string>
<string>
slapos.put.
slapos_jio_api_put_
compute_node | ComputeNode_updateFromJSON
</string>
<string>
slapos.get.s
lapos_jio_api_get_s
oftware_instance | SoftwareInstance_getFromJSON
</string>
<string>
slapos.get.
slapos_jio_api_get_
compute_node | ComputeNode_getFromJSON
</string>
<string>
slapos.get.s
lapos_jio_api_get_s
oftware_installation | SoftwareInstallation_getFromJSON
</string>
<string>
slapos.get.s
lapos_jio_api_get_s
oftware_instance_certificate | SoftwareInstanceCertificateRecord_getFromJSON
</string>
<string>
slapos.post.
slapos_jio_api_create_
compute_node | jIOWebSection_createComputeNodeFromJSON
</string>
<string>
slapos.post.s
lapos_jio_api_request_s
oftware_instance | jIOWebSection_requestSoftwareInstanceFromJSON
</string>
<string>
slapos.post.s
lapos_jio_api_create_s
oftware_installation | jIOWebSection_createSoftwareInstallationFromJSON
</string>
<string>
slapos.allDocs.
slapos_jio_api_search_
compute_node | jIOWebSection_searchComputeNodeFromJSON
</string>
<string>
slapos.allDocs.
slapos_jio_api_search_
instance | jIOWebSection_searchInstanceFromJSON
</string>
<string>
slapos.allDocs.s
lapos_jio_api_search_s
oftware_installation | jIOWebSection_searchSoftwareInstallationFromJSON
</string>
<string>
slapos.put.software_instance | SoftwareInstance_updateFromJSON
</string>
<string>
slapos.put.software_installation | SoftwareInstallation_updateFromJSON
</string>
<string>
slapos.put.compute_node | ComputeNode_updateFromJSON
</string>
<string>
slapos.get.software_instance | SoftwareInstance_getFromJSON
</string>
<string>
slapos.get.compute_node | ComputeNode_getFromJSON
</string>
<string>
slapos.get.software_installation | SoftwareInstallation_getFromJSON
</string>
<string>
slapos.get.software_instance_certificate | SoftwareInstanceCertificateRecord_getFromJSON
</string>
<string>
slapos.post.compute_node | jIOWebSection_createComputeNodeFromJSON
</string>
<string>
slapos.post.software_instance | jIOWebSection_requestSoftwareInstanceFromJSON
</string>
<string>
slapos.post.software_installation | jIOWebSection_createSoftwareInstallationFromJSON
</string>
<string>
slapos.allDocs.compute_node | jIOWebSection_searchComputeNodeFromJSON
</string>
<string>
slapos.allDocs.instance | jIOWebSection_searchInstanceFromJSON
</string>
<string>
slapos.allDocs.software_installation | jIOWebSection_searchSoftwareInstallationFromJSON
</string>
</tuple>
</value>
</item>
...
...
@@ -151,7 +151,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
1021.
19615.5761.15104
</string>
</value>
<value>
<string>
1021.
45456.10756.3003
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -171,7 +171,7 @@
</tuple>
<state>
<tuple>
<float>
173
4001867.68
</float>
<float>
173
7129065.46
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
master/bt5/slapos_json_rpc_api/TestTemplateItem/portal_components/test.erp5.testSlapOSJsonRpc.py
View file @
45ebdd88
...
...
@@ -149,7 +149,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
"title"
:
instance
.
getTitle
(),
})
response
=
self
.
callJsonRpcWebService
(
'slapos.allDocs.
slapos_jio_api_search_
instance'
,
{
response
=
self
.
callJsonRpcWebService
(
'slapos.allDocs.instance'
,
{
"compute_node_id"
:
self
.
compute_node_id
,
"portal_type"
:
"Software Instance"
,
},
self
.
compute_node_user_id
)
...
...
@@ -174,7 +174,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
# Check Data is correct
partition
=
instance
.
getAggregateValue
(
portal_type
=
"Compute Partition"
)
response
=
self
.
callJsonRpcWebService
(
'slapos.get.s
lapos_jio_api_get_s
oftware_instance'
,
'slapos.get.software_instance'
,
instance_resut_dict
[
"get_parameters"
],
self
.
compute_node_user_id
)
...
...
@@ -232,7 +232,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
"compute_node_id"
:
self
.
compute_node_id
,
})
response
=
self
.
callJsonRpcWebService
(
'slapos.allDocs.s
lapos_jio_api_search_s
oftware_installation'
,
{
response
=
self
.
callJsonRpcWebService
(
'slapos.allDocs.software_installation'
,
{
"compute_node_id"
:
self
.
compute_node_id
,
"portal_type"
:
"Software Installation"
,
},
self
.
compute_node_user_id
)
...
...
@@ -254,7 +254,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
software
=
software_list
[
i
]
# Get instance as "user"
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_installation"
,
"slapos.get.software_installation"
,
software_resut_dict
[
"get_parameters"
],
self
.
compute_node_user_id
)
...
...
@@ -279,7 +279,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
error_log
=
'Please force slapos node rerun'
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.
slapos_jio_api_put_
compute_node"
,
"slapos.put.compute_node"
,
{
"compute_node_id"
:
self
.
compute_node_id
,
"portal_type"
:
"Compute Node"
,
...
...
@@ -316,7 +316,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
url_string
=
software_installation
.
getUrlString
()
status_dict
=
software_installation
.
getAccessStatus
()
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_installation"
,
"slapos.get.software_installation"
,
{
"portal_type"
:
"Software Installation"
,
"software_release_uri"
:
url_string
,
...
...
@@ -344,7 +344,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
def
test_ComputeNodeAccess_04_destroyedSoftwareRelease_noSoftwareInstallation
(
self
):
software_release_uri
=
"http://example.org/foo"
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_installation"
,
"slapos.put.software_installation"
,
{
"software_release_uri"
:
software_release_uri
,
"compute_node_id"
:
self
.
compute_node_id
,
...
...
@@ -369,7 +369,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
software_installation
=
self
.
start_requested_software_installation
software_release_uri
=
software_installation
.
getUrlString
()
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_installation"
,
"slapos.put.software_installation"
,
{
"software_release_uri"
:
software_release_uri
,
"compute_node_id"
:
self
.
compute_node_id
,
...
...
@@ -397,7 +397,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_installation"
,
"slapos.put.software_installation"
,
{
"software_release_uri"
:
software_release_uri
,
"compute_node_id"
:
self
.
compute_node_id
,
...
...
@@ -427,7 +427,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
software_release_uri
=
software_installation
.
getUrlString
()
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_installation"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.put.software_installation"
,
{
"portal_type"
:
"Software Installation"
,
"software_release_uri"
:
software_release_uri
,
"compute_node_id"
:
self
.
compute_node_id
,
...
...
@@ -446,7 +446,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
})
self
.
assertEqual
(
response
.
getStatus
(),
200
)
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_installation"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.get.software_installation"
,
{
"portal_type"
:
"Software Installation"
,
"software_release_uri"
:
software_release_uri
,
"compute_node_id"
:
self
.
compute_node_id
...
...
@@ -475,7 +475,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
software_release_uri
=
software_installation
.
getUrlString
()
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_installation"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.put.software_installation"
,
{
"portal_type"
:
"Software Installation"
,
"software_release_uri"
:
software_release_uri
,
"compute_node_id"
:
self
.
compute_node_id
,
...
...
@@ -494,7 +494,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
})
self
.
assertEqual
(
response
.
getStatus
(),
200
)
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_installation"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.get.software_installation"
,
{
"portal_type"
:
"Software Installation"
,
"software_release_uri"
:
software_release_uri
,
"compute_node_id"
:
self
.
compute_node_id
...
...
@@ -523,7 +523,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
software_release_uri
=
software_installation
.
getUrlString
()
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_installation"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.put.software_installation"
,
{
"portal_type"
:
"Software Installation"
,
"software_release_uri"
:
software_release_uri
,
"compute_node_id"
:
self
.
compute_node_id
,
...
...
@@ -542,7 +542,7 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
})
self
.
assertEqual
(
response
.
getStatus
(),
200
)
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_installation"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.get.software_installation"
,
{
"portal_type"
:
"Software Installation"
,
"software_release_uri"
:
software_release_uri
,
"compute_node_id"
:
self
.
compute_node_id
...
...
@@ -568,7 +568,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
def
test_InstanceAccess_10_getComputerPartitionCertificate
(
self
):
self
.
_makeComplexComputeNode
(
self
.
project
)
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance_certificate"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.get.software_instance_certificate"
,
{
"portal_type"
:
"Software Instance Certificate Record"
,
"reference"
:
self
.
start_requested_software_instance
.
getReference
(),
},
self
.
start_requested_software_instance
.
getUserId
())
...
...
@@ -601,7 +601,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
"title"
:
instance
.
getTitle
(),
}]
response
=
self
.
callJsonRpcWebService
(
"slapos.allDocs.
slapos_jio_api_search_
instance"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.allDocs.instance"
,
{
"compute_node_id"
:
self
.
compute_node_id
,
"portal_type"
:
"Software Instance"
,
},
instance
.
getUserId
())
...
...
@@ -619,7 +619,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
# Get instance as "user"
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
"slapos.get.software_instance"
,
instance_resut_dict
[
"get_parameters"
],
instance
.
getUserId
()
)
...
...
@@ -663,7 +663,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
instance
=
self
.
start_requested_software_instance
# Check Slaves
# XXX It should be the same portal_type
response
=
self
.
callJsonRpcWebService
(
"slapos.allDocs.
slapos_jio_api_search_
instance"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.allDocs.instance"
,
{
"host_instance_reference"
:
instance
.
getReference
(),
"portal_type"
:
"Slave Instance"
,
},
...
...
@@ -690,7 +690,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
self
.
assertEqual
(
response
.
getStatus
(),
200
)
response
=
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
"slapos.get.software_instance"
,
shared_instance_list_response
[
"result_list"
][
0
][
"get_parameters"
],
instance
.
getUserId
()
)
...
...
@@ -742,7 +742,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
self
.
start_requested_slave_instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -780,7 +780,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
self
.
start_requested_software_instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -809,7 +809,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
error_log
=
'The error'
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -832,7 +832,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
# Check Data is correct
partition
=
instance
.
getAggregateValue
(
portal_type
=
"Compute Partition"
)
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.get.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"reference"
:
instance
.
getReference
(),
},
...
...
@@ -875,7 +875,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
error_log
=
'The error'
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -898,7 +898,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
# Check Data is correct
partition
=
instance
.
getAggregateValue
(
portal_type
=
"Compute Partition"
)
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.get.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"reference"
:
instance
.
getReference
(),
},
...
...
@@ -936,7 +936,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
# Second call
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/20'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -959,7 +959,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
# Check Data is correct
partition
=
instance
.
getAggregateValue
(
portal_type
=
"Compute Partition"
)
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.get.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"reference"
:
instance
.
getReference
(),
},
...
...
@@ -1001,7 +1001,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
error_log
=
'Please force slapos instance rerun'
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -1030,7 +1030,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
# Check get return the expected results after
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
"slapos.get.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"reference"
:
instance
.
getReference
(),
...
...
@@ -1068,7 +1068,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
new_name
=
'new me'
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -1101,7 +1101,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -1129,7 +1129,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
partition_id
=
instance
.
getAggregateValue
(
portal_type
=
'Compute Partition'
).
getReference
()
response
=
self
.
callJsonRpcWebService
(
"slapos.post.s
lapos_jio_api_request_s
oftware_instance"
,
"slapos.post.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"software_release_uri"
:
"req_release"
,
...
...
@@ -1182,7 +1182,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
partition_id
=
instance
.
getAggregateValue
(
portal_type
=
'Compute Partition'
).
getReference
()
response
=
self
.
callJsonRpcWebService
(
"slapos.post.s
lapos_jio_api_request_s
oftware_instance"
,
"slapos.post.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"software_release_uri"
:
"req_release"
,
...
...
@@ -1234,7 +1234,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
partition_id
=
instance
.
getAggregateValue
(
portal_type
=
'Compute Partition'
).
getReference
()
response
=
self
.
callJsonRpcWebService
(
"slapos.post.s
lapos_jio_api_request_s
oftware_instance"
,
"slapos.post.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"software_release_uri"
:
"req_release"
,
...
...
@@ -1282,7 +1282,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
self
.
_makeComplexComputeNode
(
self
.
project
)
instance
=
self
.
start_requested_software_instance
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -1301,7 +1301,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
# Check get return the expected results after
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
"slapos.get.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"reference"
:
instance
.
getReference
(),
...
...
@@ -1337,7 +1337,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
self
.
_makeComplexComputeNode
(
self
.
project
)
instance
=
self
.
start_requested_software_instance
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -1356,7 +1356,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSJsonRpcMixin):
# Check get return the expected results after
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
"slapos.get.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"reference"
:
instance
.
getReference
(),
...
...
@@ -1398,7 +1398,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
error_log
=
'Please force slapos node rerun'
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.
slapos_jio_api_put_
compute_node"
,
"slapos.put.compute_node"
,
{
"compute_node_id"
:
self
.
compute_node_id
,
"portal_type"
:
"Compute Node"
,
...
...
@@ -1429,7 +1429,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
self
.
_makeComplexComputeNode
(
self
.
project
,
person
=
self
.
person
,
with_slave
=
with_slave
)
instance
=
self
.
start_requested_software_instance
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
"slapos.get.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"reference"
:
instance
.
getReference
(),
...
...
@@ -1480,7 +1480,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
error_log
=
'Please force slapos instance rerun'
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -1509,7 +1509,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
# Check get return the expected results after
response
=
self
.
callJsonRpcWebService
(
"slapos.get.s
lapos_jio_api_get_s
oftware_instance"
,
"slapos.get.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"reference"
:
instance
.
getReference
(),
...
...
@@ -1547,7 +1547,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
new_name
=
'new me'
with
PinnedDateTime
(
self
,
DateTime
(
'2020/05/19'
)):
response
=
self
.
callJsonRpcWebService
(
"slapos.put.s
lapos_jio_api_put_s
oftware_instance"
,
"slapos.put.software_instance"
,
{
"reference"
:
instance
.
getReference
(),
"portal_type"
:
"Software Instance"
,
...
...
@@ -1578,7 +1578,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
project_reference
=
self
.
project
.
getReference
()
response
=
self
.
callJsonRpcWebService
(
"slapos.post.s
lapos_jio_api_request_s
oftware_instance"
,
"slapos.post.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"project_reference"
:
project_reference
,
...
...
@@ -1614,7 +1614,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
project_reference
=
self
.
project
.
getReference
()
response
=
self
.
callJsonRpcWebService
(
"slapos.post.s
lapos_jio_api_request_s
oftware_instance"
,
"slapos.post.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"project_reference"
:
project_reference
,
...
...
@@ -1655,7 +1655,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
instance
=
self
.
start_requested_software_instance
self
.
login
(
self
.
person_user_id
)
with
TemporaryAlarmScript
(
self
.
portal
,
'Item_getSubscriptionStatus'
,
"'subscribed'"
):
response
=
self
.
callJsonRpcWebService
(
"slapos.post.s
lapos_jio_api_request_s
oftware_instance"
,
{
response
=
self
.
callJsonRpcWebService
(
"slapos.post.software_instance"
,
{
"portal_type"
:
"Software Instance"
,
"software_release_uri"
:
instance
.
getUrlString
(),
"software_type"
:
instance
.
getSourceReference
(),
...
...
@@ -1699,7 +1699,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSJsonRpcMixin):
def
test_PersonAccess_37_ComputeNodeSupply
(
self
):
software_url
=
'live💩é /?%%20_test_url_%s'
%
self
.
generateNewId
()
response
=
self
.
callJsonRpcWebService
(
"slapos.post.s
lapos_jio_api_create_s
oftware_installation"
,
"slapos.post.software_installation"
,
{
"portal_type"
:
"Software Installation"
,
"compute_node_id"
:
self
.
compute_node
.
getReference
(),
...
...
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