Update remaining files

Author: vishesh92

api/src/main/java/org/apache/cloudstack/cluster/ClusterDrsAlgorithm.java

@@ -21,6 +21,7 @@
 
 import com.cloud.host.Host;
 import com.cloud.offering.ServiceOffering;
+import com.cloud.org.Cluster;
 import com.cloud.utils.Pair;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.component.Adapter;
@@ -55,8 +56,8 @@ public interface ClusterDrsAlgorithm extends Adapter {
      * @throws ConfigurationException
      *         if there is an error in the configuration
      */
-    boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList,
-            List<Ternary<Long, Long, Long>> memoryList) throws ConfigurationException;
+    boolean needsDrs(Cluster cluster, List<Ternary<Long, Long, Long>> cpuList,
+                     List<Ternary<Long, Long, Long>> memoryList) throws ConfigurationException;
 
 
     /**
@@ -79,7 +80,7 @@ boolean needsDrs(long clusterId, List<Ternary<Long, Long, Long>> cpuList,
      *
      * @return a ternary containing improvement, cost, benefit
      */
-    Ternary<Double, Double, Double> getMetrics(long clusterId, VirtualMachine vm, ServiceOffering serviceOffering,
+    Ternary<Double, Double, Double> getMetrics(Cluster cluster, VirtualMachine vm, ServiceOffering serviceOffering,
             Host destHost, Map<Long, Ternary<Long, Long, Long>> hostCpuMap,
             Map<Long, Ternary<Long, Long, Long>> hostMemoryMap,
             Boolean requiresStorageMotion) throws ConfigurationException;

engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/HypervisorHostListener.java

@@ -19,12 +19,22 @@
 package org.apache.cloudstack.engine.subsystem.api.storage;
 
 import com.cloud.exception.StorageConflictException;
+import com.cloud.host.Host;
+import com.cloud.storage.StoragePool;
 
 public interface HypervisorHostListener {
     boolean hostAdded(long hostId);
 
+    default boolean hostConnect(Host host, StoragePool pool) throws StorageConflictException {
+        return hostConnect(host.getId(), pool.getId());
+    }
+
     boolean hostConnect(long hostId, long poolId) throws StorageConflictException;
 
+    default boolean hostDisconnected(Host host, StoragePool pool) throws StorageConflictException {
+        return hostDisconnected(host.getId(), pool.getId());
+    }
+
     boolean hostDisconnected(long hostId, long poolId);
 
     boolean hostAboutToBeRemoved(long hostId);

engine/components-api/src/main/java/com/cloud/storage/StorageManager.java

@@ -367,7 +367,7 @@ static Boolean getFullCloneConfiguration(Long storeId) {
 
     boolean connectHostToSharedPool(Host host, long poolId) throws StorageUnavailableException, StorageConflictException;
 
-    void disconnectHostFromSharedPool(long hostId, long poolId) throws StorageUnavailableException, StorageConflictException;
+    void disconnectHostFromSharedPool(Host host, StoragePool pool) throws StorageUnavailableException, StorageConflictException;
 
     void enableHost(long hostId) throws StorageUnavailableException, StorageConflictException;
 

engine/schema/src/main/java/com/cloud/vm/snapshot/VMSnapshotVO.java

@@ -36,6 +36,7 @@
 import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotOptions;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 @Entity
 @Table(name = "vm_snapshots")
@@ -145,6 +146,13 @@ public VMSnapshotVO(Long accountId, Long domainId, Long vmId, String description
         this.serviceOfferingId = serviceOfferingId;
     }
 
+    @Override
+    public String toString() {
+        return String.format("VMSnapshot %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "name", "vmId"));
+    }
+
     @Override
     public String getDescription() {
         return description;

engine/schema/src/main/java/org/apache/cloudstack/cluster/ClusterDrsPlanMigrationVO.java

@@ -20,6 +20,7 @@
 package org.apache.cloudstack.cluster;
 
 import org.apache.cloudstack.jobs.JobInfo;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -66,6 +67,13 @@ protected ClusterDrsPlanMigrationVO() {
 
     }
 
+    @Override
+    public String toString() {
+        return String.format("ClusterDrsPlanMigration %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "planId", "vmId", "jobId"));
+    }
+
     public long getId() {
         return id;
     }

engine/schema/src/main/java/org/apache/cloudstack/cluster/ClusterDrsPlanVO.java

@@ -20,6 +20,7 @@
 package org.apache.cloudstack.cluster;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -68,6 +69,13 @@ protected ClusterDrsPlanVO() {
         uuid = UUID.randomUUID().toString();
     }
 
+    @Override
+    public String toString() {
+        return String.format("ClusterDrsPlan %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "clusterId"));
+    }
+
     public long getId() {
         return id;
     }

engine/schema/src/main/java/org/apache/cloudstack/network/BgpPeerVO.java

@@ -28,6 +28,7 @@
 import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 @Entity
 @Table(name = "bgp_peers")
@@ -83,7 +84,9 @@ public BgpPeerVO(long dcId, String ip4Address, String ip6Address, Long asNumber,
 
     @Override
     public String toString() {
-        return String.format("BgpPeerVO [%s|%s|%s]", asNumber, ip4Address, ip6Address);
+        return String.format("BgpPeer %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "asNumber", "ip4Address", "ip6Address"));
     }
 
     @Override

engine/schema/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFSVO.java

@@ -23,6 +23,7 @@
 import java.util.UUID;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -120,6 +121,13 @@ public SharedFSVO(String name, String description, long domainId, long accountId
         this.uuid = UUID.randomUUID().toString();
     }
 
+    @Override
+    public String toString() {
+        return String.format("SharedFS %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "name", "uuid"));
+    }
+
     @Override
     public Class<?> getEntityType() {
         return SharedFS.class;

engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleVO.java

@@ -19,6 +19,7 @@
 package org.apache.cloudstack.vm.schedule;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -95,6 +96,11 @@ public VMScheduleVO(long vmId, String description, String schedule, String timeZ
         this.enabled = enabled;
     }
 
+    @Override
+    public String toString() {
+        return String.format("VMSchedule %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "id", "uuid", "action", "description"));
+    }
+
     @Override
     public String getUuid() {
         return uuid;

engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJobVO.java

@@ -18,6 +18,8 @@
  */
 package org.apache.cloudstack.vm.schedule;
 
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -71,6 +73,14 @@ public VMScheduledJobVO(long vmId, long vmScheduleId, VMSchedule.Action action,
         this.scheduledTime = scheduledTime;
     }
 
+
+    @Override
+    public String toString() {
+        return String.format("VMScheduledJob %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "action", "vmScheduleId", "vmId"));
+    }
+
     @Override
     public String getUuid() {
         return uuid;