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
Léo-Paul Géneau
slapos.core
Commits
5db0b0aa
Commit
5db0b0aa
authored
Feb 28, 2023
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio_api_style: support quoted url for software_release_uri
parent
30d5fa9e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_createSoftwareInstallation.py
...lapos_jio_api/jIOWebSection_createSoftwareInstallation.py
+2
-2
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_requestSoftwareInstance.py
...s/slapos_jio_api/jIOWebSection_requestSoftwareInstance.py
+2
-2
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchSoftwareInstallation.py
...lapos_jio_api/jIOWebSection_searchSoftwareInstallation.py
+2
-1
No files found.
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_createSoftwareInstallation.py
View file @
5db0b0aa
...
@@ -10,9 +10,9 @@ if not compute_node:
...
@@ -10,9 +10,9 @@ if not compute_node:
error_message
=
"Compute Node not found"
,
error_message
=
"Compute Node not found"
,
error_name
=
"COMPUTE-NODE-NOT-FOUND"
,
error_name
=
"COMPUTE-NODE-NOT-FOUND"
,
)
)
import
urllib
compute_node
.
requestSoftwareRelease
(
compute_node
.
requestSoftwareRelease
(
software_release_url
=
data_dict
[
"software_release_uri"
]
,
software_release_url
=
urllib
.
unquote
(
data_dict
[
"software_release_uri"
])
,
state
=
data_dict
.
get
(
"state"
,
"available"
),
state
=
data_dict
.
get
(
"state"
,
"available"
),
)
)
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_requestSoftwareInstance.py
View file @
5db0b0aa
...
@@ -41,8 +41,8 @@ try:
...
@@ -41,8 +41,8 @@ try:
filter_kw
=
data_dict
.
get
(
"sla_parameters"
,
{})
filter_kw
=
data_dict
.
get
(
"sla_parameters"
,
{})
partition_reference
=
data_dict
.
get
(
"title"
)
partition_reference
=
data_dict
.
get
(
"title"
)
import
urllib
kw
=
dict
(
software_release
=
data_dict
.
get
(
"software_release_uri"
),
kw
=
dict
(
software_release
=
urllib
.
unquote
(
data_dict
.
get
(
"software_release_uri"
)
),
software_type
=
data_dict
.
get
(
"software_type"
,
"RootSoftwareInstance"
),
software_type
=
data_dict
.
get
(
"software_type"
,
"RootSoftwareInstance"
),
software_title
=
partition_reference
,
software_title
=
partition_reference
,
instance_xml
=
castToStr
(
partition_parameter
),
instance_xml
=
castToStr
(
partition_parameter
),
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchSoftwareInstallation.py
View file @
5db0b0aa
...
@@ -13,7 +13,8 @@ search_kw = {
...
@@ -13,7 +13,8 @@ search_kw = {
}
}
if
"software_release_uri"
in
data_dict
:
if
"software_release_uri"
in
data_dict
:
search_kw
[
"url_string"
]
=
data_dict
[
"software_release_uri"
]
import
urllib
search_kw
[
"url_string"
]
=
urllib
.
unquote
(
data_dict
[
"software_release_uri"
])
if
"compute_node_id"
in
data_dict
:
if
"compute_node_id"
in
data_dict
:
search_kw
[
"strict_aggregate_reference"
]
=
data_dict
[
"compute_node_id"
]
search_kw
[
"strict_aggregate_reference"
]
=
data_dict
[
"compute_node_id"
]
if
"from_api_revision"
in
data_dict
:
if
"from_api_revision"
in
data_dict
:
...
...
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