Hello Tomer Saban,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/40854
to review the following change.
Change subject: webadmin: Added range values to QoS error message - revisited
......................................................................
webadmin: Added range values to QoS error message - revisited
revisited to use the ConfiguredRangeValidator internal ${range} key
Change-Id: I05779f7c655dc7354af647e2c154efd19c66f28b
Bug-Url: https://bugzilla.redhat.com/1142333
Signed-off-by: Tomer Saban <[email protected]>
Signed-off-by: Roy Golan <[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, 6 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/40854/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 6897789..fd26f45 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -1239,8 +1239,8 @@
ACTION_TYPE_FAILED_DEVICE_IS_ALREADY_IN_USE=Cannot ${action} ${type}. Storage
Device ${storageDevice} is already in use.
ACTION_TYPE_FAILED_TAG_ID_REQUIRED=Cannot ${action} ${type}. Tag ID is
required.
-ACTION_TYPE_FAILED_QOS_CPU_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}.
Values are out of range\n(Legal range is: 1-100).
-ACTION_TYPE_FAILED_QOS_STORAGE_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}.
Values are out of range.
+
+ACTION_TYPE_FAILED_QOS_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}. Values
are out of range\n(Legal range is: ${range}).
ACTION_TYPE_FAILED_QOS_STORAGE_POOL_NOT_EXIST=Cannot ${action} ${type}.
Invalid data center.
ACTION_TYPE_FAILED_QOS_STORAGE_POOL_NOT_CONSISTENT=Cannot ${action} ${type}.
Cannot change QoS data center.
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 8615a94..59a9724 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
@@ -3397,8 +3397,8 @@
@DefaultStringValue("Cannot ${action} ${type}. Values are out of
range\n(Legal range is: 1-100).")
String ACTION_TYPE_FAILED_QOS_CPU_OUT_OF_RANGE_VALUES();
- @DefaultStringValue("Cannot ${action} ${type}. Values are out of range.")
- String ACTION_TYPE_FAILED_QOS_STORAGE_OUT_OF_RANGE_VALUES();
+ @DefaultStringValue("Cannot ${action} ${type}. Values are out of
range\n(Legal range is: ${range}).")
+ String ACTION_TYPE_FAILED_QOS_OUT_OF_RANGE_VALUES();
@DefaultStringValue("Cannot ${action} ${type}. Invalid data center")
String ACTION_TYPE_FAILED_QOS_STORAGE_POOL_NOT_EXIST();
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 01dcf3d..8304811 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
@@ -1020,9 +1020,7 @@
# QoS errors
QOS_CPU_SHARES_OUT_OF_RANGE=Cannot set the cpu shares to the requested value.
It has to be between 0 and 262144.
-ACTION_TYPE_FAILED_QOS_CPU_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}.
Values are out of range\n(Legal range is: 1-100).
-ACTION_TYPE_FAILED_QOS_STORAGE_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}.
Values are out of range.
-
+ACTION_TYPE_FAILED_QOS_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}. Values
are out of range\n(Legal range is: ${range}).
# Alignment scan
ERROR_CANNOT_RUN_ALIGNMENT_SCAN_VM_IS_RUNNING=Cannot ${action} ${type}.
Alignment scan of a disk attached to a running VM is only supported with RAW
virtual disks.
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 b46c153..568dcf6 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
@@ -1193,9 +1193,7 @@
ACTION_TYPE_FAILED_TAG_ID_REQUIRED=Cannot ${action} ${type}. Tag ID is
required.
-ACTION_TYPE_FAILED_QOS_CPU_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}.
Values are out of range\n(Legal range is: 1-100).
-
-ACTION_TYPE_FAILED_QOS_STORAGE_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}.
Values are out of range.
+ACTION_TYPE_FAILED_QOS_OUT_OF_RANGE_VALUES=Cannot ${action} ${type}. Values
are out of range\n(Legal range is: ${range}).
ACTION_TYPE_FAILED_QOS_STORAGE_POOL_NOT_EXIST=Cannot ${action} ${type}.
Invalid data center.
ACTION_TYPE_FAILED_QOS_STORAGE_POOL_NOT_CONSISTENT=Cannot ${action} ${type}.
Cannot change QoS data center.
--
To view, visit https://gerrit.ovirt.org/40854
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05779f7c655dc7354af647e2c154efd19c66f28b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <[email protected]>
Gerrit-Reviewer: Tomer Saban <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
