Removal of internal ID in backup event descriptions (#12197)
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
index 2d0cde6..df417ef 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
@@ -19,6 +19,7 @@
import javax.inject.Inject;
+import com.cloud.vm.VirtualMachine;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandResourceType;
@@ -138,7 +139,8 @@
@Override
public String getEventDescription() {
- return "Creating backup for Instance " + vmId;
+ String vmUuid = _uuidMgr.getUuid(VirtualMachine.class, getVmId());
+ return "Creating backup for Instance " + vmUuid;
}
@Override
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java
index 369934a..8c32dac 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.BackupResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.backup.Backup;
import org.apache.cloudstack.backup.BackupManager;
import org.apache.cloudstack.context.CallContext;
import org.apache.commons.lang3.BooleanUtils;
@@ -111,6 +112,7 @@
@Override
public String getEventDescription() {
- return "Deleting backup ID " + backupId;
+ String backupUuid = _uuidMgr.getUuid(Backup.class, getId());
+ return "Deleting backup ID " + backupUuid;
}
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java
index 5385c0f..3d096c0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.backup.Backup;
import org.apache.cloudstack.backup.BackupManager;
import org.apache.cloudstack.context.CallContext;
@@ -99,6 +100,7 @@
@Override
public String getEventDescription() {
- return "Restoring Instance from backup: " + backupId;
+ String backupUuid = _uuidMgr.getUuid(Backup.class, getBackupId());
+ return "Restoring Instance from backup: " + backupUuid;
}
}