Muli Salem has uploaded a new change for review. Change subject: core: Change Network Error Msg (#850854) ......................................................................
core: Change Network Error Msg (#850854) https://bugzilla.redhat.com/850854 Changes the error message in case a Nic with a Network that is not in the Vm Host is activated. Change-Id: I7d6d866c6c260af3834119f529e4aa5c56f80f69 Signed-off-by: Muli Salem <msa...@redhat.com> --- 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, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/7835/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 93f88db..4a1a496 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -697,7 +697,7 @@ HOT_PLUG_DISK_IS_NOT_UNPLUGGED=Disk is already activated. HOT_UNPLUG_DISK_IS_NOT_PLUGGED=Disk is already deactivated. ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. -ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network. +ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host or migrate the VM to a Host that has this Network. VM_CANNOT_RUN_FROM_DISK_WITHOUT_PLUGGED_DISK=Cannot ${action} ${type} without at least one active disk.\nPlease activate a disk and rerun the VM. SHAREABLE_DISK_IS_NOT_SUPPORTED_FOR_DISK=Cannot ${action} ${type}. Disk cannot be shareable if it depends on a snapshot. In order to share it, remove the disk's snapshots. SHAREABLE_DISK_IS_NOT_SUPPORTED_BY_VOLUME_FORMAT=Cannot ${action} ${type}. Disk's volume format is not supported for shareable disk. 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 34faf57..0360b28 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 @@ -1864,7 +1864,7 @@ @DefaultStringValue("Cannot activate/deactivate interface due to VM status. The VM status must be Down or Up.") String ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL(); - @DefaultStringValue("The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network.") + @DefaultStringValue("The Network does not exist on the host the VM is running on.\n Either add the Network to the Host or migrate the VM to a Host that has this Network.") String ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS(); @DefaultStringValue("Disk is already deactivated.") 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 8391f66..9c6705a 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 @@ -691,7 +691,7 @@ HOT_PLUG_DISK_IS_NOT_UNPLUGGED=Disk is already activated. HOT_UNPLUG_DISK_IS_NOT_PLUGGED=Disk is already deactivated. ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. -ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network. +ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host or migrate the VM to a Host that has this Network. VM_CANNOT_RUN_FROM_DISK_WITHOUT_PLUGGED_DISK=Cannot ${action} ${type} without at least one active disk.\nPlease activate a disk and rerun the VM. SHAREABLE_DISK_IS_NOT_SUPPORTED_FOR_DISK=Cannot ${action} ${type}. Disk cannot be shareable if it depends on a snapshot. In order to share it, remove the disk's snapshots. SHAREABLE_DISK_IS_NOT_SUPPORTED_BY_VOLUME_FORMAT=Cannot ${action} ${type}. Disk's volume format is not supported for shareable disk. 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 a9a33f0..8d756ee 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 @@ -691,7 +691,7 @@ HOT_PLUG_DISK_IS_NOT_UNPLUGGED=Disk is already activated. HOT_UNPLUG_DISK_IS_NOT_PLUGGED=Disk is already deactivated. ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL=Cannot activate/deactivate VM Network Interface due to VM status. The VM status must be Down or Up. -ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host, do not activate the Interface or migrate the VM to a Host that has this Network. +ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS=The Network does not exist on the host the VM is running on.\n Either add the Network to the Host or migrate the VM to a Host that has this Network. VM_CANNOT_RUN_FROM_DISK_WITHOUT_PLUGGED_DISK=Cannot ${action} ${type} without at least one active disk.\nPlease activate a disk and rerun the VM. SHAREABLE_DISK_IS_NOT_SUPPORTED_FOR_DISK=Cannot ${action} ${type}. Disk cannot be shareable if it depends on a snapshot. In order to share it, remove the disk's snapshots. SHAREABLE_DISK_IS_NOT_SUPPORTED_BY_VOLUME_FORMAT=Cannot ${action} ${type}. Disk's volume format is not supported for shareable disk. -- To view, visit http://gerrit.ovirt.org/7835 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d6d866c6c260af3834119f529e4aa5c56f80f69 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <msa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
