Remove "VM" on logs as vm.toString() already appends VM-<details>

Author: GabrielBrascher

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -4486,15 +4486,15 @@ private void orchestrateMigrateForScale(final String vmUuid, final long srcHostI
                     throw new CloudRuntimeException("Unable to complete migration for " + vm);
                 }
             } catch (final OperationTimedoutException e) {
-                s_logger.debug(String.format("Error while checking the vm %s on %s", vm, dstHost), e);
+                s_logger.debug(String.format("Error while checking the %s on %s", vm, dstHost), e);
             }
 
             migrated = true;
         } finally {
             if (!migrated) {
                 s_logger.info("Migration was unsuccessful.  Cleaning up: " + vm);
 
-                String alertSubject = String.format("Unable to migrate VM [%s] from %s in Zone [%s] and Pod [%s].",
+                String alertSubject = String.format("Unable to migrate %s from %s in Zone [%s] and Pod [%s].",
                         vm.getInstanceName(), fromHost, dest.getDataCenter().getName(), dest.getPod().getName());
                 String alertBody = "Migrate Command failed. Please check logs.";
                 _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(), alertSubject, alertBody);

engine/schema/src/main/java/com/cloud/dc/ClusterVO.java

@@ -199,6 +199,6 @@ public PartitionType partitionType() {
 
     @Override
     public String toString() {
-        return String.format("Cluster [{id: \"%s\", name: \"%s\", uuid: \"%s\"}]", id, name, uuid);
+        return String.format("Cluster {id: \"%s\", name: \"%s\", uuid: \"%s\"}", id, name, uuid);
     }
 }

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

@@ -1539,7 +1539,7 @@ protected boolean attemptMaintain(HostVO host) throws NoTransitionException {
         boolean hasPendingMigrationRetries = false;
         for (VMInstanceVO vmInstanceVO : allVmsOnHost) {
             if (_haMgr.hasPendingMigrationsWork(vmInstanceVO.getId())) {
-                s_logger.info(String.format("Attempting maintenance for %s found pending migration for VM %s.", host, vmInstanceVO));
+                s_logger.info(String.format("Attempting maintenance for %s found pending migration for %s.", host, vmInstanceVO));
                 hasPendingMigrationRetries = true;
                 break;
             }
@@ -2501,16 +2501,16 @@ public void deleteRoutingHost(final HostVO host, final boolean isForced, final b
                     }
                     for (final VMInstanceVO vm : vms) {
                         if ((! HighAvailabilityManager.ForceHA.value() && !vm.isHaEnabled()) || vm.getState() == State.Stopping) {
-                            s_logger.debug(String.format("Stopping VM: %s as a part of hostDelete: %s",vm, host));
+                            s_logger.debug(String.format("Stopping %s as a part of hostDelete for %s",vm, host));
                             try {
                                 _haMgr.scheduleStop(vm, host.getId(), WorkType.Stop);
                             } catch (final Exception e) {
-                                final String errorMsg = String.format("There was an error stopping the VM: %s as a part of hostDelete: %s", vm, host);
+                                final String errorMsg = String.format("There was an error stopping the %s as a part of hostDelete for %s", vm, host);
                                 s_logger.debug(errorMsg, e);
                                 throw new UnableDeleteHostException(errorMsg + "," + e.getMessage());
                             }
                         } else if ((HighAvailabilityManager.ForceHA.value() || vm.isHaEnabled()) && (vm.getState() == State.Running || vm.getState() == State.Starting)) {
-                            s_logger.debug(String.format("Scheduling restart for VM: %s, state: %s on host: %s.", vm, vm.getState(), host));
+                            s_logger.debug(String.format("Scheduling restart for %s, state: %s on host: %s.", vm, vm.getState(), host));
                             _haMgr.scheduleRestart(vm, false);
                         }
                     }

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -5255,7 +5255,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                     }
                 });
             } catch (Exception e) {
-                s_logger.warn(String.format("Unable to update VM disk statistics for vm %s from %s", userVm.getInstanceName(), host), e);
+                s_logger.warn(String.format("Unable to update VM disk statistics for %s from %s", userVm.getInstanceName(), host), e);
             }
         }
     }