Skip to content

Commit 160f69a

Browse files
committed
<feature>[sdk]: Add getVmHaNetworkGroupRiskOnHost method
Resolves: ZSTAC-83065 Change-Id: I6d6f71667972646b71746c6c656e676c70657467
1 parent 5612ec2 commit 160f69a

6 files changed

Lines changed: 202 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
@@ -178,6 +178,7 @@ public class SourceClassMap {
178178
put("org.zstack.guesttools.GuestVmScriptInventory", "org.zstack.sdk.GuestVmScriptInventory");
179179
put("org.zstack.guesttools.InvocationRecord", "org.zstack.sdk.InvocationRecord");
180180
put("org.zstack.guesttools.InvocationRecordDetail", "org.zstack.sdk.InvocationRecordDetail");
181+
put("org.zstack.ha.APIGetVmHaNetworkGroupRiskOnHostReply$NetworkGroupStatusDetail", "org.zstack.sdk.NetworkGroupStatusDetail");
181182
put("org.zstack.ha.HaNetworkGroupInventory", "org.zstack.sdk.HaNetworkGroupInventory");
182183
put("org.zstack.ha.HaStrategyConditionInventory", "org.zstack.sdk.HaStrategyConditionInventory");
183184
put("org.zstack.header.acl.AccessControlListEntryInventory", "org.zstack.sdk.AccessControlListEntryInventory");
@@ -1265,6 +1266,7 @@ public class SourceClassMap {
12651266
put("org.zstack.sdk.NativeClusterInventory", "org.zstack.container.entity.NativeClusterInventory");
12661267
put("org.zstack.sdk.NativeHostInventory", "org.zstack.container.entity.NativeHostInventory");
12671268
put("org.zstack.sdk.Neighbor", "org.zstack.header.protocol.Neighbor");
1269+
put("org.zstack.sdk.NetworkGroupStatusDetail", "org.zstack.ha.APIGetVmHaNetworkGroupRiskOnHostReply$NetworkGroupStatusDetail");
12681270
put("org.zstack.sdk.NetworkReachablePair", "org.zstack.zops.NetworkReachablePair");
12691271
put("org.zstack.sdk.NetworkRouterAreaRefInventory", "org.zstack.header.protocol.NetworkRouterAreaRefInventory");
12701272
put("org.zstack.sdk.NetworkRouterFlowMeterRefInventory", "org.zstack.header.flowMeter.NetworkRouterFlowMeterRefInventory");
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
package org.zstack.sdk;
2+
3+
import java.util.HashMap;
4+
import java.util.Map;
5+
import org.zstack.sdk.*;
6+
7+
public class GetVmHaNetworkGroupRiskOnHostAction extends AbstractAction {
8+
9+
private static final HashMap<String, Parameter> parameterMap = new HashMap<>();
10+
11+
private static final HashMap<String, Parameter> nonAPIParameterMap = new HashMap<>();
12+
13+
public static class Result {
14+
public ErrorCode error;
15+
public org.zstack.sdk.GetVmHaNetworkGroupRiskOnHostResult value;
16+
17+
public Result throwExceptionIfError() {
18+
if (error != null) {
19+
throw new ApiException(
20+
String.format("error[code: %s, description: %s, details: %s, globalErrorCode: %s]", error.code, error.description, error.details, error.globalErrorCode)
21+
);
22+
}
23+
24+
return this;
25+
}
26+
}
27+
28+
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
29+
public java.lang.String vmUuid;
30+
31+
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
32+
public java.lang.String targetHostUuid;
33+
34+
@Param(required = false)
35+
public java.util.List systemTags;
36+
37+
@Param(required = false)
38+
public java.util.List userTags;
39+
40+
@Param(required = false)
41+
public String sessionId;
42+
43+
@Param(required = false)
44+
public String accessKeyId;
45+
46+
@Param(required = false)
47+
public String accessKeySecret;
48+
49+
@Param(required = false)
50+
public String requestIp;
51+
52+
53+
private Result makeResult(ApiResult res) {
54+
Result ret = new Result();
55+
if (res.error != null) {
56+
ret.error = res.error;
57+
return ret;
58+
}
59+
60+
org.zstack.sdk.GetVmHaNetworkGroupRiskOnHostResult value = res.getResult(org.zstack.sdk.GetVmHaNetworkGroupRiskOnHostResult.class);
61+
ret.value = value == null ? new org.zstack.sdk.GetVmHaNetworkGroupRiskOnHostResult() : value;
62+
63+
return ret;
64+
}
65+
66+
public Result call() {
67+
ApiResult res = ZSClient.call(this);
68+
return makeResult(res);
69+
}
70+
71+
public void call(final Completion<Result> completion) {
72+
ZSClient.call(this, new InternalCompletion() {
73+
@Override
74+
public void complete(ApiResult res) {
75+
completion.complete(makeResult(res));
76+
}
77+
});
78+
}
79+
80+
protected Map<String, Parameter> getParameterMap() {
81+
return parameterMap;
82+
}
83+
84+
protected Map<String, Parameter> getNonAPIParameterMap() {
85+
return nonAPIParameterMap;
86+
}
87+
88+
protected RestInfo getRestInfo() {
89+
RestInfo info = new RestInfo();
90+
info.httpMethod = "GET";
91+
info.path = "/vm-instances/{vmUuid}/ha-network-group-risks";
92+
info.needSession = true;
93+
info.needPoll = false;
94+
info.parameterName = "";
95+
return info;
96+
}
97+
98+
}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package org.zstack.sdk;
2+
3+
4+
5+
public class GetVmHaNetworkGroupRiskOnHostResult {
6+
public java.lang.String riskLevel;
7+
public void setRiskLevel(java.lang.String riskLevel) {
8+
this.riskLevel = riskLevel;
9+
}
10+
public java.lang.String getRiskLevel() {
11+
return this.riskLevel;
12+
}
13+
14+
public boolean enableHa;
15+
public void setEnableHa(boolean enableHa) {
16+
this.enableHa = enableHa;
17+
}
18+
public boolean getEnableHa() {
19+
return this.enableHa;
20+
}
21+
22+
public boolean monitorEnabled;
23+
public void setMonitorEnabled(boolean monitorEnabled) {
24+
this.monitorEnabled = monitorEnabled;
25+
}
26+
public boolean getMonitorEnabled() {
27+
return this.monitorEnabled;
28+
}
29+
30+
public java.util.List networkGroupDetails;
31+
public void setNetworkGroupDetails(java.util.List networkGroupDetails) {
32+
this.networkGroupDetails = networkGroupDetails;
33+
}
34+
public java.util.List getNetworkGroupDetails() {
35+
return this.networkGroupDetails;
36+
}
37+
38+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package org.zstack.sdk;
2+
3+
4+
5+
public class NetworkGroupStatusDetail {
6+
7+
public java.lang.String networkGroupUuid;
8+
public void setNetworkGroupUuid(java.lang.String networkGroupUuid) {
9+
this.networkGroupUuid = networkGroupUuid;
10+
}
11+
public java.lang.String getNetworkGroupUuid() {
12+
return this.networkGroupUuid;
13+
}
14+
15+
public java.lang.String networkGroupName;
16+
public void setNetworkGroupName(java.lang.String networkGroupName) {
17+
this.networkGroupName = networkGroupName;
18+
}
19+
public java.lang.String getNetworkGroupName() {
20+
return this.networkGroupName;
21+
}
22+
23+
public java.lang.String status;
24+
public void setStatus(java.lang.String status) {
25+
this.status = status;
26+
}
27+
public java.lang.String getStatus() {
28+
return this.status;
29+
}
30+
31+
}

testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25775,6 +25775,33 @@ abstract class ApiHelper {
2577525775
}
2577625776

2577725777

25778+
def getVmHaNetworkGroupRiskOnHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmHaNetworkGroupRiskOnHostAction.class) Closure c) {
25779+
def a = new org.zstack.sdk.GetVmHaNetworkGroupRiskOnHostAction()
25780+
a.sessionId = Test.currentEnvSpec?.session?.uuid
25781+
c.resolveStrategy = Closure.OWNER_FIRST
25782+
c.delegate = a
25783+
c()
25784+
25785+
25786+
if (System.getProperty("apipath") != null) {
25787+
if (a.apiId == null) {
25788+
a.apiId = Platform.uuid
25789+
}
25790+
25791+
def tracker = new ApiPathTracker(a.apiId)
25792+
def out = errorOut(a.call())
25793+
def path = tracker.getApiPath()
25794+
if (!path.isEmpty()) {
25795+
Test.apiPaths[a.class.name] = path.join(" --->\n")
25796+
}
25797+
25798+
return out
25799+
} else {
25800+
return errorOut(a.call())
25801+
}
25802+
}
25803+
25804+
2577825805
def getVmHostname(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmHostnameAction.class) Closure c) {
2577925806
def a = new org.zstack.sdk.GetVmHostnameAction()
2578025807
a.sessionId = Test.currentEnvSpec?.session?.uuid

utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,6 +1890,12 @@ public class CloudOperationsErrorCode {
18901890

18911891
public static final String ORG_ZSTACK_HA_10034 = "ORG_ZSTACK_HA_10034";
18921892

1893+
public static final String ORG_ZSTACK_HA_10035 = "ORG_ZSTACK_HA_10035";
1894+
1895+
public static final String ORG_ZSTACK_HA_10036 = "ORG_ZSTACK_HA_10036";
1896+
1897+
public static final String ORG_ZSTACK_HA_10037 = "ORG_ZSTACK_HA_10037";
1898+
18931899
public static final String ORG_ZSTACK_NETWORK_SERVICE_SLB_10000 = "ORG_ZSTACK_NETWORK_SERVICE_SLB_10000";
18941900

18951901
public static final String ORG_ZSTACK_NETWORK_SERVICE_SLB_10001 = "ORG_ZSTACK_NETWORK_SERVICE_SLB_10001";

0 commit comments

Comments
 (0)