<feature>[kms]: support kms trust API

sdk/src/main/java/SourceClassMap.java

@@ -178,6 +178,7 @@ public class SourceClassMap {
 			put("org.zstack.header.image.APIGetUploadImageJobDetailsReply$JobDetails", "org.zstack.sdk.JobDetails");
 			put("org.zstack.header.image.ImageBackupStorageRefInventory", "org.zstack.sdk.ImageBackupStorageRefInventory");
 			put("org.zstack.header.image.ImageInventory", "org.zstack.sdk.ImageInventory");
+			put("org.zstack.header.keyprovider.CertificateInfo", "org.zstack.sdk.CertificateInfo");
 			put("org.zstack.header.keyprovider.KeyProviderInventory", "org.zstack.sdk.KeyProviderInventory");
 			put("org.zstack.header.keyprovider.KmsIdentityInventory", "org.zstack.sdk.KmsIdentityInventory");
 			put("org.zstack.header.keyprovider.KmsInventory", "org.zstack.sdk.KmsInventory");
@@ -763,6 +764,7 @@ public class SourceClassMap {
 			put("org.zstack.sdk.CephPrimaryStorageInventory", "org.zstack.storage.ceph.primary.CephPrimaryStorageInventory");
 			put("org.zstack.sdk.CephPrimaryStorageMonInventory", "org.zstack.storage.ceph.primary.CephPrimaryStorageMonInventory");
 			put("org.zstack.sdk.CephPrimaryStoragePoolInventory", "org.zstack.storage.ceph.primary.CephPrimaryStoragePoolInventory");
+			put("org.zstack.sdk.CertificateInfo", "org.zstack.header.keyprovider.CertificateInfo");
 			put("org.zstack.sdk.CertificateInventory", "org.zstack.network.service.lb.CertificateInventory");
 			put("org.zstack.sdk.ChainInfo", "org.zstack.header.core.progress.ChainInfo");
 			put("org.zstack.sdk.ChronyServerInfo", "org.zstack.zops.ChronyServerInfo");

sdk/src/main/java/org/zstack/sdk/CertificateInfo.java

@@ -0,0 +1,55 @@
+package org.zstack.sdk;
+
+
+
+public class CertificateInfo  {
+
+    public java.lang.String subject;
+    public void setSubject(java.lang.String subject) {
+        this.subject = subject;
+    }
+    public java.lang.String getSubject() {
+        return this.subject;
+    }
+
+    public java.lang.String issuer;
+    public void setIssuer(java.lang.String issuer) {
+        this.issuer = issuer;
+    }
+    public java.lang.String getIssuer() {
+        return this.issuer;
+    }
+
+    public java.lang.String commonName;
+    public void setCommonName(java.lang.String commonName) {
+        this.commonName = commonName;
+    }
+    public java.lang.String getCommonName() {
+        return this.commonName;
+    }
+
+    public java.util.List subjectAltNamesDns;
+    public void setSubjectAltNamesDns(java.util.List subjectAltNamesDns) {
+        this.subjectAltNamesDns = subjectAltNamesDns;
+    }
+    public java.util.List getSubjectAltNamesDns() {
+        return this.subjectAltNamesDns;
+    }
+
+    public java.util.List subjectAltNamesIp;
+    public void setSubjectAltNamesIp(java.util.List subjectAltNamesIp) {
+        this.subjectAltNamesIp = subjectAltNamesIp;
+    }
+    public java.util.List getSubjectAltNamesIp() {
+        return this.subjectAltNamesIp;
+    }
+
+    public java.sql.Timestamp expiredDate;
+    public void setExpiredDate(java.sql.Timestamp expiredDate) {
+        this.expiredDate = expiredDate;
+    }
+    public java.sql.Timestamp getExpiredDate() {
+        return this.expiredDate;
+    }
+
+}

sdk/src/main/java/org/zstack/sdk/KmsInventory.java

@@ -1,5 +1,6 @@
 package org.zstack.sdk;
 
+import org.zstack.sdk.CertificateInfo;
 import org.zstack.sdk.KmsIdentityInventory;
 
 public class KmsInventory extends org.zstack.sdk.KeyProviderInventory {
@@ -52,12 +53,20 @@ public java.lang.String getActiveIdentityUuid() {
         return this.activeIdentityUuid;
     }
 
-    public java.sql.Timestamp serverCertExpiredDate;
-    public void setServerCertExpiredDate(java.sql.Timestamp serverCertExpiredDate) {
-        this.serverCertExpiredDate = serverCertExpiredDate;
+    public java.lang.String serverCertPem;
+    public void setServerCertPem(java.lang.String serverCertPem) {
+        this.serverCertPem = serverCertPem;
     }
-    public java.sql.Timestamp getServerCertExpiredDate() {
-        return this.serverCertExpiredDate;
+    public java.lang.String getServerCertPem() {
+        return this.serverCertPem;
+    }
+
+    public CertificateInfo serverCertInfo;
+    public void setServerCertInfo(CertificateInfo serverCertInfo) {
+        this.serverCertInfo = serverCertInfo;
+    }
+    public CertificateInfo getServerCertInfo() {
+        return this.serverCertInfo;
     }
 
     public KmsIdentityInventory activeIdentity;

sdk/src/main/java/org/zstack/sdk/NkpRestoreInfo.java

@@ -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;
@@ -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;
+    }
+
 }

sdk/src/main/java/org/zstack/sdk/keyprovider/kms/api/CreateKmsAction.java

@@ -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;
 

sdk/src/main/java/org/zstack/sdk/keyprovider/kms/api/GetKmsServerCertFromKmsAction.java

@@ -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;
+    }
+
+}

sdk/src/main/java/org/zstack/sdk/keyprovider/kms/api/GetKmsServerCertFromKmsResult.java

@@ -0,0 +1,30 @@
+package org.zstack.sdk.keyprovider.kms.api;
+
+import org.zstack.sdk.CertificateInfo;
+
+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 boolean selfSigned;
+    public void setSelfSigned(boolean selfSigned) {
+        this.selfSigned = selfSigned;
+    }
+    public boolean getSelfSigned() {
+        return this.selfSigned;
+    }
+
+    public CertificateInfo serverCertInfo;
+    public void setServerCertInfo(CertificateInfo serverCertInfo) {
+        this.serverCertInfo = serverCertInfo;
+    }
+    public CertificateInfo getServerCertInfo() {
+        return this.serverCertInfo;
+    }
+
+}

sdk/src/main/java/org/zstack/sdk/keyprovider/kms/api/UploadKmsClientCsrAction.java

@@ -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;
+    }
+
+}

sdk/src/main/java/org/zstack/sdk/keyprovider/kms/api/UploadKmsClientCsrResult.java

@@ -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;
+    }
+
+}