etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Option to create StorPool primary storage with a valid URL (#8356) 

* Option to create primary storage with a valid URL

* check if the scheme is valid
This commit is contained in:
slavkap 2024-02-05 10:51:13 +02:00 committed by GitHub
parent 0ba26912df
commit 94c8b1da5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/storage/volume/storpool/README.md
View File

@ -117,6 +117,8 @@ SP_API_HTTP - address of StorPool Api
SP_AUTH_TOKEN - StorPool's token
SP_TEMPLATE - name of StorPool's template
> **NOTE:** You can use the alternative format option for the URL - storpool://{SP_AUTH_TOKEN}@{SP_API_HTTP}:{SP_API_HTTP_PORT}/{SP_TEMPLATE}
Storage Tags: If left blank, the StorPool storage plugin will use the pool name to create a corresponding storage tag.
This storage tag may be used later, when defining service or disk offerings.

16
plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolUtil.java
View File

@ -172,6 +172,12 @@ public class StorPoolUtil {
private String templateName;
public SpConnectionDesc(String url) {
try {
extractUriParams(url);
return;
} catch (URISyntaxException e) {
log.debug("[ignore] the uri is not valid");
}
String[] urlSplit = url.split(";");
if (urlSplit.length == 1 && !urlSplit[0].contains("=")) {
this.templateName = url;
@ -240,6 +246,16 @@ public class StorPoolUtil {
}
}
private void extractUriParams(String url) throws URISyntaxException {
URI uri = new URI(url);
if (!StringUtils.equalsIgnoreCase(uri.getScheme(), "storpool")) {
throw new CloudRuntimeException("The scheme is invalid. The URL should be with a format storpool://{SP_AUTH_TOKEN}@{SP_API_HTTP}:{SP_API_HTTP_PORT}/{SP_TEMPLATE}");
}
hostPort = uri.getHost() + ":" + uri.getPort();
authToken = uri.getUserInfo();
templateName = uri.getPath().replace("/", "");
}
public SpConnectionDesc(String host, String authToken2, String templateName2) {
this.hostPort = host;
this.authToken = authToken2;