Replace ids with objects or uuids

Author: vishesh92

core/src/main/java/com/cloud/agent/api/StartupAnswer.java

@@ -22,14 +22,16 @@
 public class StartupAnswer extends Answer {
     long hostId;
     String hostName;
+    String hostUuid;
     int pingInterval;
 
     protected StartupAnswer() {
     }
 
-    public StartupAnswer(StartupCommand cmd, long hostId, String hostName, int pingInterval) {
+    public StartupAnswer(StartupCommand cmd, long hostId, String hostUuid, String hostName, int pingInterval) {
         super(cmd);
         this.hostId = hostId;
+        this.hostUuid = hostUuid;
         this.hostName = hostName;
         this.pingInterval = pingInterval;
     }
@@ -42,6 +44,10 @@ public long getHostId() {
         return hostId;
     }
 
+    public String getHostUuid() {
+        return hostUuid;
+    }
+
     public String getHostName() {
         return hostName;
     }

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

@@ -24,6 +24,8 @@
 public interface EndPoint {
     long getId();
 
+    String getUuid();
+
     String getHostAddr();
 
     String getPublicAddr();

engine/components-api/src/main/java/com/cloud/agent/Listener.java

@@ -43,6 +43,10 @@ public interface Listener {
      */
     boolean processAnswers(long agentId, long seq, Answer[] answers);
 
+    default boolean processAnswers(long agentId, String uuid, String name, long seq, Answer[] answers) {
+        return processAnswers(agentId, seq, answers);
+    }
+
     /**
      * This method is called by the AgentManager when an agent sent
      * a command to the server.  In order to process these commands,
@@ -92,6 +96,10 @@ public interface Listener {
      */
     boolean processDisconnect(long agentId, Status state);
 
+    default boolean processDisconnect(long agentId, String uuid, String name, Status state) {
+        return processDisconnect(agentId, state);
+    }
+
     /**
      * This method is called by AgentManager when a host is about to be removed from a cluster.
      * @param long the ID of the host that's about to be removed

engine/components-api/src/main/java/com/cloud/capacity/CapacityManager.java

@@ -128,7 +128,7 @@ public interface CapacityManager {
      * @param ram required RAM
      * @param cpuOverprovisioningFactor factor to apply to the actual host cpu
      */
-    boolean checkIfHostHasCapacity(long hostId, Integer cpu, long ram, boolean checkFromReservedCapacity, float cpuOverprovisioningFactor, float memoryOvercommitRatio,
+    boolean checkIfHostHasCapacity(Host host, Integer cpu, long ram, boolean checkFromReservedCapacity, float cpuOverprovisioningFactor, float memoryOvercommitRatio,
         boolean considerReservedCapacity);
 
     void updateCapacityForHost(Host host);

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

@@ -360,7 +360,7 @@ static Boolean getFullCloneConfiguration(Long storeId) {
 
     String getStoragePoolMountFailureReason(String error);
 
-    boolean connectHostToSharedPool(long hostId, long poolId) throws StorageUnavailableException, StorageConflictException;
+    boolean connectHostToSharedPool(Host host, long poolId) throws StorageUnavailableException, StorageConflictException;
 
     void disconnectHostFromSharedPool(long hostId, long poolId) throws StorageUnavailableException, StorageConflictException;
 

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java

@@ -110,6 +110,7 @@ public int compare(final Object o1, final Object o2) {
     protected static String LOG_SEQ_FORMATTED_STRING;
 
     protected final long _id;
+    protected String _uuid;
     protected String _name = null;
     protected final ConcurrentHashMap<Long, Listener> _waitForList;
     protected final LinkedList<Request> _requests;
@@ -133,8 +134,9 @@ public int compare(final Object o1, final Object o2) {
         Arrays.sort(s_commandsNotAllowedInConnectingMode);
     }
 
-    protected AgentAttache(final AgentManagerImpl agentMgr, final long id, final String name, final boolean maintenance) {
+    protected AgentAttache(final AgentManagerImpl agentMgr, final long id, final String uuid, final String name, final boolean maintenance) {
         _id = id;
+        _uuid = uuid;
         _name = name;
         _waitForList = new ConcurrentHashMap<Long, Listener>();
         _currentSequence = null;
@@ -145,6 +147,15 @@ protected AgentAttache(final AgentManagerImpl agentMgr, final long id, final Str
         LOG_SEQ_FORMATTED_STRING = String.format("Seq %d-{}: {}", _id);
     }
 
+    @Override
+    public String toString() {
+        return "AgentAttache{" +
+                "id=" + _id +
+                ", uuid='" + _uuid + '\'' +
+                ", name='" + _name + '\'' +
+                '}';
+    }
+
     public synchronized long getNextSequence() {
         return ++_nextSequence;
     }
@@ -206,7 +217,7 @@ protected synchronized void cancel(final long seq) {
         logger.debug(LOG_SEQ_FORMATTED_STRING, seq, "Cancelling.");
         final Listener listener = _waitForList.remove(seq);
         if (listener != null) {
-            listener.processDisconnect(_id, Status.Disconnected);
+            listener.processDisconnect(_id, _uuid, _name, Status.Disconnected);
         }
         int index = findRequest(seq);
         if (index >= 0) {
@@ -243,6 +254,10 @@ public long getId() {
         return _id;
     }
 
+    public String getUuid() {
+        return _uuid;
+    }
+
     public String getName() {
         return _name;
     }
@@ -316,7 +331,7 @@ protected void cancelAllCommands(final Status state, final boolean cancelActive)
                 it.remove();
                 final Listener monitor = entry.getValue();
                 logger.debug(LOG_SEQ_FORMATTED_STRING, entry.getKey(), "Sending disconnect to " + monitor.getClass());
-                monitor.processDisconnect(_id, state);
+                monitor.processDisconnect(_id,  _uuid, _name, state);
             }
         }
     }