fixup

Author: vishesh92

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

@@ -116,7 +116,7 @@ public void process(Answer[] answers) {
             StartupAnswer startup = (StartupAnswer)answers[0];
             int interval = startup.getPingInterval();
             logger.info(
-                    "StartupAnswer received [id: {} name: {} Interval: {}]",
+                    "StartupAnswer received [id: {} name: {} interval: {}]",
                     startup.getHostId(), startup.getHostName(), interval);
             _futures.add(_agentMgr.getCronJobPool().scheduleAtFixedRate(new PingTask(), interval, interval, TimeUnit.SECONDS));
         }

engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java

@@ -599,7 +599,7 @@ public boolean isFollowRedirects() {
 
     @Override
     public String toString() {
-        return "VolumeObject{" +
+        return "TemplateObject{" +
                 "templateVO=" + getImage() +
                 ", dataStore=" + getDataStore() +
                 '}';

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java

@@ -469,7 +469,7 @@ public Class<?> getEntityType() {
 
     @Override
     public String toString() {
-        return "VolumeObject{" +
+        return "SnapshotObject{" +
                 "snapshotVO=" + getSnapshotVO() +
                 ", dataStore=" + getDataStore() +
                 '}';

engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java

@@ -149,7 +149,7 @@ public boolean hostConnect(long hostId, long poolId) throws StorageConflictExcep
         }
 
         assert (answer instanceof ModifyStoragePoolAnswer) : String.format(
-                "Well, now why won't you actually return the ModifyStoragePoolAnswer when it's ModifyStoragePoolCommand? Pool=%sHost=%d", pool, hostId);
+                "Well, now why won't you actually return the ModifyStoragePoolAnswer when it's ModifyStoragePoolCommand? Pool=%s Host=%d", pool, hostId);
         ModifyStoragePoolAnswer mspAnswer = (ModifyStoragePoolAnswer) answer;
         if (mspAnswer.getLocalDatastoreName() != null && pool.isShared()) {
             String datastoreName = mspAnswer.getLocalDatastoreName();

plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHostActivityChecker.java

@@ -155,7 +155,7 @@ private boolean isVMActivityOnHost(Host agent, DateTime suspectTime) throws HACh
         for (StoragePool pool : poolVolMap.keySet()) {
             activityStatus = verifyActivityOfStorageOnHost(poolVolMap, pool, agent, suspectTime, activityStatus);
             if (!activityStatus) {
-                logger.warn("It seems that the storage pool [{}] does not have activity on {}.", pool, agent.toString());
+                logger.warn("It seems that the storage pool [{}] does not have activity on {}.", pool, agent);
                 break;
             }
         }
@@ -180,7 +180,7 @@ protected boolean verifyActivityOfStorageOnHost(HashMap<StoragePool, List<Volume
                 throw new IllegalStateException(message);
             }
         } catch (StorageUnavailableException e){
-            String message = String.format("Storage [%s] is unavailable to do the check, probably the %s is not reachable.", pool, agent.toString());
+            String message = String.format("Storage [%s] is unavailable to do the check, probably the %s is not reachable.", pool, agent);
             logger.warn(message, e);
             throw new HACheckerException(message, e);
         }

plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java

@@ -266,10 +266,7 @@ public void deleteAsync(DataStore dataStore, DataObject data, AsyncCompletionCal
 
     @Override
     public void copyAsync(DataObject srcdata, DataObject destData, AsyncCompletionCallback<CopyCommandResult> callback) {
-        logger.debug(
-                "Copying volume [id: {}, uuid: {}, type:{}] to [id: {} uuid: {}, type: {}]",
-                srcdata.getId(), srcdata.getUuid(), srcdata.getType(),
-                destData.getId(), destData.getUuid(), destData.getType());
+        logger.debug("Copying volume [{}] to [{}]", srcdata, destData);
         boolean encryptionRequired = anyVolumeRequiresEncryption(srcdata, destData);
         DataStore store = destData.getDataStore();
         if (store.getRole() == DataStoreRole.Primary) {

plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriverTest.java

@@ -500,7 +500,6 @@ public void deleteSourceVolumeFailureScenarioWhenNoSDCisFound() {
         String srcVolumePath = "bec0ba7700000007:vol-11-6aef-10ee";
 
         DataStore srcStore = Mockito.mock(DataStore.class);
-        when(srcStore.getId()).thenReturn(1L);
         DataTO volumeTO = Mockito.mock(DataTO.class);
         when(srcData.getDataStore()).thenReturn(srcStore);
         when(srcData.getTO()).thenReturn(volumeTO);