Skip to content

Commit f6e8b41

Browse files
author
tao.yang
committed
<fix>[keyprovider]: Refine rekey validation and skip reporting
Resolves: ZSV-11505 Change-Id: I6f756f7362636c7878676c786d6371746574746f
1 parent 052ddff commit f6e8b41

3 files changed

Lines changed: 72 additions & 0 deletions

File tree

sdk/src/main/java/SourceClassMap.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public class SourceClassMap {
7070
put("org.zstack.core.jsonlabel.JsonLabelInventory", "org.zstack.sdk.JsonLabelInventory");
7171
put("org.zstack.crypto.ccs.CCSCertificateAccountRefInventory", "org.zstack.sdk.CCSCertificateAccountRefInventory");
7272
put("org.zstack.crypto.ccs.CCSCertificateInventory", "org.zstack.sdk.CCSCertificateInventory");
73+
put("org.zstack.crypto.keyprovider.api.RekeySkippedResource", "org.zstack.sdk.keyprovider.api.RekeySkippedResource");
7374
put("org.zstack.crypto.securitymachine.thirdparty.aisino.AiSiNoSecretResourcePoolInventory", "org.zstack.sdk.AiSiNoSecretResourcePoolInventory");
7475
put("org.zstack.crypto.securitymachine.thirdparty.flkSec.FlkSecSecretResourcePoolInventory", "org.zstack.sdk.FlkSecSecretResourcePoolInventory");
7576
put("org.zstack.crypto.securitymachine.thirdparty.flkSec.FlkSecSecurityMachineInventory", "org.zstack.sdk.FlkSecSecurityMachineInventory");
@@ -1264,6 +1265,7 @@ public class SourceClassMap {
12641265
put("org.zstack.sdk.identity.ldap.entity.LdapServerInventory", "org.zstack.ldap.entity.LdapServerInventory");
12651266
put("org.zstack.sdk.identity.role.RoleAccountRefInventory", "org.zstack.header.identity.role.RoleAccountRefInventory");
12661267
put("org.zstack.sdk.identity.role.RoleInventory", "org.zstack.header.identity.role.RoleInventory");
1268+
put("org.zstack.sdk.keyprovider.api.RekeySkippedResource", "org.zstack.crypto.keyprovider.api.RekeySkippedResource");
12671269
put("org.zstack.sdk.license.entity.LicenseHistoryInventory", "org.zstack.license.entity.LicenseHistoryInventory");
12681270
put("org.zstack.sdk.license.entity.LicenseUsageView", "org.zstack.license.entity.LicenseUsageView");
12691271
put("org.zstack.sdk.license.entity.UpdateLicenseView", "org.zstack.license.entity.UpdateLicenseView");

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,36 @@
33

44

55
public class RekeyKeyProviderRefsResult {
6+
public int totalCount;
7+
public void setTotalCount(int totalCount) {
8+
this.totalCount = totalCount;
9+
}
10+
public int getTotalCount() {
11+
return this.totalCount;
12+
}
13+
14+
public int successCount;
15+
public void setSuccessCount(int successCount) {
16+
this.successCount = successCount;
17+
}
18+
public int getSuccessCount() {
19+
return this.successCount;
20+
}
21+
22+
public int skippedCount;
23+
public void setSkippedCount(int skippedCount) {
24+
this.skippedCount = skippedCount;
25+
}
26+
public int getSkippedCount() {
27+
return this.skippedCount;
28+
}
29+
30+
public java.util.List skippedResources;
31+
public void setSkippedResources(java.util.List skippedResources) {
32+
this.skippedResources = skippedResources;
33+
}
34+
public java.util.List getSkippedResources() {
35+
return this.skippedResources;
36+
}
637

738
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package org.zstack.sdk.keyprovider.api;
2+
3+
4+
5+
public class RekeySkippedResource {
6+
7+
public java.lang.Long keyRefId;
8+
public void setKeyRefId(java.lang.Long keyRefId) {
9+
this.keyRefId = keyRefId;
10+
}
11+
public java.lang.Long getKeyRefId() {
12+
return this.keyRefId;
13+
}
14+
15+
public java.lang.String resourceType;
16+
public void setResourceType(java.lang.String resourceType) {
17+
this.resourceType = resourceType;
18+
}
19+
public java.lang.String getResourceType() {
20+
return this.resourceType;
21+
}
22+
23+
public java.lang.String resourceUuid;
24+
public void setResourceUuid(java.lang.String resourceUuid) {
25+
this.resourceUuid = resourceUuid;
26+
}
27+
public java.lang.String getResourceUuid() {
28+
return this.resourceUuid;
29+
}
30+
31+
public java.lang.String reason;
32+
public void setReason(java.lang.String reason) {
33+
this.reason = reason;
34+
}
35+
public java.lang.String getReason() {
36+
return this.reason;
37+
}
38+
39+
}

0 commit comments

Comments
 (0)