Muli Salem has uploaded a new change for review. Change subject: core: Change Error Message in DetachNetwork (#842748) ......................................................................
core: Change Error Message in DetachNetwork (#842748) https://bugzilla.redhat.com/842748 Please refer to subject. Change-Id: Id0332467769237c7fd4e4bbf3b52e05919978351 Signed-off-by: Muli Salem <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.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(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/7666/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.java index f7f9990..8a96997 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachNetworkFromVdsInterfaceCommand.java @@ -132,7 +132,7 @@ return network.getname().equals(getParameters().getNetwork().getname()); } })) { - addCanDoActionMessage(VdcBllMessages.NETWORK_CLUSTER_NETWORK_IN_USE); + addCanDoActionMessage(VdcBllMessages.NETWROK_HOST_IS_BUSY); return false; } } 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 420261c..ec653e7 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -474,7 +474,7 @@ NETWORK_INTERFACE_CONNECT_TO_VLAN=Cannot attach non vlan network to vlan interface NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_VM=Cannot remove network '${NetworkName}', it's in use by a VM ACTION_TYPE_FAILED_DISK_MAX_SIZE_EXCEEDED=Cannot create disk more than ${max}_disk_size GB -NETWROK_HOST_IS_BUSY=Cannot edit network while Host is active, change the Host to maintenance and try again +NETWROK_HOST_IS_BUSY=Cannot edit Network while Host is Active, change the Host to Maintenance mode and try again. VMT_CANNOT_CHANGE_IMAGES_TEMPLATE=Cannot change Template images format VMT_CANNOT_IMPORT_RAW_IMAGE_WITH_SNAPSHOTS=Cannot change image format to raw when image have Snapshots. VMT_CANNOT_IMPORT_RAW_IMAGE_WITH_TEMPLATE=Cannot change image format to raw when VM has Template. 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 c84dadf..27ee07f 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 @@ -1249,7 +1249,7 @@ @DefaultStringValue("Cannot create disk more than ${max}_disk_size GB") String ACTION_TYPE_FAILED_DISK_MAX_SIZE_EXCEEDED(); - @DefaultStringValue("Cannot edit network while Host is active, change the Host to maintenance and try again") + @DefaultStringValue("Cannot edit Network while Host is Active, change the Host to Maintenance mode and try again.") String NETWROK_HOST_IS_BUSY(); @DefaultStringValue("Cannot change Template images format") 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 24bc75d..fc12604 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 @@ -472,7 +472,7 @@ NETWORK_INTERFACE_CONNECT_TO_VLAN=Cannot attach non vlan network to vlan interface NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_VM=Cannot remove network '${NetworkName}', it's in use by a VM ACTION_TYPE_FAILED_DISK_MAX_SIZE_EXCEEDED=Cannot create disk more than ${max}_disk_size GB -NETWROK_HOST_IS_BUSY=Cannot edit network while Host is active, change the Host to maintenance and try again +NETWROK_HOST_IS_BUSY=Cannot edit Network while Host is Active, change the Host to Maintenance mode and try again. VMT_CANNOT_CHANGE_IMAGES_TEMPLATE=Cannot change Template images format VMT_CANNOT_IMPORT_RAW_IMAGE_WITH_SNAPSHOTS=Cannot change image format to raw when image have Snapshots. VMT_CANNOT_IMPORT_RAW_IMAGE_WITH_TEMPLATE=Cannot change image format to raw when VM has Template. 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 c47ec24..6214623 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 @@ -470,7 +470,7 @@ NETWORK_INTERFACE_CONNECT_TO_VLAN=Cannot attach non vlan network to vlan interface NETWORK_CANNOT_REMOVE_NETWORK_IN_USE_BY_VM=Cannot remove network '${NetworkName}', it's in use by a VM ACTION_TYPE_FAILED_DISK_MAX_SIZE_EXCEEDED=Cannot create disk more than ${max}_disk_size GB -NETWROK_HOST_IS_BUSY=Cannot edit network while Host is active, change the Host to maintenance and try again +NETWROK_HOST_IS_BUSY=Cannot edit Network while Host is Active, change the Host to Maintenance mode and try again. VMT_CANNOT_CHANGE_IMAGES_TEMPLATE=Cannot change Template images format VMT_CANNOT_IMPORT_RAW_IMAGE_WITH_SNAPSHOTS=Cannot change image format to raw when image have Snapshots. VMT_CANNOT_IMPORT_RAW_IMAGE_WITH_TEMPLATE=Cannot change image format to raw when VM has Template. -- To view, visit http://gerrit.ovirt.org/7666 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0332467769237c7fd4e4bbf3b52e05919978351 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
