Merge remote-tracking branch 'origin/4.13'

Author: rohityadavcloud

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

@@ -154,9 +154,9 @@ public class SystemVmResponse extends BaseResponse {
     @Param(description = "public vlan range")
     private List<String> publicVlan;
 
-    @SerializedName("lastpinged")
-    @Param(description = "the date and time the host was last pinged", since = "4.13.1")
-    private Date lastPinged;
+    @SerializedName("disconnected")
+    @Param(description = "the last disconnected date of host", since = "4.13.1")
+    private Date disconnectedOn;
 
     @SerializedName("version")
     @Param(description = "the systemvm agent version", since = "4.13.1")
@@ -403,12 +403,12 @@ public void setPublicVlan(List<String> publicVlan) {
         this.publicVlan = publicVlan;
     }
 
-    public Date getLastPinged() {
-        return lastPinged;
+    public Date getDisconnectedOn() {
+        return disconnectedOn;
     }
 
-    public void setLastPinged(Date lastPinged) {
-        this.lastPinged = lastPinged;
+    public void setDisconnectedOn(Date disconnectedOn) {
+        this.disconnectedOn = disconnectedOn;
     }
 
     public String getVersion() {

server/src/main/java/com/cloud/api/ApiDBUtils.java

@@ -1039,6 +1039,10 @@ public static HostVO findHostById(Long hostId) {
         return s_hostDao.findByIdIncludingRemoved(hostId);
     }
 
+    public static HostVO findHostByTypeNameAndZoneId(Long zoneId, String name, Host.Type type) {
+        return s_hostDao.findByTypeNameAndZoneId(zoneId, name, type);
+    }
+
     public static IPAddressVO findIpAddressById(long addressId) {
         return s_ipAddressDao.findById(addressId);
     }

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -1378,9 +1378,16 @@ public SystemVmResponse createSystemVmResponse(VirtualMachine vm) {
                     vmResponse.setHostId(host.getUuid());
                     vmResponse.setHostName(host.getName());
                     vmResponse.setHypervisor(host.getHypervisorType().toString());
-                    vmResponse.setAgentState(host.getStatus());
-                    vmResponse.setLastPinged(new Date(host.getLastPinged()));
-                    vmResponse.setVersion(host.getVersion());
+                }
+            }
+
+            if (vm.getType() == Type.SecondaryStorageVm || vm.getType() == Type.ConsoleProxy) {
+                Host systemVmHost = ApiDBUtils.findHostByTypeNameAndZoneId(vm.getDataCenterId(), vm.getHostName(),
+                        Type.SecondaryStorageVm.equals(vm.getType()) ? Host.Type.SecondaryStorageVM : Host.Type.ConsoleProxy);
+                if (systemVmHost != null) {
+                    vmResponse.setAgentState(systemVmHost.getStatus());
+                    vmResponse.setDisconnectedOn(systemVmHost.getDisconnectedOn());
+                    vmResponse.setVersion(systemVmHost.getVersion());
                 }
             }