Daniel Erez has uploaded a new change for review.
Change subject: core: improve disk configuration not supported message
......................................................................
core: improve disk configuration not supported message
ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED VdcBllMessage:
adding disk's ${volumeFormat} and ${volumeType} values.
Change-Id: If281b402fdc043696b7f206e47d86e50add7b3d8
Signed-off-by: Daniel Erez <[email protected]>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.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
5 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/17403/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
index 03b542f..a67cf31 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
@@ -424,6 +424,8 @@
if (!checkImageConfiguration(storageDomain, diskInfo.getVolumeType(),
diskInfo.getVolumeFormat())) {
// not supported
messages.add(VdcBllMessages.ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED.toString());
+ messages.add(String.format("$%1$s %2$s", "volumeFormat",
diskInfo.getVolumeFormat()));
+ messages.add(String.format("$%1$s %2$s", "volumeType",
diskInfo.getVolumeType()));
return false;
}
return true;
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 975457a..fd3b4e7 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -173,7 +173,7 @@
ACTION_TYPE_FAILED_DISK_SPACE_LOW=Cannot ${action} ${type}. Low disk space on
relevant Storage Domain.
ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN=Cannot ${action}
${type}. Low disk space on target Storage Domain ${storageName}.
ACTION_TYPE_FAILED_DEDICATED_VDS_NOT_IN_SAME_CLUSTER=Cannot ${action} ${type}.
VM is pinned to a specific host. The host's cluster must be the same as the
selected VM cluster.
-ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED=Cannot ${action} ${type}.
The selected disk configuration is not supported.
+ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED=Cannot ${action} ${type},
disk configuration (${volumeFormat} ${volumeType}) is incompatible with the
storage domain type.
ACTION_TYPE_FAILED_DISK_LUN_IS_ALREADY_IN_USE=Cannot ${action} ${type}. The
provided lun is used by another disk.
ACTION_TYPE_FAILED_DISK_LUN_HAS_NO_VALID_TYPE=Cannot ${action} ${type}. The
provided lun has no valid lun type.
ACTION_TYPE_FAILED_DISK_LUN_ISCSI_MISSING_CONNECTION_PARAMS=Cannot ${action}
${type}. The provided lun is missing at least one connection parameter
(address/port/iqn).
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 04156bd..f21467b 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
@@ -460,7 +460,7 @@
@DefaultStringValue("Cannot ${action} ${type}. VM is pinned to a specific
host. The host's cluster must be the same as the selected VM cluster.")
String ACTION_TYPE_FAILED_DEDICATED_VDS_NOT_IN_SAME_CLUSTER();
- @DefaultStringValue("Cannot ${action} ${type}. The selected disk
configuration is not supported.")
+ @DefaultStringValue("Cannot ${action} ${type}, disk configuration
(${volumeFormat} ${volumeType}) is incompatible with the storage domain type.")
String ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED();
@DefaultStringValue("Cannot ${action} ${type}. VM migration is in
progress")
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 caef826..d073d87 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
@@ -168,7 +168,7 @@
ACTION_TYPE_FAILED_DISK_SPACE_LOW=Cannot ${action} ${type}. Low disk space on
relevant Storage Domain.
ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN=Cannot ${action}
${type}. Low disk space on target Storage Domain ${storageName}.
ACTION_TYPE_FAILED_DEDICATED_VDS_NOT_IN_SAME_CLUSTER=Cannot ${action} ${type}.
VM is pinned to a specific host. The host's cluster must be the same as the
selected VM cluster.
-ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED=Cannot ${action} ${type}.
The selected disk configuration is not supported.
+ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED=Cannot ${action} ${type},
disk configuration (${volumeFormat} ${volumeType}) is incompatible with the
storage domain type.
ACTION_TYPE_FAILED_DISK_LUN_IS_ALREADY_IN_USE=Cannot ${action} ${type}. The
provided lun is used by another disk.
ACTION_TYPE_FAILED_DISK_LUN_HAS_NO_VALID_TYPE=Cannot ${action} ${type}. The
provided lun has no valid lun type.
ACTION_TYPE_FAILED_DISK_LUN_ISCSI_MISSING_CONNECTION_PARAMS=Cannot ${action}
${type}. The provided lun is missing at least one connection parameter
(address/port/iqn).
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 b4d3ba3..d03057a 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
@@ -170,7 +170,7 @@
ACTION_TYPE_FAILED_DISK_SPACE_LOW=Cannot ${action} ${type}. Low disk space on
relevant Storage Domain.
ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN=Cannot ${action}
${type}. Low disk space on target Storage Domain ${storageName}.
ACTION_TYPE_FAILED_DEDICATED_VDS_NOT_IN_SAME_CLUSTER=Cannot ${action} ${type}.
VM is pinned to a specific host. The host's cluster must be the same as the
selected VM cluster.
-ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED=Cannot ${action} ${type}.
The selected disk configuration is not supported.
+ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED=Cannot ${action} ${type},
disk configuration (${volumeFormat} ${volumeType}) is incompatible with the
storage domain type.
ACTION_TYPE_FAILED_DISK_LUN_HAS_NO_VALID_TYPE=Cannot ${action} ${type}. The
provided lun has no valid lun type.
ACTION_TYPE_FAILED_DISK_LUN_ISCSI_MISSING_CONNECTION_PARAMS=Cannot ${action}
${type}. The provided lun is missing at least one connection parameter
(address/port/iqn).
ACTION_TYPE_FAILED_DISK_LUN_IS_ALREADY_IN_USE=Cannot ${action} ${type}. The
provided lun is used by another disk.
--
To view, visit http://gerrit.ovirt.org/17403
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If281b402fdc043696b7f206e47d86e50add7b3d8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
