Maor Lipchuk has uploaded a new change for review. Change subject: core: Use images instead of volumes at CDA message ......................................................................
core: Use images instead of volumes at CDA message The following message might be misleading since it uses the word "volume", which could be related to gluster: "Cannot remove Data Center while there are volumes on it. -Please remove all VMs and Templates first." There is also no need to indicate Vms or Templates since there could be also floating disks. Rephrasing the message to be "Cannot remove Data Center while in contains Disks. Please remove them first." Change-Id: I2cf86b6f968c4a6ff7178b742eb57077543d6143 Signed-off-by: Maor Lipchuk <[email protected]> Bug-Url:https://bugzilla.redhat.com/955557 --- 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, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/16668/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 b94dabd..9d4a58a 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -374,8 +374,8 @@ ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_IN_STORAGE_POOL=Cannot ${action} ${type}. The selected Storage Domain is not part of the Data Center. ERROR_CANNOT_DETACH_STORAGE_DOMAIN_WITH_IMAGES=Cannot detach a non empty Storage Domain.\n\ -Please remove all VMs / Templates / Disks and try again. -ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_IMAGES=Cannot remove Data Center while there are volumes on it.\n\ - -Please remove all VMs and Templates first. +ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_IMAGES=Cannot remove Data Center while it contains disks.\n\ + -Please remove them first. ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_VMS=Cannot remove Data Center while there are VMs on it.\n\ -Please remove all VMs and Templates first. ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_NONMASTER_DOMAINS=Cannot remove Data Center while there are more than one Storage Domain attached. 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 81a86c5..097eaba 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 @@ -1042,7 +1042,7 @@ @DefaultStringValue("Cannot detach a non empty Storage Domain.\n-Please remove all VMs / Templates / Disks and try again.") String ERROR_CANNOT_DETACH_STORAGE_DOMAIN_WITH_IMAGES(); - @DefaultStringValue("Cannot remove Data Center while there are volumes on it.\n-Please remove all VMs and Templates first.") + @DefaultStringValue("Cannot remove Data Center while it contains disks.\n-Please remove them first.") String ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_IMAGES(); @DefaultStringValue("Cannot remove Data Center while there are VMs on it.\n-Please remove all VMs and Templates first.") 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 caf4274..da097ef 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 @@ -370,8 +370,8 @@ ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_IN_STORAGE_POOL=Cannot ${action} ${type}. The selected Storage Domain is not part of the Data Center. ERROR_CANNOT_DETACH_STORAGE_DOMAIN_WITH_IMAGES=Cannot detach a non empty Storage Domain.\n\ -Please remove all VMs / Templates / Disks and try again. -ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_IMAGES=Cannot remove Data Center while there are volumes on it.\n\ - -Please remove all VMs and Templates first. +ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_IMAGES=Cannot remove Data Center while it contains disks.\n\ + -Please remove them first. ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_VMS=Cannot remove Data Center while there are VMs on it.\n\ -Please remove all VMs and Templates first. ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_NONMASTER_DOMAINS=Cannot remove Data Center when there are more than one Storage Domain attached. 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 bd347ed..0a916f3 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 @@ -379,8 +379,8 @@ ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_IN_STORAGE_POOL=Cannot ${action} ${type}. The selected Storage Domain is not part of the Data Center. ERROR_CANNOT_DETACH_STORAGE_DOMAIN_WITH_IMAGES=Cannot detach a non empty Storage Domain.\n\ -Please remove all VMs / Templates / Disks and try again. -ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_IMAGES=Cannot remove Data Center while there are volumes on it.\n\ - -Please remove all VMs and Templates first. +ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_IMAGES=Cannot remove Data Center while it contains disks.\n\ + -Please remove them first. ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_VMS=Cannot remove Data Center while there are VMs on it.\n\ -Please remove all VMs and Templates first. ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_NONMASTER_DOMAINS=Cannot remove Data Center when there are more than one Storage Domain attached. -- To view, visit http://gerrit.ovirt.org/16668 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cf86b6f968c4a6ff7178b742eb57077543d6143 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
