Vered Volansky has uploaded a new change for review.
Change subject: core: Adjust VM Failure message(#907900)
......................................................................
core: Adjust VM Failure message(#907900)
When creation of a snapshot fails due to VM state, a more informative
message is delivered.
ACTION_TYPE_FAILED_VM_IS_SAVING_RESTORING used to be:
Cannot ${action} ${type}. VM is in saving/restoring state.\n\
-Please wait until the VM's status has changed.
and is now:
Cannot ${action} ${type}. VM is in saving/restoring state.\n\
-Please try again when the VM is either up or down.
Change-Id: I16a5c0437aefea9a6958741fbdcf84f989d8b61e
Bug-Url: https://bugzilla.redhat.com/907900
Signed-off-by: Vered Volansky <[email protected]>
---
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
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/11991/1
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 270f548..3139b38 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -142,7 +142,7 @@
ACTION_TYPE_FAILED_VM_IS_NOT_DOWN=Cannot ${action} ${type}. At least one of
the VMs is not down.
ACTION_TYPE_FAILED_VM_IS_NOT_DOWN_OR_UP=Cannot ${action} ${type}. VM ${VmName}
must be in status Down, Up or Paused.
ACTION_TYPE_FAILED_VM_IS_SAVING_RESTORING=Cannot ${action} ${type}. VM is in
saving/restoring state.\n\
- -Please wait until the VM's status has changed.
+ -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_RUNNING_STATELESS=Cannot ${action} ${type}. The VM is
running as Stateless. Please try again when VM is not running as Stateless.
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 6657b57..5de0263 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
@@ -356,7 +356,7 @@
@DefaultStringValue("Cannot ${action} ${type}. VM ${VmName} must be in
status Down, Up or Paused.")
String ACTION_TYPE_FAILED_VM_IS_NOT_DOWN_OR_UP();
- @DefaultStringValue("Cannot ${action} ${type}. VM is in saving/restoring
state.\n-Please wait until the VM's status has changed.")
+ @DefaultStringValue("Cannot ${action} ${type}. VM is in saving/restoring
state.\n-Please try again when the VM is either up or down.")
String ACTION_TYPE_FAILED_VM_IS_SAVING_RESTORING();
@DefaultStringValue("Cannot ${action} ${type}. The VM is performing an
operation on a Snapshot. Please wait for the operation to finish, and try
again.")
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 c7844ed..cfc96f8 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
@@ -140,7 +140,7 @@
ACTION_TYPE_FAILED_VM_IS_NOT_DOWN=Cannot ${action} ${type}. At least one of
the VMs is not down.
ACTION_TYPE_FAILED_VM_IS_NOT_DOWN_OR_UP=Cannot ${action} ${type}. VM ${VmName}
must be in status Down, Up or Paused.
ACTION_TYPE_FAILED_VM_IS_SAVING_RESTORING=Cannot ${action} ${type}. VM is in
saving/restoring state.\n\
- -Please wait until the VM's status has changed.
+ -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_RUNNING_STATELESS=Cannot ${action} ${type}. The VM is
running as Stateless. Please try again when VM is not running as Stateless.
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 38c06a7..1d56acb 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
@@ -139,7 +139,7 @@
ACTION_TYPE_FAILED_VM_IS_NOT_DOWN=Cannot ${action} ${type}. At least one of
the VMs is not down.
ACTION_TYPE_FAILED_VM_IS_NOT_DOWN_OR_UP=Cannot ${action} ${type}. VM ${VmName}
must be in status Down, Up or Paused.
ACTION_TYPE_FAILED_VM_IS_SAVING_RESTORING=Cannot ${action} ${type}. VM is in
saving/restoring state.\n\
- -Please wait until the VM's status has changed.
+ -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_RUNNING_STATELESS=Cannot ${action} ${type}. The VM is
running as Stateless. Please try again when VM is not running as Stateless.
--
To view, visit http://gerrit.ovirt.org/11991
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16a5c0437aefea9a6958741fbdcf84f989d8b61e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
