Create new generic method for resource UUID obtention in event's descriptions

api/src/main/java/org/apache/cloudstack/api/BaseCmd.java

@@ -32,6 +32,7 @@
 import javax.inject.Inject;
 
 import com.cloud.bgp.BGPService;
+import com.cloud.utils.UuidUtils;
 import org.apache.cloudstack.acl.ProjectRoleService;
 import org.apache.cloudstack.acl.RoleService;
 import org.apache.cloudstack.acl.RoleType;
@@ -498,4 +499,14 @@ public Map<String, String> convertExternalDetailsToMap(Map externalDetails) {
         }
         return details;
     }
+
+    public String getResourceUuid(String parameterName) {
+        String resourceUuid = CallContext.current().getApiResourceUuid(parameterName);
+
+        if (resourceUuid != null && UuidUtils.isUuid(resourceUuid)) {
+            return resourceUuid;
+        }
+
+        return null;
+    }
 }

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

@@ -108,7 +108,15 @@ public long getEntityOwnerId() {
 
     @Override
     public String getEventDescription() {
-        return  "Disabling Account: " + getAccountName() + " in domain: " + getDomainId();
+        String message = "Disabling Account ";
+
+        if (getId() != null) {
+            message += "with ID: " + getResourceUuid(ApiConstants.ID);
+        } else {
+            message += getAccountName() + " in Domain: " + getResourceUuid(ApiConstants.DOMAIN_ID);
+        }
+
+        return message;
     }
 
     @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 "Executing DRS plan for cluster with ID: " + 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 Instance 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 Instance 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

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

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

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

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

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

@@ -86,7 +86,7 @@ public long getEntityOwnerId() {
 
     @Override
     public String getEventDescription() {
-        return "Updating Guest OS Mapping: " + getId();
+        return "Updating Guest OS with ID: " + getResourceUuid(ApiConstants.ID) + " mapping.";
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java

@@ -115,6 +115,6 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Configure HA for host: " + getHostId();
+        return "Configuring HA for host with ID: " + getResourceUuid(ApiConstants.HOST_ID);
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java

@@ -102,7 +102,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Disable HA for cluster: " + getClusterId();
+        return "Disabling HA for cluster with ID: " + getResourceUuid(ApiConstants.CLUSTER_ID);
     }
 
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java

@@ -104,6 +104,6 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Disable HA for host: " + getHostId();
+        return "Disabling HA for host with ID: " + getResourceUuid(ApiConstants.HOST_ID);
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java

@@ -103,7 +103,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Disable HA for zone: " + getZoneId();
+        return "Disabling HA for zone with ID: " + getResourceUuid(ApiConstants.ZONE_ID);
     }
 
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java

@@ -103,6 +103,6 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Enable HA for cluster: " + getClusterId();
+        return "Enabling HA for cluster with ID: " + getResourceUuid(ApiConstants.CLUSTER_ID);
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java

@@ -104,6 +104,6 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Enable HA for host: " + getHostId();
+        return "Enabling HA for host with ID: " + getResourceUuid(ApiConstants.HOST_ID);
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java

@@ -103,7 +103,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Enable HA for zone: " + getZoneId();
+        return "Enabling HA for zone with ID: " + getResourceUuid(ApiConstants.ZONE_ID);
     }
 
 }

api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java

@@ -78,7 +78,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "declaring host: " + getId() + " as Degraded";
+        return "Removing host with ID: " + getResourceUuid(ApiConstants.ID) + " from Degraded state.";
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostMaintenanceCmd.java

@@ -76,7 +76,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Canceling maintenance for host: " + getId();
+        return "Canceling maintenance for host with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java

@@ -78,7 +78,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "declaring host: " + getId() + " as Degraded";
+        return "Declaring host with ID: " + getResourceUuid(ApiConstants.ID) + " as Degraded.";
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForHostMaintenanceCmd.java

@@ -76,7 +76,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "preparing host: " + getId() + " for maintenance";
+        return "Preparing host with ID: " + getResourceUuid(ApiConstants.ID) + " for maintenance.";
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java

@@ -77,7 +77,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "reconnecting host: " + getId();
+        return "Reconnecting host with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java

@@ -72,7 +72,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "releasing reservation for host: " + getId();
+        return "Releasing reservation from host with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java

@@ -84,7 +84,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "configuring internal load balancer element: " + id;
+        return "Configuring internal load balancer element with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java

@@ -88,7 +88,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "starting Internal LB Instance: " + getId();
+        return "Starting internal LB Instance with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java

@@ -86,7 +86,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Stopping Internal LB Instance: " + getId();
+        return "Stopping Internal LB Instance: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java

@@ -83,7 +83,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Creating guest IPv6 prefix " + getPrefix() + " for zone=" + getZoneId();
+        return "Creating guest IPv6 prefix " + getPrefix() + " for zone with ID: " + getResourceUuid(ApiConstants.ZONE_ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForGuestNetworkCmd.java

@@ -85,7 +85,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Creating guest IPv4 subnet " + getSubnet() + " in zone subnet=" + getParentId();
+        return "Creating guest IPv4 subnet " + getSubnet() + " in zone subnet: " + getResourceUuid(ApiConstants.PARENT_ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForZoneCmd.java

@@ -102,7 +102,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Creating guest IPv4 subnet " + getSubnet() + " for zone=" + getZoneId();
+        return "Creating guest IPv4 subnet " + getSubnet() + " for zone: " + getResourceUuid(ApiConstants.ZONE_ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java

@@ -132,7 +132,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Creating management ip range from " + getStartIp() + " to " + getEndIp() + " and gateway=" + getGateWay() + ", netmask=" + getNetmask() + " of pod=" + getPodId();
+        return "Creating management IP range from " + getStartIp() + " to " + getEndIp() + ", with gateway: " + getGateWay() + ", netmask:" + getNetmask() + " on pod:" + getPodId();
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateIpv4SubnetForZoneCmd.java

@@ -82,7 +82,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Dedicating zone IPv4 subnet " + getId();
+        return "Dedicating zone's IPv4 subnet with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java

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

api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForGuestNetworkCmd.java

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

api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForZoneCmd.java

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

api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java

@@ -100,7 +100,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Deleting management ip range from " + getStartIp() + " to " + getEndIp() + " of Pod: " + getPodId();
+        return "Deleting management IP range from " + getStartIp() + " to " + getEndIp() + " from Pod: " + getResourceUuid(ApiConstants.POD_ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java

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

api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java

@@ -77,7 +77,7 @@ public void execute() {
 
     @Override
     public String getEventDescription() {
-        return "Deleting Physical network: " + getId();
+        return "Deleting Physical network with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java

@@ -64,7 +64,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Deleting storage ip range " + getId();
+        return "Deleting storage IP range with ID: " + getResourceUuid(ApiConstants.ID);
     }
 
     @Override