Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions conf/db/upgrade/V5.5.22__schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ DROP PROCEDURE IF EXISTS backfill_model_service_ref_create_date;
-- in DEFAULT or ON UPDATE. lastOpDate already uses it, so keep createDate non-zero
-- and let ModelServiceRefVO.@PrePersist populate the real creation time for new rows.
ALTER TABLE `zstack`.`ModelServiceRefVO` MODIFY COLUMN `createDate` TIMESTAMP NOT NULL DEFAULT '2000-01-01 00:00:00';

CALL ADD_COLUMN('ModelServiceVO', 'hasNewVersion', 'tinyint(1)', 1, NULL);

2 changes: 2 additions & 0 deletions sdk/src/main/java/SourceClassMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class SourceClassMap {
put("org.zstack.accessKey.AccessKeyInventory", "org.zstack.sdk.AccessKeyInventory");
put("org.zstack.accessKey.AccessKeyState", "org.zstack.sdk.AccessKeyState");
put("org.zstack.accessKey.AccessKeyType", "org.zstack.sdk.AccessKeyType");
put("org.zstack.ai.CdnTemplateEntry", "org.zstack.sdk.CdnTemplateEntry");
put("org.zstack.ai.NginxRedirectRule", "org.zstack.sdk.NginxRedirectRule");
put("org.zstack.ai.entity.ApplicationDevelopmentServiceInventory", "org.zstack.sdk.ApplicationDevelopmentServiceInventory");
put("org.zstack.ai.entity.DatasetInventory", "org.zstack.sdk.DatasetInventory");
Expand Down Expand Up @@ -1010,6 +1011,7 @@ public class SourceClassMap {
put("org.zstack.sdk.CbtTaskResourceRefInventory", "org.zstack.header.cbt.CbtTaskResourceRefInventory");
put("org.zstack.sdk.CbtTaskStatus", "org.zstack.header.cbt.CbtTaskStatus");
put("org.zstack.sdk.CdRomTO", "org.zstack.kvm.KVMAgentCommands$CdRomTO");
put("org.zstack.sdk.CdnTemplateEntry", "org.zstack.ai.CdnTemplateEntry");
put("org.zstack.sdk.CdpPolicyInventory", "org.zstack.header.storage.cdp.CdpPolicyInventory");
put("org.zstack.sdk.CdpPolicyState", "org.zstack.header.storage.cdp.CdpPolicyState");
put("org.zstack.sdk.CdpTaskInventory", "org.zstack.header.storage.cdp.CdpTaskInventory");
Expand Down
71 changes: 71 additions & 0 deletions sdk/src/main/java/org/zstack/sdk/CdnTemplateEntry.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package org.zstack.sdk;



public class CdnTemplateEntry {

public java.lang.String name;
public void setName(java.lang.String name) {
this.name = name;
}
public java.lang.String getName() {
return this.name;
}

public java.lang.String version;
public void setVersion(java.lang.String version) {
this.version = version;
}
public java.lang.String getVersion() {
return this.version;
}

public java.lang.String platform;
public void setPlatform(java.lang.String platform) {
this.platform = platform;
}
public java.lang.String getPlatform() {
return this.platform;
}

public java.lang.String size;
public void setSize(java.lang.String size) {
this.size = size;
}
public java.lang.String getSize() {
return this.size;
}

public java.lang.String projectId;
public void setProjectId(java.lang.String projectId) {
this.projectId = projectId;
}
public java.lang.String getProjectId() {
return this.projectId;
}

public java.lang.String projectName;
public void setProjectName(java.lang.String projectName) {
this.projectName = projectName;
}
public java.lang.String getProjectName() {
return this.projectName;
}

public java.lang.String downloadUrl;
public void setDownloadUrl(java.lang.String downloadUrl) {
this.downloadUrl = downloadUrl;
}
public java.lang.String getDownloadUrl() {
return this.downloadUrl;
}

public boolean installed;
public void setInstalled(boolean installed) {
this.installed = installed;
}
public boolean getInstalled() {
return this.installed;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
package org.zstack.sdk;

import java.util.HashMap;
import java.util.Map;
import org.zstack.sdk.*;

public class ImportModelServiceTemplateFromCdnAction extends AbstractAction {

private static final HashMap<String, Parameter> parameterMap = new HashMap<>();

private static final HashMap<String, Parameter> nonAPIParameterMap = new HashMap<>();

public static class Result {
public ErrorCode error;
public org.zstack.sdk.ImportModelServiceTemplateFromCdnResult value;

public Result throwExceptionIfError() {
if (error != null) {
throw new ApiException(
String.format("error[code: %s, description: %s, details: %s, globalErrorCode: %s]", error.code, error.description, error.details, error.globalErrorCode)
);
}

return this;
}
}

@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String modelCenterUuid;

@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String templateName;

@Param(required = false)
public java.lang.String resourceUuid;

@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.util.List tagUuids;

@Param(required = false)
public java.util.List systemTags;

@Param(required = false)
public java.util.List userTags;

@Param(required = false)
public String sessionId;

@Param(required = false)
public String accessKeyId;

@Param(required = false)
public String accessKeySecret;

@Param(required = false)
public String requestIp;

@NonAPIParam
public long timeout = -1;

@NonAPIParam
public long pollingInterval = -1;


private Result makeResult(ApiResult res) {
Result ret = new Result();
if (res.error != null) {
ret.error = res.error;
return ret;
}

org.zstack.sdk.ImportModelServiceTemplateFromCdnResult value = res.getResult(org.zstack.sdk.ImportModelServiceTemplateFromCdnResult.class);
ret.value = value == null ? new org.zstack.sdk.ImportModelServiceTemplateFromCdnResult() : value;

return ret;
}

public Result call() {
ApiResult res = ZSClient.call(this);
return makeResult(res);
}

public void call(final Completion<Result> completion) {
ZSClient.call(this, new InternalCompletion() {
@Override
public void complete(ApiResult res) {
completion.complete(makeResult(res));
}
});
}

protected Map<String, Parameter> getParameterMap() {
return parameterMap;
}

protected Map<String, Parameter> getNonAPIParameterMap() {
return nonAPIParameterMap;
}

protected RestInfo getRestInfo() {
RestInfo info = new RestInfo();
info.httpMethod = "POST";
info.path = "/ai/model-services/template/import/cdn";
info.needSession = true;
info.needPoll = true;
info.parameterName = "param";
return info;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.zstack.sdk;

import org.zstack.sdk.ModelServiceInventory;

public class ImportModelServiceTemplateFromCdnResult {
public ModelServiceInventory inventory;
public void setInventory(ModelServiceInventory inventory) {
this.inventory = inventory;
}
public ModelServiceInventory getInventory() {
return this.inventory;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
package org.zstack.sdk;

import java.util.HashMap;
import java.util.Map;
import org.zstack.sdk.*;

public class ImportModelServiceTemplateFromUploadAction extends AbstractAction {

private static final HashMap<String, Parameter> parameterMap = new HashMap<>();

private static final HashMap<String, Parameter> nonAPIParameterMap = new HashMap<>();

public static class Result {
public ErrorCode error;
public org.zstack.sdk.ImportModelServiceTemplateFromUploadResult value;

public Result throwExceptionIfError() {
if (error != null) {
throw new ApiException(
String.format("error[code: %s, description: %s, details: %s, globalErrorCode: %s]", error.code, error.description, error.details, error.globalErrorCode)
);
}

return this;
}
}

@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String modelCenterUuid;

@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String fileName;

@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String templateName;

@Param(required = false)
public java.lang.String resourceUuid;

@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.util.List tagUuids;

@Param(required = false)
public java.util.List systemTags;

@Param(required = false)
public java.util.List userTags;

@Param(required = false)
public String sessionId;

@Param(required = false)
public String accessKeyId;

@Param(required = false)
public String accessKeySecret;

@Param(required = false)
public String requestIp;

@NonAPIParam
public long timeout = -1;

@NonAPIParam
public long pollingInterval = -1;


private Result makeResult(ApiResult res) {
Result ret = new Result();
if (res.error != null) {
ret.error = res.error;
return ret;
}

org.zstack.sdk.ImportModelServiceTemplateFromUploadResult value = res.getResult(org.zstack.sdk.ImportModelServiceTemplateFromUploadResult.class);
ret.value = value == null ? new org.zstack.sdk.ImportModelServiceTemplateFromUploadResult() : value;

return ret;
}

public Result call() {
ApiResult res = ZSClient.call(this);
return makeResult(res);
}

public void call(final Completion<Result> completion) {
ZSClient.call(this, new InternalCompletion() {
@Override
public void complete(ApiResult res) {
completion.complete(makeResult(res));
}
});
}

protected Map<String, Parameter> getParameterMap() {
return parameterMap;
}

protected Map<String, Parameter> getNonAPIParameterMap() {
return nonAPIParameterMap;
}

protected RestInfo getRestInfo() {
RestInfo info = new RestInfo();
info.httpMethod = "POST";
info.path = "/ai/model-services/template/import/upload";
info.needSession = true;
info.needPoll = true;
info.parameterName = "param";
return info;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.zstack.sdk;

import org.zstack.sdk.ModelServiceInventory;

public class ImportModelServiceTemplateFromUploadResult {
public ModelServiceInventory inventory;
public void setInventory(ModelServiceInventory inventory) {
this.inventory = inventory;
}
public ModelServiceInventory getInventory() {
return this.inventory;
}

}
Loading