Skip to content

Commit 5aeabec

Browse files
author
zhong.zhou
committed
<fix>[sdk]: align sdk and tests
Sync SDK rekey result schema to providerResults and add RekeyProviderResult model. Update premium rekey test assertions for provider-level counts and unbound-provider split behavior. Resolves: ZSV-11757 Change-Id: I68676e706f6a786773627074636f6e6a617a6e44
1 parent 1751228 commit 5aeabec

3 files changed

Lines changed: 78 additions & 13 deletions

File tree

sdk/src/main/java/SourceClassMap.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public class SourceClassMap {
7171
put("org.zstack.crypto.ccs.CCSCertificateAccountRefInventory", "org.zstack.sdk.CCSCertificateAccountRefInventory");
7272
put("org.zstack.crypto.ccs.CCSCertificateInventory", "org.zstack.sdk.CCSCertificateInventory");
7373
put("org.zstack.crypto.keyprovider.api.RekeyFailedResource", "org.zstack.sdk.keyprovider.api.RekeyFailedResource");
74+
put("org.zstack.crypto.keyprovider.api.RekeyProviderResult", "org.zstack.sdk.keyprovider.api.RekeyProviderResult");
7475
put("org.zstack.crypto.keyprovider.api.RekeySkippedResource", "org.zstack.sdk.keyprovider.api.RekeySkippedResource");
7576
put("org.zstack.crypto.securitymachine.thirdparty.aisino.AiSiNoSecretResourcePoolInventory", "org.zstack.sdk.AiSiNoSecretResourcePoolInventory");
7677
put("org.zstack.crypto.securitymachine.thirdparty.flkSec.FlkSecSecretResourcePoolInventory", "org.zstack.sdk.FlkSecSecretResourcePoolInventory");
@@ -1269,6 +1270,7 @@ public class SourceClassMap {
12691270
put("org.zstack.sdk.identity.role.RoleAccountRefInventory", "org.zstack.header.identity.role.RoleAccountRefInventory");
12701271
put("org.zstack.sdk.identity.role.RoleInventory", "org.zstack.header.identity.role.RoleInventory");
12711272
put("org.zstack.sdk.keyprovider.api.RekeyFailedResource", "org.zstack.crypto.keyprovider.api.RekeyFailedResource");
1273+
put("org.zstack.sdk.keyprovider.api.RekeyProviderResult", "org.zstack.crypto.keyprovider.api.RekeyProviderResult");
12721274
put("org.zstack.sdk.keyprovider.api.RekeySkippedResource", "org.zstack.crypto.keyprovider.api.RekeySkippedResource");
12731275
put("org.zstack.sdk.license.entity.LicenseHistoryInventory", "org.zstack.license.entity.LicenseHistoryInventory");
12741276
put("org.zstack.sdk.license.entity.LicenseUsageView", "org.zstack.license.entity.LicenseUsageView");

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,12 @@ public int getFailedCount() {
3535
return this.failedCount;
3636
}
3737

38-
public java.util.List skippedResources;
39-
public void setSkippedResources(java.util.List skippedResources) {
40-
this.skippedResources = skippedResources;
38+
public java.util.List providerResults;
39+
public void setProviderResults(java.util.List providerResults) {
40+
this.providerResults = providerResults;
4141
}
42-
public java.util.List getSkippedResources() {
43-
return this.skippedResources;
44-
}
45-
46-
public java.util.List failedResources;
47-
public void setFailedResources(java.util.List failedResources) {
48-
this.failedResources = failedResources;
49-
}
50-
public java.util.List getFailedResources() {
51-
return this.failedResources;
42+
public java.util.List getProviderResults() {
43+
return this.providerResults;
5244
}
5345

5446
}
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
package org.zstack.sdk.keyprovider.api;
2+
3+
4+
5+
public class RekeyProviderResult {
6+
7+
public java.lang.String providerUuid;
8+
public void setProviderUuid(java.lang.String providerUuid) {
9+
this.providerUuid = providerUuid;
10+
}
11+
public java.lang.String getProviderUuid() {
12+
return this.providerUuid;
13+
}
14+
15+
public java.lang.String providerName;
16+
public void setProviderName(java.lang.String providerName) {
17+
this.providerName = providerName;
18+
}
19+
public java.lang.String getProviderName() {
20+
return this.providerName;
21+
}
22+
23+
public int totalRefCount;
24+
public void setTotalRefCount(int totalRefCount) {
25+
this.totalRefCount = totalRefCount;
26+
}
27+
public int getTotalRefCount() {
28+
return this.totalRefCount;
29+
}
30+
31+
public int successRefCount;
32+
public void setSuccessRefCount(int successRefCount) {
33+
this.successRefCount = successRefCount;
34+
}
35+
public int getSuccessRefCount() {
36+
return this.successRefCount;
37+
}
38+
39+
public int skippedRefCount;
40+
public void setSkippedRefCount(int skippedRefCount) {
41+
this.skippedRefCount = skippedRefCount;
42+
}
43+
public int getSkippedRefCount() {
44+
return this.skippedRefCount;
45+
}
46+
47+
public int failedRefCount;
48+
public void setFailedRefCount(int failedRefCount) {
49+
this.failedRefCount = failedRefCount;
50+
}
51+
public int getFailedRefCount() {
52+
return this.failedRefCount;
53+
}
54+
55+
public java.util.List skippedResources;
56+
public void setSkippedResources(java.util.List skippedResources) {
57+
this.skippedResources = skippedResources;
58+
}
59+
public java.util.List getSkippedResources() {
60+
return this.skippedResources;
61+
}
62+
63+
public java.util.List failedResources;
64+
public void setFailedResources(java.util.List failedResources) {
65+
this.failedResources = failedResources;
66+
}
67+
public java.util.List getFailedResources() {
68+
return this.failedResources;
69+
}
70+
71+
}

0 commit comments

Comments
 (0)