Allon Mureinik has uploaded a new change for review.
Change subject: core: Fix filling in disk aliases in BLL messages
......................................................................
core: Fix filling in disk aliases in BLL messages
As part of change-id I7c56d9d2926eaf34b4a279c8d61a8cb166524da9 the
placeholder for the disk aliases was changed from ${diskAlias} to
${diskAliases}, but several places in the code continued to reference
the old placeholder.
This patch fixes that regression.
Change-Id: I65382d5b43fd12c65671df2f0824c584e012d07c
Bug-Url: https://bugzilla.redhat.com/879217
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/9446/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
index 523b6b2..a52ce61 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
@@ -66,7 +66,7 @@
if (retValue && isImageDisk && ((DiskImage) disk).getimageStatus() ==
ImageStatus.LOCKED) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED);
- addCanDoActionMessage(String.format("$%1$s %2$s", "diskAlias",
disk.getDiskAlias()));
+ addCanDoActionMessage(String.format("$%1$s %2$s", "diskAliases",
disk.getDiskAlias()));
return false;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
index 091b8d3..f1ea0ba 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
@@ -10,9 +10,9 @@
import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.bll.command.utils.StorageDomainSpaceChecker;
import org.ovirt.engine.core.bll.job.ExecutionHandler;
-import org.ovirt.engine.core.bll.quota.QuotaStorageDependent;
-import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter;
import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter;
+import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter;
+import org.ovirt.engine.core.bll.quota.QuotaStorageDependent;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.bll.validator.StorageDomainValidator;
import org.ovirt.engine.core.common.AuditLogType;
@@ -105,7 +105,7 @@
if (diskImage.getimageStatus() == ImageStatus.LOCKED) {
if (getParameters().getOperation() == ImageOperation.Move) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED);
- addCanDoActionMessage(String.format("$%1$s %2$s", "diskAlias",
diskImage.getDiskAlias()));
+ addCanDoActionMessage(String.format("$%1$s %2$s",
"diskAliases", diskImage.getDiskAlias()));
} else {
addCanDoActionMessage(VdcBllMessages.VM_TEMPLATE_IMAGE_IS_LOCKED);
}
--
To view, visit http://gerrit.ovirt.org/9446
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65382d5b43fd12c65671df2f0824c584e012d07c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
