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
16 changes: 8 additions & 8 deletions sdk/src/main/java/org/zstack/sdk/NkpRestoreInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,6 @@ public java.lang.String getSaltPolicy() {
return this.saltPolicy;
}

public java.lang.String encryptedMasterSeed;
public void setEncryptedMasterSeed(java.lang.String encryptedMasterSeed) {
this.encryptedMasterSeed = encryptedMasterSeed;
}
public java.lang.String getEncryptedMasterSeed() {
return this.encryptedMasterSeed;
}

public java.lang.Integer currentVersion;
public void setCurrentVersion(java.lang.Integer currentVersion) {
this.currentVersion = currentVersion;
Expand All @@ -60,4 +52,12 @@ public java.lang.Integer getCurrentVersion() {
return this.currentVersion;
}

public java.lang.Long backupTime;
public void setBackupTime(java.lang.Long backupTime) {
this.backupTime = backupTime;
}
public java.lang.Long getBackupTime() {
return this.backupTime;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ public Result throwExceptionIfError() {
@Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String description;

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

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

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
package org.zstack.sdk.keyprovider.kms.api;

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

public class GetKmsServerCertFromKmsAction 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.keyprovider.kms.api.GetKmsServerCertFromKmsResult value;

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

return this;
}
}

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

@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.keyprovider.kms.api.GetKmsServerCertFromKmsResult value = res.getResult(org.zstack.sdk.keyprovider.kms.api.GetKmsServerCertFromKmsResult.class);
ret.value = value == null ? new org.zstack.sdk.keyprovider.kms.api.GetKmsServerCertFromKmsResult() : 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 = "PUT";
info.path = "/key-providers/kms/{uuid}/actions";
info.needSession = true;
info.needPoll = true;
info.parameterName = "getKmsServerCertFromKms";
return info;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.zstack.sdk.keyprovider.kms.api;



public class GetKmsServerCertFromKmsResult {
public java.lang.String serverCertPem;
public void setServerCertPem(java.lang.String serverCertPem) {
this.serverCertPem = serverCertPem;
}
public java.lang.String getServerCertPem() {
return this.serverCertPem;
}

public java.sql.Timestamp serverCertExpiredDate;
public void setServerCertExpiredDate(java.sql.Timestamp serverCertExpiredDate) {
this.serverCertExpiredDate = serverCertExpiredDate;
}
public java.sql.Timestamp getServerCertExpiredDate() {
return this.serverCertExpiredDate;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
package org.zstack.sdk.keyprovider.kms.api;

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

public class UploadKmsClientCsrAction 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.keyprovider.kms.api.UploadKmsClientCsrResult value;

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

return this;
}
}

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

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

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

@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.keyprovider.kms.api.UploadKmsClientCsrResult value = res.getResult(org.zstack.sdk.keyprovider.kms.api.UploadKmsClientCsrResult.class);
ret.value = value == null ? new org.zstack.sdk.keyprovider.kms.api.UploadKmsClientCsrResult() : 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 = "PUT";
info.path = "/key-providers/kms/{uuid}/actions";
info.needSession = true;
info.needPoll = true;
info.parameterName = "uploadKmsClientCsr";
return info;
}

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

import org.zstack.sdk.KmsIdentityInventory;

public class UploadKmsClientCsrResult {
public KmsIdentityInventory inventory;
public void setInventory(KmsIdentityInventory inventory) {
this.inventory = inventory;
}
public KmsIdentityInventory getInventory() {
return this.inventory;
}

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

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

public class UploadKmsClientIdentityAction 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.keyprovider.kms.api.UploadKmsClientIdentityResult value;

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

return this;
}
}

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

@Param(required = true, validValues = {"PLATFORM","UPLOADED","CSR"}, nonempty = false, nullElements = false, emptyString = false, noTrim = false)
public java.lang.String identityType;

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

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

@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.keyprovider.kms.api.UploadKmsClientIdentityResult value = res.getResult(org.zstack.sdk.keyprovider.kms.api.UploadKmsClientIdentityResult.class);
ret.value = value == null ? new org.zstack.sdk.keyprovider.kms.api.UploadKmsClientIdentityResult() : 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 = "PUT";
info.path = "/key-providers/kms/{uuid}/actions";
info.needSession = true;
info.needPoll = true;
info.parameterName = "uploadKmsClientIdentity";
return info;
}

}
Loading