Hello Alissa Bonas,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/18505
to review the following change.
Change subject: core: rename stoarge to storage
......................................................................
core: rename stoarge to storage
Rename error message name from stoarge to storage.
Renamed in all java and properties files where used.
Change-Id: I61f9a867d4bade3f756a9933dd6f665406c946a0
Signed-off-by: Alissa Bonas <[email protected]>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.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
6 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/18505/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
index 21e7ff9..8249baf 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
@@ -123,7 +123,7 @@
if
(!diskImage.getStorageIds().contains(getParameters().getStorageDomainId())) {
retValue = false;
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STOARGE_DOMAIN_IS_WRONG);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_IS_WRONG);
}
StorageDomainValidator validator = new
StorageDomainValidator(getStorageDomain());
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 8d744fd..86ebd95 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
@@ -171,7 +171,7 @@
ACTION_TYPE_FAILED_STORAGE_POOL_NOT_MATCH(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_STORAGE_POOL_OF_VM_NOT_MATCH(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS(ErrorType.BAD_PARAMETERS),
- ACTION_TYPE_FAILED_STOARGE_DOMAIN_IS_WRONG(ErrorType.BAD_PARAMETERS),
+ ACTION_TYPE_FAILED_STORAGE_DOMAIN_IS_WRONG(ErrorType.BAD_PARAMETERS),
ACTION_TYPE_FAILED_STORAGE_DOMAIN_ALREADY_CONTAINS_DISK(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_STORAGE_DOMAIN_NAME_ALREADY_EXIST(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_STORAGE_DOMAIN_ALREADY_EXIST(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 4d6244f..7199b59 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -132,7 +132,7 @@
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
VM_NOT_FOUND=VM not found
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_STOARGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided
wrong storage domain, which is not related to disk.
+ACTION_TYPE_FAILED_STORAGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided
wrong storage domain, which is not related to disk.
ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a
Snapshot.
ACTION_TYPE_FAILED_DISKS_LOCKED=Cannot ${action} ${type}: The following disks
are locked: ${diskAliases}. Please try again in a few minutes.
ACTION_TYPE_FAILED_DISKS_ILLEGAL=Cannot ${action} ${type}. The following
attached disks are in ILLEGAL status: ${diskAliases} - please remove them and
try again.
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 056dbf8..493474e 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
@@ -875,7 +875,7 @@
String ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS();
@DefaultStringValue("Cannot ${action} ${type}. Provided wrong storage
domain, which is not related to disk.")
- String ACTION_TYPE_FAILED_STOARGE_DOMAIN_IS_WRONG();
+ String ACTION_TYPE_FAILED_STORAGE_DOMAIN_IS_WRONG();
@DefaultStringValue("Cannot ${action} ${type}. The chosen CPU is not
supported.")
String ACTION_TYPE_FAILED_CPU_NOT_FOUND();
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 888a9fc..fea8c83 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
@@ -288,7 +288,7 @@
VAR__HOST_STATUS__UP_OR_MAINTENANCE=$hostStatus 'Up' or 'Maintenance'
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_STOARGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided
wrong storage domain, which is not related to disk.
+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.
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/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 9636050..9c43e9a 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
@@ -309,7 +309,7 @@
ACTION_TYPE_FAILED_NOT_SHAREABLE_DISK_ALREADY_ATTACHED=Cannot ${action}
${type}. The disk is not shareable and is already attached to a VM.
ACTION_TYPE_FAILED_VM_MAX_RESOURCE_EXEEDED=Cannot ${action} ${type}. Maximum
value for concurrently running VMs exceeded.
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_STOARGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided
wrong storage domain, which is not related to disk.
+ACTION_TYPE_FAILED_STORAGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided
wrong storage domain, which is not related to disk.
ACTION_TYPE_FAILED_CPU_NOT_FOUND=Cannot ${action} ${type}. The chosen CPU is
not supported.
ACTION_TYPE_FAILED_EXCEEDED_MAX_PCI_SLOTS=Cannot ${action} ${type}. Maximum
PCI devices exceeded.
ACTION_TYPE_FAILED_EXCEEDED_MAX_IDE_SLOTS=Cannot ${action} ${type}. Maximum
IDE devices exceeded.
--
To view, visit http://gerrit.ovirt.org/18505
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61f9a867d4bade3f756a9933dd6f665406c946a0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Alissa Bonas <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
