Skip to content

Commit cf32ef0

Browse files
author
zhong.xian
committed
<fix>[sdk]: add shareType field to GPU query APIs
Resolves: ZSTAC-82599 Change-Id: I7576776a706d6571756e727165776163736e676b
1 parent 62e8c17 commit cf32ef0

File tree

5 files changed

+41
-9
lines changed

5 files changed

+41
-9
lines changed

sdk/src/main/java/org/zstack/sdk/MdevDeviceInventory.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,12 @@ public java.lang.String getVendor() {
127127
return this.vendor;
128128
}
129129

130+
public java.lang.String shareType;
131+
public void setShareType(java.lang.String shareType) {
132+
this.shareType = shareType;
133+
}
134+
public java.lang.String getShareType() {
135+
return this.shareType;
136+
}
137+
130138
}

sdk/src/main/java/org/zstack/sdk/MdevDeviceSpecInventory.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,12 @@ public java.lang.Integer getMaxAvailableDevicesPerHost() {
9393
return this.maxAvailableDevicesPerHost;
9494
}
9595

96+
public java.lang.String shareType;
97+
public void setShareType(java.lang.String shareType) {
98+
this.shareType = shareType;
99+
}
100+
public java.lang.String getShareType() {
101+
return this.shareType;
102+
}
103+
96104
}

sdk/src/main/java/org/zstack/sdk/PciDeviceInventory.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,4 +233,12 @@ public java.util.List getMdevSpecRefs() {
233233
return this.mdevSpecRefs;
234234
}
235235

236+
public java.lang.String shareType;
237+
public void setShareType(java.lang.String shareType) {
238+
this.shareType = shareType;
239+
}
240+
public java.lang.String getShareType() {
241+
return this.shareType;
242+
}
243+
236244
}

sdk/src/main/java/org/zstack/sdk/PciDeviceSpecInventory.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,12 @@ public java.lang.Integer getMaxAvailableDevicesPerHost() {
165165
return this.maxAvailableDevicesPerHost;
166166
}
167167

168+
public java.lang.String shareType;
169+
public void setShareType(java.lang.String shareType) {
170+
this.shareType = shareType;
171+
}
172+
public java.lang.String getShareType() {
173+
return this.shareType;
174+
}
175+
168176
}

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())

0 commit comments

Comments
 (0)