Skip to content

Commit 3d9a54c

Browse files
committed
Removal of internal ID in backup event descriptions
1 parent a50de02 commit 3d9a54c

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import javax.inject.Inject;
2121

22+
import com.cloud.vm.VirtualMachine;
2223
import org.apache.cloudstack.acl.RoleType;
2324
import org.apache.cloudstack.api.APICommand;
2425
import org.apache.cloudstack.api.ApiCommandResourceType;
@@ -138,7 +139,8 @@ public String getEventType() {
138139

139140
@Override
140141
public String getEventDescription() {
141-
return "Creating backup for VM " + vmId;
142+
String vmUuid = _uuidMgr.getUuid(VirtualMachine.class, getVmId());
143+
return "Creating backup for VM " + vmUuid;
142144
}
143145

144146
@Override

api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.cloudstack.api.ServerApiException;
2929
import org.apache.cloudstack.api.response.BackupResponse;
3030
import org.apache.cloudstack.api.response.SuccessResponse;
31+
import org.apache.cloudstack.backup.Backup;
3132
import org.apache.cloudstack.backup.BackupManager;
3233
import org.apache.cloudstack.context.CallContext;
3334
import org.apache.commons.lang3.BooleanUtils;
@@ -111,6 +112,7 @@ public String getEventType() {
111112

112113
@Override
113114
public String getEventDescription() {
114-
return "Deleting backup ID " + backupId;
115+
String backupUuid = _uuidMgr.getUuid(Backup.class, getId());
116+
return "Deleting backup ID " + backupUuid;
115117
}
116118
}

api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.cloudstack.api.ServerApiException;
2929
import org.apache.cloudstack.api.response.SuccessResponse;
3030
import org.apache.cloudstack.api.response.BackupResponse;
31+
import org.apache.cloudstack.backup.Backup;
3132
import org.apache.cloudstack.backup.BackupManager;
3233
import org.apache.cloudstack.context.CallContext;
3334

@@ -99,6 +100,7 @@ public String getEventType() {
99100

100101
@Override
101102
public String getEventDescription() {
102-
return "Restoring VM from backup: " + backupId;
103+
String backupUuid = _uuidMgr.getUuid(Backup.class, getBackupId());
104+
return "Restoring VM from backup: " + backupUuid;
103105
}
104106
}

0 commit comments

Comments
 (0)