Tal Nisan has uploaded a new change for review.
Change subject: core: Fix error message when exporting to a non export domain
......................................................................
core: Fix error message when exporting to a non export domain
Change-Id: Iffe15389360d6233655056dcfd94880f8033b741
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.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, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/10498/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
index d4d8c91..8f2d5de 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
@@ -142,6 +142,7 @@
// check destination storage is Export domain
if (getStorageDomain().getstorage_domain_type() !=
StorageDomainType.ImportExport) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN);
+ addCanDoActionMessage(String.format("$storageDomainName %1$s",
getStorageDomainName()));
return false;
}
// check destination storage have free space
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 a5510b2..08d3de9 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -516,7 +516,7 @@
VM_OR_TEMPLATE_ILLEGAL_PRIORITY_VALUE=VM priority value passed the permitted
max value, value should be between 0 and ${MaxValue}.
ACTION_TYPE_FAILED_MIN_CPU_PER_SOCKET=Minimum number of CPU per socket cannot
be less than 1
ACTION_TYPE_FAILED_MIN_NUM_SOCKETS=Minimum number of sockets cannot be less
then 1
-ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN=The specify domain is
not export domain
+ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN=Cannot ${action}
${type}. The specified domain '${storageDomainName}' is not an export domain.
NETWORK_ADDR_IN_STATIC_IP_BAD_FORMAT=Bad format of IP address
NETWORK_ADDR_IN_GATEWAY_BAD_FORMAT=Bad format of gateway address
NETWORK_ADDR_IN_SUBNET_BAD_FORMAT=Bad format of subnet mask
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 73bcdc2..4834f67 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
@@ -1373,7 +1373,7 @@
@DefaultStringValue("Minimum number of sockets cannot be less then 1")
String ACTION_TYPE_FAILED_MIN_NUM_SOCKETS();
- @DefaultStringValue("The specify domain is not export domain")
+ @DefaultStringValue("Cannot ${action} ${type}. The specified domain
'${storageDomainName}' is not an export domain.")
String ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN();
@DefaultStringValue("Bad format of IP address")
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 bbcfc32..151c325 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
@@ -512,7 +512,7 @@
VM_OR_TEMPLATE_ILLEGAL_PRIORITY_VALUE=VM priority value passed the permitted
max value, value should be between 0 and ${MaxValue}.
ACTION_TYPE_FAILED_MIN_CPU_PER_SOCKET=Minimum number of CPU per socket cannot
be less than 1
ACTION_TYPE_FAILED_MIN_NUM_SOCKETS=Minimum number of sockets cannot be less
then 1
-ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN=The specify domain is
not export domain
+ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN=Cannot ${action}
${type}. The specified domain '${storageDomainName}' is not an export domain.
NETWORK_ADDR_IN_STATIC_IP_BAD_FORMAT=Bad format of IP address
NETWORK_ADDR_IN_GATEWAY_BAD_FORMAT=Bad format of gateway address
NETWORK_ADDR_IN_SUBNET_BAD_FORMAT=Bad format of subnet mask
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 8c572b8..af873cb 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
@@ -510,7 +510,7 @@
VM_OR_TEMPLATE_ILLEGAL_PRIORITY_VALUE=VM priority value passed the permitted
max value, value should be between 0 and ${MaxValue}.
ACTION_TYPE_FAILED_MIN_CPU_PER_SOCKET=Minimum number of CPU per socket cannot
be less than 1
ACTION_TYPE_FAILED_MIN_NUM_SOCKETS=Minimum number of sockets cannot be less
then 1
-ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN=The specify domain is
not export domain
+ACTION_TYPE_FAILED_SPECIFY_DOMAIN_IS_NOT_EXPORT_DOMAIN=Cannot ${action}
${type}. The specified domain '${storageDomainName}' is not an export domain.
NETWORK_ADDR_IN_STATIC_IP_BAD_FORMAT=Bad format of IP address
NETWORK_ADDR_IN_GATEWAY_BAD_FORMAT=Bad format of gateway address
NETWORK_ADDR_IN_SUBNET_BAD_FORMAT=Bad format of subnet mask
--
To view, visit http://gerrit.ovirt.org/10498
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffe15389360d6233655056dcfd94880f8033b741
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
