From 2b2d9eac151cc97452e4b3790e38b6a51c7a147f Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 24 Jan 2020 16:47:39 +0530 Subject: [PATCH 1/4] Fix: The metrics view API response is not super-set of resources response keys --- .../cloudstack/api/response/HostResponse.java | 2 +- .../api/response/VolumeResponse.java | 19 +++++++++---------- .../cloudstack/api/response/ZoneResponse.java | 2 +- .../api/query/dao/DataCenterJoinDaoImpl.java | 2 +- .../cloud/api/query/dao/HostJoinDaoImpl.java | 2 +- .../api/query/dao/VolumeJoinDaoImpl.java | 8 ++++---- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java index 3d53682d3b9e..2ed4aaafb7ee 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java @@ -361,7 +361,7 @@ public void setMemoryUsed(Long memoryUsed) { this.memoryUsed = memoryUsed; } - public void setGpuGroups(List gpuGroup) { + public void setGpuGroup(List gpuGroup) { this.gpuGroup = gpuGroup; } diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java index 01d2c9b3d8f1..19dfb13a4331 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java @@ -293,7 +293,7 @@ public String getObjectId() { return this.getId(); } - public Boolean isDestroyed() { + public Boolean getDestroyed() { return destroyed; } @@ -750,36 +750,35 @@ public void setUtilization(String utilization) { this.utilization = utilization; } - public String getClusterId() { + public String getClusterid() { return clusterid; } - public void setClusterId(String clusterid) { + public void setClusterid(String clusterid) { this.clusterid = clusterid; } - public String getClusterName() { + public String getClustername() { return clustername; } - public void setClusterName(String clustername) { + public void setClustername(String clustername) { this.clustername = clustername; } - public String getPodId() { + public String getPodid() { return podid; } - public void setPodId(String podid) { + public void setPodid(String podid) { this.podid = podid; } - public String getPodName() { + public String getPodname() { return podname; } - public void setPodName(String podname) { + public void setPodname(String podname) { this.podname = podname; } - } diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java index efd3b79ed0a2..e95333fbd65a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java @@ -173,7 +173,7 @@ public void setDomainId(String domainId) { this.domainId = domainId; } - public void setType(String networkType) { + public void setNetworkType(String networkType) { this.networkType = networkType; } diff --git a/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java index ffc75307182d..cfe2e31a371f 100644 --- a/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java @@ -90,7 +90,7 @@ public ZoneResponse newDataCenterResponse(ResponseView view, DataCenterJoinVO da zoneResponse.setDomainId(dataCenter.getDomainUuid()); zoneResponse.setDomainName(dataCenter.getDomainName()); - zoneResponse.setType(dataCenter.getNetworkType().toString()); + zoneResponse.setNetworkType(dataCenter.getNetworkType().toString()); zoneResponse.setAllocationState(dataCenter.getAllocationState().toString()); zoneResponse.setZoneToken(dataCenter.getZoneToken()); zoneResponse.setDhcpProvider(dataCenter.getDhcpProvider()); diff --git a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java index 4cb8a76940e6..f028a6cc11ce 100644 --- a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -138,7 +138,7 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet detail } gpus.add(gpuResponse); } - hostResponse.setGpuGroups(gpus); + hostResponse.setGpuGroup(gpus); } if (details.contains(HostDetails.all) || details.contains(HostDetails.capacity) || details.contains(HostDetails.stats) || details.contains(HostDetails.events)) { diff --git a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java index c7977356379e..6d34f1780442 100644 --- a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java @@ -83,10 +83,10 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume) volResponse.setZoneId(volume.getDataCenterUuid()); volResponse.setZoneName(volume.getDataCenterName()); if (view == ResponseView.Full) { - volResponse.setClusterId(volume.getClusterUuid()); - volResponse.setClusterName(volume.getClusterName()); - volResponse.setPodId(volume.getPodUuid()); - volResponse.setPodName(volume.getPodName()); + volResponse.setClusterid(volume.getClusterUuid()); + volResponse.setClustername(volume.getClusterName()); + volResponse.setPodid(volume.getPodUuid()); + volResponse.setPodname(volume.getPodName()); } if (volume.getVolumeType() != null) { From 616aaee231d12d7e14a3353df9b47af39a229b60 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 24 Jan 2020 20:07:48 +0530 Subject: [PATCH 2/4] Reverted naming of a property getter function --- .../java/org/apache/cloudstack/api/response/VolumeResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java index 19dfb13a4331..426fb2144d20 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java @@ -293,7 +293,7 @@ public String getObjectId() { return this.getId(); } - public Boolean getDestroyed() { + public Boolean isDestroyed() { return destroyed; } From 49f77ac5db31d497ac3d04a073dc5bfcd903ff93 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 27 Jan 2020 12:30:06 +0530 Subject: [PATCH 3/4] minor fixes Signed-off-by: Rohit Yadav --- .../api/response/ClusterResponse.java | 3 +- .../cloudstack/api/response/HostResponse.java | 35 +++++++++------- .../api/response/VolumeResponse.java | 40 +++++++++---------- .../api/query/dao/VolumeJoinDaoImpl.java | 8 ++-- 4 files changed, 46 insertions(+), 40 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java index d6ae70fd7a7d..305a4508cb9d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java @@ -21,14 +21,13 @@ import java.util.List; import java.util.Map; -import com.google.gson.annotations.SerializedName; - import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.org.Cluster; import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; @EntityReference(value = Cluster.class) public class ClusterResponse extends BaseResponse { diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java index 2ed4aaafb7ee..199a8c91c8b0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java @@ -16,21 +16,22 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.host.Host; -import com.cloud.host.Status; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import org.apache.cloudstack.ha.HAConfig; import org.apache.cloudstack.outofbandmanagement.OutOfBandManagement; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.cloud.host.Host; +import com.cloud.host.Status; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; @EntityReference(value = Host.class) public class HostResponse extends BaseResponse { @@ -243,11 +244,6 @@ public class HostResponse extends BaseResponse { @Param(description = "the admin that annotated this host", since = "4.11") private String username; - // Default visibility to support accessing the details from unit tests - Map getDetails() { - return details; - } - @Override public String getObjectId() { return this.getId(); @@ -437,6 +433,10 @@ public void setHostHAResponse(final HAConfig config) { this.hostHAResponse = new HostHAResponse(config); } + public void setHostHAResponse(HostHAResponse hostHAResponse) { + this.hostHAResponse = hostHAResponse; + } + public OutOfBandManagementResponse getOutOfBandManagementResponse() { return outOfBandManagementResponse; } @@ -445,6 +445,10 @@ public void setOutOfBandManagementResponse(final OutOfBandManagement outOfBandMa this.outOfBandManagementResponse = new OutOfBandManagementResponse(outOfBandManagementConfig); } + public void setOutOfBandManagementResponse(OutOfBandManagementResponse outOfBandManagementResponse) { + this.outOfBandManagementResponse = outOfBandManagementResponse; + } + public String getResourceState() { return resourceState; } @@ -496,7 +500,10 @@ public void setDetails(Map details) { detailsCopy.remove("password"); this.details = detailsCopy; + } + public Map getDetails() { + return details; } public void setMemoryTotal(Long memoryTotal) { diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java index 426fb2144d20..1cdd69673cfb 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java @@ -262,19 +262,19 @@ public class VolumeResponse extends BaseResponseWithTagInformation implements Co @SerializedName(ApiConstants.CLUSTER_ID) @Param(description = "cluster id of the volume") - private String clusterid; + private String clusterId; @SerializedName(ApiConstants.CLUSTER_NAME) @Param(description = "cluster name where the volume is allocated") - private String clustername; + private String clusterName; @SerializedName(ApiConstants.POD_ID) @Param(description = "pod id of the volume") - private String podid; + private String podId; @SerializedName(ApiConstants.POD_NAME) @Param(description = "pod name of the volume") - private String podname; + private String podName; public String getPath() { return path; @@ -750,35 +750,35 @@ public void setUtilization(String utilization) { this.utilization = utilization; } - public String getClusterid() { - return clusterid; + public String getClusterId() { + return clusterId; } - public void setClusterid(String clusterid) { - this.clusterid = clusterid; + public void setClusterId(String clusterId) { + this.clusterId = clusterId; } - public String getClustername() { - return clustername; + public String getClusterName() { + return clusterName; } - public void setClustername(String clustername) { - this.clustername = clustername; + public void setClusterName(String clusterName) { + this.clusterName = clusterName; } - public String getPodid() { - return podid; + public String getPodId() { + return podId; } - public void setPodid(String podid) { - this.podid = podid; + public void setPodId(String podId) { + this.podId = podId; } - public String getPodname() { - return podname; + public String getPodName() { + return podName; } - public void setPodname(String podname) { - this.podname = podname; + public void setPodName(String podName) { + this.podName = podName; } } diff --git a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java index 6d34f1780442..c7977356379e 100644 --- a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java @@ -83,10 +83,10 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume) volResponse.setZoneId(volume.getDataCenterUuid()); volResponse.setZoneName(volume.getDataCenterName()); if (view == ResponseView.Full) { - volResponse.setClusterid(volume.getClusterUuid()); - volResponse.setClustername(volume.getClusterName()); - volResponse.setPodid(volume.getPodUuid()); - volResponse.setPodname(volume.getPodName()); + volResponse.setClusterId(volume.getClusterUuid()); + volResponse.setClusterName(volume.getClusterName()); + volResponse.setPodId(volume.getPodUuid()); + volResponse.setPodName(volume.getPodName()); } if (volume.getVolumeType() != null) { From 820c2229f666402d8df2ae291df447e7619ef29c Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 27 Jan 2020 13:36:06 +0530 Subject: [PATCH 4/4] fix getter for cluster metrics resourcedetails Signed-off-by: Rohit Yadav --- .../org/apache/cloudstack/api/response/ClusterResponse.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java index 305a4508cb9d..c27ee3ded6b5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java @@ -215,4 +215,8 @@ public void setResourceDetails(Map details) { resourceDetails.remove("password"); } } + + public Map getResourceDetails() { + return resourceDetails; + } }