Returning mshost uuid rather than msid in list hosts response

Author: davidjumani

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

@@ -166,7 +166,7 @@ public class HostResponse extends BaseResponse {
 
     @SerializedName("managementserverid")
     @Param(description = "the management server ID of the host")
-    private Long managementServerId;
+    private String managementServerId;
 
     @SerializedName("clusterid")
     @Param(description = "the cluster ID of the host")
@@ -381,7 +381,7 @@ public void setLastPinged(Date lastPinged) {
         this.lastPinged = lastPinged;
     }
 
-    public void setManagementServerId(Long managementServerId) {
+    public void setManagementServerId(String managementServerId) {
         this.managementServerId = managementServerId;
     }
 
@@ -633,7 +633,7 @@ public Date getLastPinged() {
         return lastPinged;
     }
 
-    public Long getManagementServerId() {
+    public String getManagementServerId() {
         return managementServerId;
     }
 

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

@@ -39,6 +39,8 @@
 
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.query.vo.HostJoinVO;
+import com.cloud.cluster.ManagementServerHostVO;
+import com.cloud.cluster.dao.ManagementServerHostDao;
 import com.cloud.gpu.HostGpuGroupsVO;
 import com.cloud.gpu.VGPUTypesVO;
 import com.cloud.host.Host;
@@ -65,6 +67,8 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
     private HAConfigDao haConfigDao;
     @Inject
     private OutOfBandManagementDao outOfBandManagementDao;
+    @Inject
+    private ManagementServerHostDao managementServerHostDao;
 
     private final SearchBuilder<HostJoinVO> hostSearch;
 
@@ -103,7 +107,13 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail
         hostResponse.setHypervisor(host.getHypervisorType());
         hostResponse.setHostType(host.getType());
         hostResponse.setLastPinged(new Date(host.getLastPinged()));
-        hostResponse.setManagementServerId(host.getManagementServerId());
+        Long mshostId = host.getManagementServerId();
+        if (mshostId != null) {
+            ManagementServerHostVO managementServer = managementServerHostDao.findByMsid(host.getManagementServerId());
+            if (managementServer != null) {
+                hostResponse.setManagementServerId(managementServer.getUuid());
+            }
+        }
         hostResponse.setName(host.getName());
         hostResponse.setPodId(host.getPodUuid());
         hostResponse.setRemoved(host.getRemoved());