Skip to content

Commit fe2b5db

Browse files
author
zhong.xian
committed
<feature>[sdk]: add requestCpu and add errCode
add requestCpuNum and requestMemorySize; add loudOperationsErrorCode Resolves: ZSTAC-80103 Change-Id: Ib1c2d3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0
1 parent 8f58fad commit fe2b5db

7 files changed

Lines changed: 63 additions & 9 deletions

File tree

‎sdk/src/main/java/org/zstack/sdk/DeployAppDevelopmentServiceAction.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public Result throwExceptionIfError() {
5555
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
5656
public java.lang.Integer cpuNum;
5757

58+
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
59+
public java.lang.Integer requestCpuNum;
60+
5861
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
5962
public java.lang.String name;
6063

@@ -73,6 +76,9 @@ public Result throwExceptionIfError() {
7376
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
7477
public java.lang.Long memorySize;
7578

79+
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
80+
public java.lang.Long requestMemorySize;
81+
7682
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
7783
public java.util.List l3NetworkUuids;
7884

‎sdk/src/main/java/org/zstack/sdk/DeployModelEvalServiceAction.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ public Result throwExceptionIfError() {
106106
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
107107
public java.lang.Integer cpuNum;
108108

109+
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
110+
public java.lang.Integer requestCpuNum;
111+
109112
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
110113
public java.lang.String name;
111114

@@ -124,6 +127,9 @@ public Result throwExceptionIfError() {
124127
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
125128
public java.lang.Long memorySize;
126129

130+
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
131+
public java.lang.Long requestMemorySize;
132+
127133
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
128134
public java.util.List l3NetworkUuids;
129135

‎sdk/src/main/java/org/zstack/sdk/DeployModelServiceAction.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public Result throwExceptionIfError() {
5555
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
5656
public java.lang.Integer cpuNum;
5757

58+
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
59+
public java.lang.Integer requestCpuNum;
60+
5861
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
5962
public java.lang.String name;
6063

@@ -73,6 +76,9 @@ public Result throwExceptionIfError() {
7376
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
7477
public java.lang.Long memorySize;
7578

79+
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
80+
public java.lang.Long requestMemorySize;
81+
7682
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
7783
public java.util.List l3NetworkUuids;
7884

‎sdk/src/main/java/org/zstack/sdk/MatchModelServiceTemplateWithModelAction.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ public Result throwExceptionIfError() {
6464
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
6565
public java.lang.Integer cpuNum;
6666

67+
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
68+
public java.lang.Integer requestCpuNum;
69+
6770
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
6871
public java.lang.String name;
6972

@@ -82,6 +85,9 @@ public Result throwExceptionIfError() {
8285
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
8386
public java.lang.Long memorySize;
8487

88+
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
89+
public java.lang.Long requestMemorySize;
90+
8591
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
8692
public java.util.List l3NetworkUuids;
8793

‎sdk/src/main/java/org/zstack/sdk/ModelService.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,14 @@ public java.lang.Integer getCpuNum() {
108108
return this.cpuNum;
109109
}
110110

111+
public java.lang.Integer requestCpuNum;
112+
public void setRequestCpuNum(java.lang.Integer requestCpuNum) {
113+
this.requestCpuNum = requestCpuNum;
114+
}
115+
public java.lang.Integer getRequestCpuNum() {
116+
return this.requestCpuNum;
117+
}
118+
111119
public java.lang.String name;
112120
public void setName(java.lang.String name) {
113121
this.name = name;
@@ -156,6 +164,14 @@ public java.lang.Long getMemorySize() {
156164
return this.memorySize;
157165
}
158166

167+
public java.lang.Long requestMemorySize;
168+
public void setRequestMemorySize(java.lang.Long requestMemorySize) {
169+
this.requestMemorySize = requestMemorySize;
170+
}
171+
public java.lang.Long getRequestMemorySize() {
172+
return this.requestMemorySize;
173+
}
174+
159175
public java.util.List l3NetworkUuids;
160176
public void setL3NetworkUuids(java.util.List l3NetworkUuids) {
161177
this.l3NetworkUuids = l3NetworkUuids;

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -962,8 +962,8 @@ abstract class ApiHelper {
962962
}
963963

964964

965-
def addBareMetal2Gateway(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBareMetal2GatewayAction.class) Closure c) {
966-
def a = new org.zstack.sdk.AddBareMetal2GatewayAction()
965+
def addBareMetal2DpuChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBareMetal2DpuChassisAction.class) Closure c) {
966+
def a = new org.zstack.sdk.AddBareMetal2DpuChassisAction()
967967
a.sessionId = Test.currentEnvSpec?.session?.uuid
968968
c.resolveStrategy = Closure.OWNER_FIRST
969969
c.delegate = a
@@ -989,8 +989,8 @@ abstract class ApiHelper {
989989
}
990990

991991

992-
def addBareMetal2IpmiChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBareMetal2IpmiChassisAction.class) Closure c) {
993-
def a = new org.zstack.sdk.AddBareMetal2IpmiChassisAction()
992+
def addBareMetal2Gateway(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBareMetal2GatewayAction.class) Closure c) {
993+
def a = new org.zstack.sdk.AddBareMetal2GatewayAction()
994994
a.sessionId = Test.currentEnvSpec?.session?.uuid
995995
c.resolveStrategy = Closure.OWNER_FIRST
996996
c.delegate = a
@@ -1016,26 +1016,26 @@ abstract class ApiHelper {
10161016
}
10171017

10181018

1019-
def addBareMetal2DpuChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBareMetal2DpuChassisAction.class) Closure c) {
1020-
def a = new org.zstack.sdk.AddBareMetal2DpuChassisAction()
1019+
def addBareMetal2IpmiChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBareMetal2IpmiChassisAction.class) Closure c) {
1020+
def a = new org.zstack.sdk.AddBareMetal2IpmiChassisAction()
10211021
a.sessionId = Test.currentEnvSpec?.session?.uuid
10221022
c.resolveStrategy = Closure.OWNER_FIRST
10231023
c.delegate = a
10241024
c()
1025-
1025+
10261026

10271027
if (System.getProperty("apipath") != null) {
10281028
if (a.apiId == null) {
10291029
a.apiId = Platform.uuid
10301030
}
1031-
1031+
10321032
def tracker = new ApiPathTracker(a.apiId)
10331033
def out = errorOut(a.call())
10341034
def path = tracker.getApiPath()
10351035
if (!path.isEmpty()) {
10361036
Test.apiPaths[a.class.name] = path.join(" --->\n")
10371037
}
1038-
1038+
10391039
return out
10401040
} else {
10411041
return errorOut(a.call())

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14873,6 +14873,20 @@ public class CloudOperationsErrorCode {
1487314873

1487414874
public static final String ORG_ZSTACK_AI_10134 = "ORG_ZSTACK_AI_10134";
1487514875

14876+
public static final String ORG_ZSTACK_AI_10135 = "ORG_ZSTACK_AI_10135";
14877+
14878+
public static final String ORG_ZSTACK_AI_10136 = "ORG_ZSTACK_AI_10136";
14879+
14880+
public static final String ORG_ZSTACK_AI_10137 = "ORG_ZSTACK_AI_10137";
14881+
14882+
public static final String ORG_ZSTACK_AI_10138 = "ORG_ZSTACK_AI_10138";
14883+
14884+
public static final String ORG_ZSTACK_AI_10139 = "ORG_ZSTACK_AI_10139";
14885+
14886+
public static final String ORG_ZSTACK_AI_10140 = "ORG_ZSTACK_AI_10140";
14887+
14888+
public static final String ORG_ZSTACK_AI_10141 = "ORG_ZSTACK_AI_10141";
14889+
1487614890
public static final String ORG_ZSTACK_CORE_CLOUDBUS_10000 = "ORG_ZSTACK_CORE_CLOUDBUS_10000";
1487714891

1487814892
public static final String ORG_ZSTACK_CORE_CLOUDBUS_10001 = "ORG_ZSTACK_CORE_CLOUDBUS_10001";

0 commit comments

Comments
 (0)