Skip to content

Commit 1cc2854

Browse files
committed
Fix missing keys in listZonesMetrics response
1 parent 3faf7cd commit 1cc2854

2 files changed

Lines changed: 22 additions & 10 deletions

File tree

api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public class ZoneResponse extends BaseResponseWithAnnotations implements SetReso
9595

9696
@SerializedName("securitygroupsenabled")
9797
@Param(description = "true if security groups support is enabled, false otherwise")
98-
private Boolean securityGroupsEnabled;
98+
private boolean securityGroupsEnabled;
9999

100100
@SerializedName("allocationstate")
101101
@Param(description = "the allocation state of the cluster")
@@ -111,11 +111,11 @@ public class ZoneResponse extends BaseResponseWithAnnotations implements SetReso
111111

112112
@SerializedName("capacity")
113113
@Param(description = "the capacity of the Zone", responseObject = CapacityResponse.class)
114-
private List<CapacityResponse> capacitites;
114+
private List<CapacityResponse> capacities;
115115

116116
@SerializedName(ApiConstants.LOCAL_STORAGE_ENABLED)
117117
@Param(description = "true if local storage offering enabled, false otherwise")
118-
private Boolean localStorageEnabled;
118+
private boolean localStorageEnabled;
119119

120120
@SerializedName(ApiConstants.TAGS)
121121
@Param(description = "the list of resource tags associated with zone.", responseObject = ResourceTagResponse.class, since = "4.3")
@@ -197,7 +197,7 @@ public void setNetworkType(String networkType) {
197197
this.networkType = networkType;
198198
}
199199

200-
public void setSecurityGroupsEnabled(Boolean securityGroupsEnabled) {
200+
public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
201201
this.securityGroupsEnabled = securityGroupsEnabled;
202202
}
203203

@@ -213,15 +213,15 @@ public void setDhcpProvider(String dhcpProvider) {
213213
this.dhcpProvider = dhcpProvider;
214214
}
215215

216-
public void setCapacitites(List<CapacityResponse> capacitites) {
217-
this.capacitites = capacitites;
216+
public void setCapacities(List<CapacityResponse> capacities) {
217+
this.capacities = capacities;
218218
}
219219

220220
public void setDomainName(String domainName) {
221221
this.domainName = domainName;
222222
}
223223

224-
public void setLocalStorageEnabled(Boolean localStorageEnabled) {
224+
public void setLocalStorageEnabled(boolean localStorageEnabled) {
225225
this.localStorageEnabled = localStorageEnabled;
226226
}
227227

@@ -324,8 +324,8 @@ public String getDhcpProvider() {
324324
return dhcpProvider;
325325
}
326326

327-
public List<CapacityResponse> getCapacitites() {
328-
return capacitites;
327+
public List<CapacityResponse> getCapacities() {
328+
return capacities;
329329
}
330330

331331
public boolean isLocalStorageEnabled() {
@@ -340,6 +340,18 @@ public Map<String, String> getResourceDetails() {
340340
return resourceDetails;
341341
}
342342

343+
public Boolean getAllowUserSpecifyVRMtu() {
344+
return allowUserSpecifyVRMtu;
345+
}
346+
347+
public Integer getRouterPrivateInterfaceMaxMtu() {
348+
return routerPrivateInterfaceMaxMtu;
349+
}
350+
351+
public Integer getRouterPublicInterfaceMaxMtu() {
352+
return routerPublicInterfaceMaxMtu;
353+
}
354+
343355
@Override
344356
public void setResourceIconResponse(ResourceIconResponse resourceIconResponse) {
345357
this.resourceIconResponse = resourceIconResponse;

server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public ZoneResponse newDataCenterResponse(ResponseView view, DataCenterJoinVO da
8787
zoneResponse.setGuestCidrAddress(dataCenter.getGuestNetworkCidr());
8888

8989
if (showCapacities != null && showCapacities) {
90-
zoneResponse.setCapacitites(ApiResponseHelper.getDataCenterCapacityResponse(dataCenter.getId()));
90+
zoneResponse.setCapacities(ApiResponseHelper.getDataCenterCapacityResponse(dataCenter.getId()));
9191
}
9292
}
9393

0 commit comments

Comments
 (0)