Merge branch 'ZSV-11505@@2' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'

<fix>[keyprovider]: Refine rekey validation and skip reporting

See merge request zstackio/zstack!9482

Author: gitlab

sdk/src/main/java/SourceClassMap.java

@@ -70,6 +70,7 @@ public class SourceClassMap {
 			put("org.zstack.core.jsonlabel.JsonLabelInventory", "org.zstack.sdk.JsonLabelInventory");
 			put("org.zstack.crypto.ccs.CCSCertificateAccountRefInventory", "org.zstack.sdk.CCSCertificateAccountRefInventory");
 			put("org.zstack.crypto.ccs.CCSCertificateInventory", "org.zstack.sdk.CCSCertificateInventory");
+			put("org.zstack.crypto.keyprovider.api.RekeySkippedResource", "org.zstack.sdk.keyprovider.api.RekeySkippedResource");
 			put("org.zstack.crypto.securitymachine.thirdparty.aisino.AiSiNoSecretResourcePoolInventory", "org.zstack.sdk.AiSiNoSecretResourcePoolInventory");
 			put("org.zstack.crypto.securitymachine.thirdparty.flkSec.FlkSecSecretResourcePoolInventory", "org.zstack.sdk.FlkSecSecretResourcePoolInventory");
 			put("org.zstack.crypto.securitymachine.thirdparty.flkSec.FlkSecSecurityMachineInventory", "org.zstack.sdk.FlkSecSecurityMachineInventory");
@@ -1264,6 +1265,7 @@ public class SourceClassMap {
 			put("org.zstack.sdk.identity.ldap.entity.LdapServerInventory", "org.zstack.ldap.entity.LdapServerInventory");
 			put("org.zstack.sdk.identity.role.RoleAccountRefInventory", "org.zstack.header.identity.role.RoleAccountRefInventory");
 			put("org.zstack.sdk.identity.role.RoleInventory", "org.zstack.header.identity.role.RoleInventory");
+			put("org.zstack.sdk.keyprovider.api.RekeySkippedResource", "org.zstack.crypto.keyprovider.api.RekeySkippedResource");
 			put("org.zstack.sdk.license.entity.LicenseHistoryInventory", "org.zstack.license.entity.LicenseHistoryInventory");
 			put("org.zstack.sdk.license.entity.LicenseUsageView", "org.zstack.license.entity.LicenseUsageView");
 			put("org.zstack.sdk.license.entity.UpdateLicenseView", "org.zstack.license.entity.UpdateLicenseView");

sdk/src/main/java/org/zstack/sdk/keyprovider/api/RekeyKeyProviderRefsResult.java

@@ -3,5 +3,36 @@
 
 
 public class RekeyKeyProviderRefsResult {
+    public int totalCount;
+    public void setTotalCount(int totalCount) {
+        this.totalCount = totalCount;
+    }
+    public int getTotalCount() {
+        return this.totalCount;
+    }
+
+    public int successCount;
+    public void setSuccessCount(int successCount) {
+        this.successCount = successCount;
+    }
+    public int getSuccessCount() {
+        return this.successCount;
+    }
+
+    public int skippedCount;
+    public void setSkippedCount(int skippedCount) {
+        this.skippedCount = skippedCount;
+    }
+    public int getSkippedCount() {
+        return this.skippedCount;
+    }
+
+    public java.util.List skippedResources;
+    public void setSkippedResources(java.util.List skippedResources) {
+        this.skippedResources = skippedResources;
+    }
+    public java.util.List getSkippedResources() {
+        return this.skippedResources;
+    }
 
 }

sdk/src/main/java/org/zstack/sdk/keyprovider/api/RekeySkippedResource.java

@@ -0,0 +1,39 @@
+package org.zstack.sdk.keyprovider.api;
+
+
+
+public class RekeySkippedResource  {
+
+    public java.lang.Long keyRefId;
+    public void setKeyRefId(java.lang.Long keyRefId) {
+        this.keyRefId = keyRefId;
+    }
+    public java.lang.Long getKeyRefId() {
+        return this.keyRefId;
+    }
+
+    public java.lang.String resourceType;
+    public void setResourceType(java.lang.String resourceType) {
+        this.resourceType = resourceType;
+    }
+    public java.lang.String getResourceType() {
+        return this.resourceType;
+    }
+
+    public java.lang.String resourceUuid;
+    public void setResourceUuid(java.lang.String resourceUuid) {
+        this.resourceUuid = resourceUuid;
+    }
+    public java.lang.String getResourceUuid() {
+        return this.resourceUuid;
+    }
+
+    public java.lang.String reason;
+    public void setReason(java.lang.String reason) {
+        this.reason = reason;
+    }
+    public java.lang.String getReason() {
+        return this.reason;
+    }
+
+}