refactored events messages to use new resource uuid obtention method

Author: erikbocks

api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java

@@ -108,7 +108,7 @@ public long getEntityOwnerId() {
 
     @Override
     public String getEventDescription() {
-        return  "Disabling Account: " + getAccountName() + " in domain: " + getDomainId();
+        return  "Disabling Account: " + getAccountName() + " in domain: " + getResourceUuid(ApiConstants.DOMAIN_ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java

@@ -91,6 +91,6 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Deleting a counter.";
+        return "Deleting auto scaling counter with ID: " + getResourceUuid(ApiConstants.ID);
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java

@@ -156,6 +156,6 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Importing backup offering: " + name + " (external ID: " + externalId + ") on zone ID " + zoneId ;
+        return "Importing backup offering: " + name + " (external ID: " + externalId + ") on zone with ID: " + getResourceUuid(ApiConstants.ZONE_ID) ;
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java

@@ -149,6 +149,6 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "issuing certificate for domain(s)=" + domains + ", ip(s)=" + addresses;
+        return "Issuing certificate for domain(s)=" + domains + ", ip(s)=" + addresses;
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java

@@ -108,7 +108,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Provisioning certificate for host id=" + hostId + " using provider=" + provider;
+        return "Provisioning certificate for host with ID: " + getResourceUuid(ApiConstants.HOST_ID) + " using provider: " + provider;
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ExecuteClusterDrsPlanCmd.java

@@ -142,6 +142,6 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return String.format("Executing DRS plan for cluster: %d", getId());
+        return String.format("Executing DRS plan for cluster: %d", getResourceUuid(ApiConstants.ID));
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java

@@ -140,7 +140,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Getting diagnostics data files from System VM: " + this._uuidMgr.getUuid(VirtualMachine.class, getId());
+        return "Getting diagnostics data files from System VM with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java

@@ -153,7 +153,7 @@ public ApiCommandResourceType getApiResourceType() {
 
     @Override
     public String getEventDescription() {
-        return "Executing diagnostics on System VM: " + this._uuidMgr.getUuid(VirtualMachine.class, getId());
+        return "Executing diagnostics on System VM with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java

@@ -88,7 +88,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Deleting domain: " + getId();
+        return "Deleting domain with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java

@@ -74,7 +74,7 @@ public void execute() {
 
     @Override
     public String getEventDescription() {
-        return "Removing Guest OS: " + getId();
+        return "Removing Guest OS with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override