Arik Hadas has uploaded a new change for review. Change subject: core: rename MigrateVmCommand#getVdsDestination ......................................................................
core: rename MigrateVmCommand#getVdsDestination MigrateVmCommand#getVdsDestination used to return the name of the destination VDS for audit log messages. Its name was confusing as we already have method called getDestinationVds in MigrateVmCommand and it didn't reflect the purpose of this method well. Thus it is renamed to getDestinationVdsName. Change-Id: Iab5e534d298bd99bb6b2692d58c378effae3760f Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/24159/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java index 2bd37b5..2af93be 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java @@ -52,7 +52,7 @@ /** * this property is used for audit log events */ - public String getVdsDestination() { + public final String getDestinationVdsName() { return getDestinationVds() != null ? getDestinationVds().getName() : null; } diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index 08195f2..7188afc 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -222,16 +222,16 @@ VM_DOWN=VM ${VmName} is down. ${ExitMessage} USER_SUSPEND_VM_OK=VM ${VmName} on Host ${VdsName} is suspended. VM_FAILURE=VM ${VmName} cannot be found on Host ${VdsName}. -VM_MIGRATION_ABORT=Migration failed: ${MigrationError} (VM: ${VmName}, Source: ${VdsName}, Destination: ${VdsDestination}). -VM_MIGRATION_DONE=Migration completed (VM: ${VmName}, Source: ${VdsName}, Destination: ${VdsDestination}, Duration: ${Duration} sec). -VM_MIGRATION_FAILED=Migration failed${DueToMigrationError} (VM: ${VmName}, Source: ${VdsName}, Destination: ${VdsDestination}). +VM_MIGRATION_ABORT=Migration failed: ${MigrationError} (VM: ${VmName}, Source: ${VdsName}, Destination: ${DestinationVdsName}). +VM_MIGRATION_DONE=Migration completed (VM: ${VmName}, Source: ${VdsName}, Destination: ${DestinationVdsName}, Duration: ${Duration} sec). +VM_MIGRATION_FAILED=Migration failed${DueToMigrationError} (VM: ${VmName}, Source: ${VdsName}, Destination: ${DestinationVdsName}). VM_MIGRATION_FAILED_NO_VDS_TO_RUN_ON=Migration failed, No available host found (VM: ${VmName}, Source: ${VdsName}). -VM_MIGRATION_FAILED_DURING_MOVE_TO_MAINTENANCE=Migration failed${DueToMigrationError} while Host is in 'preparing for maintenance' state.\n Consider manual intervention\: stopping/migrating Vms as Host's state will not\n turn to maintenance while VMs are still running on it.(VM: ${VmName}, Source: ${VdsName}, Destination: ${VdsDestination}). +VM_MIGRATION_FAILED_DURING_MOVE_TO_MAINTENANCE=Migration failed${DueToMigrationError} while Host is in 'preparing for maintenance' state.\n Consider manual intervention\: stopping/migrating Vms as Host's state will not\n turn to maintenance while VMs are still running on it.(VM: ${VmName}, Source: ${VdsName}, Destination: ${DestinationVdsName}). VM_SET_TO_UNKNOWN_STATUS=VM ${VmName} was set to the Unknown status. -VM_MIGRATION_FAILED_FROM_TO=Migration failed${DueToMigrationError} (VM: ${VmName}, Source: ${VdsName}, Destination: ${VdsDestination}). -VM_MIGRATION_START=Migration started (VM: ${VmName}, Source: ${VdsName}, Destination: ${VdsDestination}, User: ${UserName}). -VM_MIGRATION_START_SYSTEM_INITIATED=Migration initiated by system (VM: ${VmName}, Source: ${VdsName}, Destination: ${VdsDestination}). -VM_MIGRATION_TRYING_RERUN=Migration failed${DueToMigrationError}. Trying to migrate to another Host (VM: ${VmName}, Source: ${VdsName}, Destination: ${VdsDestination}). +VM_MIGRATION_FAILED_FROM_TO=Migration failed${DueToMigrationError} (VM: ${VmName}, Source: ${VdsName}, Destination: ${DestinationVdsName}). +VM_MIGRATION_START=Migration started (VM: ${VmName}, Source: ${VdsName}, Destination: ${DestinationVdsName}, User: ${UserName}). +VM_MIGRATION_START_SYSTEM_INITIATED=Migration initiated by system (VM: ${VmName}, Source: ${VdsName}, Destination: ${DestinationVdsName}). +VM_MIGRATION_TRYING_RERUN=Migration failed${DueToMigrationError}. Trying to migrate to another Host (VM: ${VmName}, Source: ${VdsName}, Destination: ${DestinationVdsName}). VM_CANCEL_MIGRATION=Migration cancelled (VM: ${VmName}, Source: ${VdsName}, User: ${UserName}). VM_CANCEL_MIGRATION_FAILED=Failed to cancel migration for VM: ${VmName} VM_STATUS_RESTORED=VM ${VmName} status was restored to ${VmStatus}. -- To view, visit http://gerrit.ovirt.org/24159 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab5e534d298bd99bb6b2692d58c378effae3760f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
