Tomas Jelinek has uploaded a new change for review. Change subject: core: better illegal VM status message ......................................................................
core: better illegal VM status message Enriched the "The VM status is illegal" message to contain also the localized version of the status which is illegal. Change-Id: Iea6840e555aeb0c7a33a3b90e72fef23433e2be1 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1000068 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/LocalizedVmStatus.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 15 files changed, 193 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/19211/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java index 8a79a65..c918356 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java @@ -8,6 +8,7 @@ import org.ovirt.engine.core.bll.storage.IStorageHelper; import org.ovirt.engine.core.bll.storage.StorageHelperBase; import org.ovirt.engine.core.bll.storage.StorageHelperDirector; +import org.ovirt.engine.core.bll.validator.LocalizedVmStatus; import org.ovirt.engine.core.bll.validator.VmValidator; import org.ovirt.engine.core.common.action.VmDiskOperationParameterBase; import org.ovirt.engine.core.common.businessentities.Disk; @@ -142,8 +143,7 @@ protected boolean isVmInUpPausedDownStatus() { if (getVm().getStatus() != VMStatus.Up && getVm().getStatus() != VMStatus.Down && getVm().getStatus() != VMStatus.Paused) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL); - return false; + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, LocalizedVmStatus.byVmStatus(getVm().getStatus())); } return true; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java index 574213f..4076c6c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java @@ -3,6 +3,7 @@ import java.io.File; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.core.bll.validator.LocalizedVmStatus; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters; import org.ovirt.engine.core.common.errors.VdcBllMessages; @@ -44,7 +45,7 @@ } else { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__EJECT_CD); } - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL); + failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, LocalizedVmStatus.byVmStatus(getVm().getStatus())); } else if ((IsoDomainListSyncronizer.getInstance().findActiveISODomain(getVm().getStoragePoolId()) == null) && !StringUtils.isEmpty(mCdImagePath)) { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CHANGE_CD); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java index 661d34f..cec7132 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll; import org.ovirt.engine.core.bll.utils.VmDeviceUtils; +import org.ovirt.engine.core.bll.validator.LocalizedVmStatus; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.AttachDettachVmDiskParameters; import org.ovirt.engine.core.common.businessentities.Disk; @@ -29,8 +30,7 @@ } if (retValue && getVm().getStatus() != VMStatus.Up && getVm().getStatus() != VMStatus.Down) { - retValue = false; - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL); + retValue = failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, LocalizedVmStatus.byVmStatus(getVm().getStatus())); } if (retValue) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index 41be3da..aeadd88 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -5,6 +5,7 @@ import java.util.Map; import org.ovirt.engine.core.bll.memory.MemoryUtils; +import org.ovirt.engine.core.bll.validator.LocalizedVmStatus; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdcActionType; @@ -241,7 +242,7 @@ VMStatus vmStatus = getVm().getStatus(); if (vmStatus == VMStatus.WaitForLaunch || vmStatus == VMStatus.NotResponding) { - return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL); + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, LocalizedVmStatus.byVmStatus(vmStatus)); } if (vmStatus != VMStatus.Up) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_UP); 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 f7bc658..6f7cb7a 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 @@ -9,6 +9,7 @@ import org.ovirt.engine.core.bll.scheduling.VdsFreeMemoryChecker; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.bll.validator.DiskImagesValidator; +import org.ovirt.engine.core.bll.validator.LocalizedVmStatus; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.action.MigrateVmParameters; @@ -262,7 +263,7 @@ } if (vm.getStatus() == VMStatus.NotResponding) { - return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL); + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, LocalizedVmStatus.byVmStatus(vm.getStatus())); } if (vm.getStatus() == VMStatus.Paused) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java index f51aec3..58fbcf5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.bll; +import org.ovirt.engine.core.bll.validator.LocalizedVmStatus; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.VmOperationParameterBase; import org.ovirt.engine.core.common.businessentities.VM; @@ -51,6 +52,7 @@ || vm.getStatus() == VMStatus.NotResponding)) { retValue = false; message.add(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL.toString()); + message.add(LocalizedVmStatus.byVmStatus(vm.getStatus())); } else if (!vm.isRunning()) { retValue = false; message.add(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_RUNNING.toString()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java index 5a97e34..c131c92 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java @@ -4,6 +4,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.utils.PermissionSubject; +import org.ovirt.engine.core.bll.validator.LocalizedVmStatus; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.SetVmTicketParameters; @@ -103,8 +104,7 @@ // to the console: final VMStatus status = vm.getStatus(); if (status != VMStatus.Up && status != VMStatus.Paused && status != VMStatus.PoweringUp && status != VMStatus.PoweringDown && status != VMStatus.RebootInProgress) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL); - return false; + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, LocalizedVmStatus.byVmStatus(vm.getStatus())); } // Nothing else, all checks have been performed using permission diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java index eea19b2..2e0280e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -16,6 +17,7 @@ import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.utils.VmDeviceUtils; import org.ovirt.engine.core.bll.validator.DiskValidator; +import org.ovirt.engine.core.bll.validator.LocalizedVmStatus; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcActionUtils; @@ -236,8 +238,10 @@ return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_REQUESTED_DISK_SIZE_IS_TOO_SMALL); } - if (!VdcActionUtils.canExecute(getVmsDiskPluggedTo(), VM.class, VdcActionType.ExtendImageSize)) { - return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL); + for (VM vm : getVmsDiskPluggedTo()) { + if (!VdcActionUtils.canExecute(Arrays.asList(vm), VM.class, VdcActionType.ExtendImageSize)) { + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, LocalizedVmStatus.byVmStatus(vm.getStatus())); + } } long additionalDiskSpaceInGB = newDiskImage.getSizeInGigabytes() - oldDiskImage.getSizeInGigabytes(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/LocalizedVmStatus.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/LocalizedVmStatus.java new file mode 100644 index 0000000..4a9f5d4 --- /dev/null +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/LocalizedVmStatus.java @@ -0,0 +1,40 @@ +package org.ovirt.engine.core.bll.validator; + +import java.util.HashMap; +import org.ovirt.engine.core.common.businessentities.VMStatus; +import org.ovirt.engine.core.common.errors.VdcBllMessages; + +public class LocalizedVmStatus extends HashMap<VMStatus, VdcBllMessages> { + + private static final LocalizedVmStatus INSTANCE = new LocalizedVmStatus(); + + private LocalizedVmStatus() { + put(VMStatus.Unassigned, VdcBllMessages.VAR__VM_STATUS__UNASSIGNED); + put(VMStatus.Down, VdcBllMessages.VAR__VM_STATUS__DOWN); + put(VMStatus.Up, VdcBllMessages.VAR__VM_STATUS__UP); + put(VMStatus.PoweringUp, VdcBllMessages.VAR__VM_STATUS__POWERING_UP); + put(VMStatus.Paused, VdcBllMessages.VAR__VM_STATUS__PAUSED); + put(VMStatus.MigratingFrom, VdcBllMessages.VAR__VM_STATUS__MIGRATING); + put(VMStatus.MigratingTo, VdcBllMessages.VAR__VM_STATUS__MIGRATING); + put(VMStatus.Unknown, VdcBllMessages.VAR__VM_STATUS__UNKNOWN); + put(VMStatus.NotResponding, VdcBllMessages.VAR__VM_STATUS__NOT_RESPONDING); + put(VMStatus.WaitForLaunch, VdcBllMessages.VAR__VM_STATUS__WAIT_FOR_LAUNCH); + put(VMStatus.RebootInProgress, VdcBllMessages.VAR__VM_STATUS__REBOOT_IN_PROGRESS); + put(VMStatus.SavingState, VdcBllMessages.VAR__VM_STATUS__SAVING_STATE); + put(VMStatus.RestoringState, VdcBllMessages.VAR__VM_STATUS__RESTORING_STATE); + put(VMStatus.Suspended, VdcBllMessages.VAR__VM_STATUS__SUSPENDED); + put(VMStatus.ImageIllegal, VdcBllMessages.VAR__VM_STATUS__IMAGE_ILLEGAL); + put(VMStatus.ImageLocked, VdcBllMessages.VAR__VM_STATUS__IMAGE_LOCKED); + put(VMStatus.PoweringDown, VdcBllMessages.VAR__VM_STATUS__POWERING_DOWN); + put(VMStatus.PreparingForHibernate, VdcBllMessages.VAR__VM_STATUS__PREPARING_FOR_HIBERNATE); + } + + public static final String byVmStatus(VMStatus status) { + if (INSTANCE.containsKey(status)) { + return INSTANCE.get(status).name(); + } + + return ""; + } + +} diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java index 3027881..3593cba 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java @@ -223,7 +223,7 @@ public ValidationResult validateVmStatusUsingMatrix(VM vm) { if (!VdcActionUtils.canExecute(Arrays.asList(vm), VM.class, VdcActionType.RunVm)) { - return new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL); + return new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL, LocalizedVmStatus.byVmStatus(vm.getStatus())); } return ValidationResult.VALID; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java index 9d78564..bf04466 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java @@ -100,6 +100,24 @@ VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL, VAR__HOST_STATUS__UP_OR_MAINTENANCE, + VAR__VM_STATUS__UP, + VAR__VM_STATUS__UNASSIGNED, + VAR__VM_STATUS__DOWN, + VAR__VM_STATUS__POWERING_UP, + VAR__VM_STATUS__PAUSED, + VAR__VM_STATUS__MIGRATING, + VAR__VM_STATUS__UNKNOWN, + VAR__VM_STATUS__NOT_RESPONDING, + VAR__VM_STATUS__WAIT_FOR_LAUNCH, + VAR__VM_STATUS__REBOOT_IN_PROGRESS, + VAR__VM_STATUS__SAVING_STATE, + VAR__VM_STATUS__RESTORING_STATE, + VAR__VM_STATUS__SUSPENDED, + VAR__VM_STATUS__IMAGE_LOCKED, + VAR__VM_STATUS__POWERING_DOWN, + VAR__VM_STATUS__IMAGE_ILLEGAL, + VAR__VM_STATUS__PREPARING_FOR_HIBERNATE, + ACTION_LIST_CANNOT_BE_EMPTY(ErrorType.BAD_PARAMETERS), ACTION_TYPE_FAILED_NAME_ALREADY_USED(ErrorType.BAD_PARAMETERS), ACTION_TYPE_FAILED_VM_IN_PREVIEW(ErrorType.CONFLICT), diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 214e79a..0284c35 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -152,7 +152,7 @@ ACTION_TYPE_FAILED_VM_IS_SAVING_RESTORING=Cannot ${action} ${type}. VM is in saving/restoring state.\n\ -Please try again when the VM is either up or down. ACTION_TYPE_FAILED_VM_IS_DURING_SNAPSHOT=Cannot ${action} ${type}. The VM is performing an operation on a Snapshot. Please wait for the operation to finish, and try again. -ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL=Cannot ${action} ${type}. The VM status is illegal. +ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL=Cannot ${action} ${type} because it is in ${vmStatus} status. ACTION_TYPE_FAILED_VM_RUNNING_STATELESS=Cannot ${action} ${type}. The VM is running as Stateless. Please try again when VM is not running as Stateless. ACTION_TYPE_FAILED_VM_HAS_STATELESS_SNAPSHOT_LEFTOVER=Cannot ${action} ${type}. The VM was running as Stateless and didn't clean up successfully. Please try to run the VM which should clean up the VM, and then try again when VM is not running. ACTION_TYPE_FAILED_VM_IN_USE_BY_OTHER_USER=Cannot ${action} ${type}. The VM is in use by other user. @@ -306,6 +306,25 @@ VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL=$hostStatus Up, Maintenance or Non operational VAR__HOST_STATUS__UP_OR_MAINTENANCE=$hostStatus 'Up' or 'Maintenance' +VAR__VM_STATUS__UP=$vmStatus Up +VAR__VM_STATUS__UNASSIGNED=$vmStatus Unassigned +VAR__VM_STATUS__DOWN=$vmStatus Down +VAR__VM_STATUS__POWERING_UP=$vmStatus Powering Up +VAR__VM_STATUS__PAUSED=$vmStatus Paused +VAR__VM_STATUS__MIGRATING=$vmStatus Migrating +VAR__VM_STATUS__UNKNOWN=$vmStatus Unknown +VAR__VM_STATUS__NOT_RESPONDING=$vmStatus Not Responding +VAR__VM_STATUS__WAIT_FOR_LAUNCH=$vmStatus Wair for Launch +VAR__VM_STATUS__REBOOT_IN_PROGRESS=$vmStatus Reboot in Progress +VAR__VM_STATUS__SAVING_STATE=$vmStatus Saving State +VAR__VM_STATUS__RESTORING_STATE=$vmStatus Restoring State +VAR__VM_STATUS__SUSPENDED=$vmStatus Suspended +VAR__VM_STATUS__IMAGE_LOCKED=$vmStatus Image Locked +VAR__VM_STATUS__POWERING_DOWN=$vmStatus Powering Down +VAR__VM_STATUS__IMAGE_ILLEGAL=$vmStatus Image Illegal +VAR__VM_STATUS__PREPARING_FOR_HIBERNATE=$vmStatus Preparing for Hibernate + + ACTION_TYPE_FAILED_DISK_ALREADY_ATTACHED=Cannot ${action} ${type}. The disk is already attached to VM. ACTION_TYPE_FAILED_DISK_ALREADY_DETACHED=Cannot ${action} ${type}. The disk is already detached from VM. ACTION_TYPE_FAILED_NOT_SHAREABLE_DISK_ALREADY_ATTACHED=Cannot ${action} ${type}. The disk is not shareable and is already attached to a VM. diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index d7f7d1d..b28339a 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -385,7 +385,7 @@ @DefaultStringValue("Cannot ${action} ${type}. The VM is performing an operation on a Snapshot. Please wait for the operation to finish, and try again.") String ACTION_TYPE_FAILED_VM_IS_DURING_SNAPSHOT(); - @DefaultStringValue("Cannot ${action} ${type}. The VM status is illegal.") + @DefaultStringValue("Cannot ${action} ${type} because it is in ${vmStatus} status.") String ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL(); @DefaultStringValue("Cannot ${action} ${type}. The VM is running as Stateless. Please try again when VM is not running as Stateless.") @@ -838,6 +838,61 @@ @DefaultStringValue("$hostStatus 'Up' or 'Maintenance'") String VAR__HOST_STATUS__UP_OR_MAINTENANCE(); + // --------------------------------------------------------------------- + @DefaultStringValue("$vmStatus Up") + String VAR__VM_STATUS__UP(); + + @DefaultStringValue("$vmStatus Unassigned") + String VAR__VM_STATUS__UNASSIGNED(); + + @DefaultStringValue("$vmStatus Down") + String VAR__VM_STATUS__DOWN(); + + @DefaultStringValue("$vmStatus Powering Up") + String VAR__VM_STATUS__POWERING_UP(); + + @DefaultStringValue("$vmStatus Paused") + String VAR__VM_STATUS__PAUSED(); + + @DefaultStringValue("$vmStatus Migrating") + String VAR__VM_STATUS__MIGRATING(); + + @DefaultStringValue("$vmStatus Unknown") + String VAR__VM_STATUS__UNKNOWN(); + + @DefaultStringValue("$vmStatus Not Responding") + String VAR__VM_STATUS__NOT_RESPONDING(); + + @DefaultStringValue("$vmStatus Wair for Launch") + String VAR__VM_STATUS__WAIT_FOR_LAUNCH(); + + @DefaultStringValue("$vmStatus Reboot in Progress") + String VAR__VM_STATUS__REBOOT_IN_PROGRESS(); + + @DefaultStringValue("$vmStatus Saving State") + String VAR__VM_STATUS__SAVING_STATE(); + + @DefaultStringValue("$vmStatus Restoring State") + String VAR__VM_STATUS__RESTORING_STATE(); + + @DefaultStringValue("$vmStatus Suspended") + String VAR__VM_STATUS__SUSPENDED(); + + @DefaultStringValue("$vmStatus Image Locked") + String VAR__VM_STATUS__IMAGE_LOCKED(); + + @DefaultStringValue("$vmStatus Powering Down") + String VAR__VM_STATUS__POWERING_DOWN(); + + @DefaultStringValue("$vmStatus Image Illegal") + String VAR__VM_STATUS__IMAGE_ILLEGAL(); + + @DefaultStringValue("$vmStatus Preparing for Hibernate") + String VAR__VM_STATUS__PREPARING_FOR_HIBERNATE(); + + + // ------------------------------------------------------------------------- + @DefaultStringValue("$type Gluster Volume") String VAR__TYPE__GLUSTER_VOLUME(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 06cba89..fd0570e 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -145,7 +145,7 @@ ACTION_TYPE_FAILED_VM_IS_SAVING_RESTORING=Cannot ${action} ${type}. VM is in saving/restoring state.\n\ -Please try again when the VM is either up or down. ACTION_TYPE_FAILED_VM_IS_DURING_SNAPSHOT=Cannot ${action} ${type}. The VM is performing an operation on a Snapshot. Please wait for the operation to finish, and try again. -ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL=Cannot ${action} ${type}. The VM status is illegal. +ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL=Cannot ${action} ${type} because it is in ${vmStatus} status. ACTION_TYPE_FAILED_VM_RUNNING_STATELESS=Cannot ${action} ${type}. The VM is running as Stateless. Please try again when VM is not running as Stateless. ACTION_TYPE_FAILED_VM_HAS_STATELESS_SNAPSHOT_LEFTOVER=Cannot ${action} ${type}. The VM was running as Stateless and didn't clean up successfully. Please try to run the VM which should clean up the VM, and then try again when VM is not running. ACTION_TYPE_FAILED_VM_IN_USE_BY_OTHER_USER=Cannot ${action} ${type}. The VM is in use by other user. @@ -290,6 +290,24 @@ VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL=$hostStatus Up, Maintenance or Non operational VAR__HOST_STATUS__UP_OR_MAINTENANCE=$hostStatus 'Up' or 'Maintenance' +VAR__VM_STATUS__UP=$vmStatus Up +VAR__VM_STATUS__UNASSIGNED=$vmStatus Unassigned +VAR__VM_STATUS__DOWN=$vmStatus Down +VAR__VM_STATUS__POWERING_UP=$vmStatus Powering Up +VAR__VM_STATUS__PAUSED=$vmStatus Paused +VAR__VM_STATUS__MIGRATING=$vmStatus Migrating +VAR__VM_STATUS__UNKNOWN=$vmStatus Unknown +VAR__VM_STATUS__NOT_RESPONDING=$vmStatus Not Responding +VAR__VM_STATUS__WAIT_FOR_LAUNCH=$vmStatus Wair for Launch +VAR__VM_STATUS__REBOOT_IN_PROGRESS=$vmStatus Reboot in Progress +VAR__VM_STATUS__SAVING_STATE=$vmStatus Saving State +VAR__VM_STATUS__RESTORING_STATE=$vmStatus Restoring State +VAR__VM_STATUS__SUSPENDED=$vmStatus Suspended +VAR__VM_STATUS__IMAGE_LOCKED=$vmStatus Image Locked +VAR__VM_STATUS__POWERING_DOWN=$vmStatus Powering Down +VAR__VM_STATUS__IMAGE_ILLEGAL=$vmStatus Image Illegal +VAR__VM_STATUS__PREPARING_FOR_HIBERNATE=$vmStatus Preparing for Hibernate + ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS=Cannot ${action} ${type}. One or more provided storage domains are in maintenance/non-operational status. ACTION_TYPE_FAILED_STORAGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided wrong storage domain, which is not related to disk. ACTION_TYPE_FAILED_DISK_ALREADY_ATTACHED=Cannot ${action} ${type}. The disk is already attached to VM. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 939800c..d9cb3ca 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -149,7 +149,7 @@ ACTION_TYPE_FAILED_VM_IS_SAVING_RESTORING=Cannot ${action} ${type}. VM is in saving/restoring state.\n\ -Please try again when the VM is either up or down. ACTION_TYPE_FAILED_VM_IS_DURING_SNAPSHOT=Cannot ${action} ${type}. The VM is performing an operation on a Snapshot. Please wait for the operation to finish, and try again. -ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL=Cannot ${action} ${type}. The VM status is illegal. +ACTION_TYPE_FAILED_VM_STATUS_ILLEGAL=Cannot ${action} ${type} because it is in ${vmStatus} status. ACTION_TYPE_FAILED_VM_RUNNING_STATELESS=Cannot ${action} ${type}. The VM is running as Stateless. Please try again when VM is not running as Stateless. ACTION_TYPE_FAILED_VM_HAS_STATELESS_SNAPSHOT_LEFTOVER=Cannot ${action} ${type}. The VM was running as Stateless and didn't clean up successfully. Please try to run the VM which should clean up the VM, and then try again when VM is not running. ACTION_TYPE_FAILED_VM_IN_USE_BY_OTHER_USER=Cannot ${action} ${type}. The VM is in use by other user. @@ -308,6 +308,24 @@ VAR__HOST_STATUS__UP_MAINTENANCE_OR_NON_OPERATIONAL=$hostStatus Up, Maintenance or Non operational VAR__HOST_STATUS__UP_OR_MAINTENANCE=$hostStatus 'Up' or 'Maintenance' +VAR__VM_STATUS__UP=$vmStatus Up +VAR__VM_STATUS__UNASSIGNED=$vmStatus Unassigned +VAR__VM_STATUS__DOWN=$vmStatus Down +VAR__VM_STATUS__POWERING_UP=$vmStatus Powering Up +VAR__VM_STATUS__PAUSED=$vmStatus Paused +VAR__VM_STATUS__MIGRATING=$vmStatus Migrating +VAR__VM_STATUS__UNKNOWN=$vmStatus Unknown +VAR__VM_STATUS__NOT_RESPONDING=$vmStatus Not Responding +VAR__VM_STATUS__WAIT_FOR_LAUNCH=$vmStatus Wair for Launch +VAR__VM_STATUS__REBOOT_IN_PROGRESS=$vmStatus Reboot in Progress +VAR__VM_STATUS__SAVING_STATE=$vmStatus Saving State +VAR__VM_STATUS__RESTORING_STATE=$vmStatus Restoring State +VAR__VM_STATUS__SUSPENDED=$vmStatus Suspended +VAR__VM_STATUS__IMAGE_LOCKED=$vmStatus Image Locked +VAR__VM_STATUS__POWERING_DOWN=$vmStatus Powering Down +VAR__VM_STATUS__IMAGE_ILLEGAL=$vmStatus Image Illegal +VAR__VM_STATUS__PREPARING_FOR_HIBERNATE=$vmStatus Preparing for Hibernate + ACTION_TYPE_FAILED_DISK_ALREADY_ATTACHED=Cannot ${action} ${type}. The disk is already attached to VM. ACTION_TYPE_FAILED_DISK_ALREADY_DETACHED=Cannot ${action} ${type}. The disk is already detached from VM. ACTION_TYPE_FAILED_NOT_SHAREABLE_DISK_ALREADY_ATTACHED=Cannot ${action} ${type}. The disk is not shareable and is already attached to a VM. -- To view, visit http://gerrit.ovirt.org/19211 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea6840e555aeb0c7a33a3b90e72fef23433e2be1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
