Commit 5db0b0aa authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

slapos_jio_api_style: support quoted url for software_release_uri

parent 30d5fa9e
...@@ -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"),
) )
......
...@@ -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),
......
...@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment