Tal Nisan has uploaded a new change for review. Change subject: core: Correct error message when trying to remove a VM from pool ......................................................................
core: Correct error message when trying to remove a VM from pool Change-Id: I0fa5e1d5ed9e1448f8c3d711fea714dfeb44dda5 Signed-off-by: Tal Nisan <tni...@redhat.com> Bug-Url: https://bugzilla.redhat.com/1149458 --- 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/96/33896/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 5bafc36..5265a15 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -199,7 +199,7 @@ ACTION_TYPE_FAILED_VM_NOT_EXIST=Cannot ${action} ${type}. VM doesn't exist. ACTION_TYPE_FAILED_VM_CANNOT_BE_HIGHLY_AVAILABLE_AND_PINNED_TO_HOST=Cannot ${action} ${type}. A highly available VM cannot be pinned to a specific Host ACTION_TYPE_FAILED_VM_GUID_ALREADY_EXIST=Cannot ${action} ${type}. VM with the same identifier already exists. -ACTION_TYPE_FAILED_VM_ATTACHED_TO_POOL=Cannot ${action} ${type}. VM is attached to a VM-Pool. +ACTION_TYPE_FAILED_VM_ATTACHED_TO_POOL=Cannot ${action} ${type}. VM is attached to a VM Pool. ACTION_TYPE_FAILED_NO_AVAILABLE_POOL_VMS=Cannot ${action} ${type}. There are no available VMs in the VM-Pool. ACTION_TYPE_FAILED_VM_FROM_POOL_CANNOT_BE_STATELESS=Cannot ${action} ${type}. VM from Pool cannot be stateless. ACTION_TYPE_FAILED_PRESTARTED_VMS_CANNOT_EXCEED_VMS_COUNT=Cannot ${action} ${type}. Number of Prestarted VMs cannot exceed the number of VMs in the Pool. 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 9df22a7..23e943f 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 @@ -532,7 +532,7 @@ @DefaultStringValue("Cannot ${action} ${type}. VM with the same identifier already exists.") String ACTION_TYPE_FAILED_VM_GUID_ALREADY_EXIST(); - @DefaultStringValue("Cannot ${action} ${type}. VM is attached to a VM-Pool.") + @DefaultStringValue("Cannot ${action} ${type}. VM is attached to a VM Pool.") String ACTION_TYPE_FAILED_VM_ATTACHED_TO_POOL(); @DefaultStringValue("Cannot ${action} ${type}. There are no available VMs in the VM-Pool.") 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 eefeaa0..8029ddd 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 @@ -190,7 +190,7 @@ ACTION_TYPE_FAILED_VM_CANNOT_BE_PINNED_TO_CPU_AND_MIGRATABLE=Migratable VM's cannot be pinned to CPU. ACTION_TYPE_FAILED_VM_CANNOT_BE_PINNED_TO_CPU_WITH_UNDEFINED_HOST=Cannot set host CPU pinning when host is not selected ACTION_TYPE_FAILED_VM_GUID_ALREADY_EXIST=Cannot ${action} ${type}. VM with the same identifier already exists. -ACTION_TYPE_FAILED_VM_ATTACHED_TO_POOL=Cannot ${action} ${type}. VM is attached to a VM-Pool. +ACTION_TYPE_FAILED_VM_ATTACHED_TO_POOL=Cannot ${action} ${type}. VM is attached to a VM Pool. ACTION_TYPE_FAILED_NO_AVAILABLE_POOL_VMS=Cannot ${action} ${type}. There are no available VMs in the VM-Pool. ACTION_TYPE_FAILED_VM_FROM_POOL_CANNOT_BE_STATELESS=Cannot ${action} ${type}. VM from Pool cannot be stateless. ACTION_TYPE_FAILED_INVALID_TIMEZONE=Cannot ${action} ${type}. Invalid time zone for given OS type. 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 2f97644..2dadf7c 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 @@ -195,7 +195,7 @@ ACTION_TYPE_FAILED_VM_NOT_EXIST=Cannot ${action} ${type}. VM doesn't exist. ACTION_TYPE_FAILED_VM_CANNOT_BE_HIGHLY_AVAILABLE_AND_PINNED_TO_HOST=Cannot ${action} ${type}. A highly available VM cannot be pinned to a specific Host ACTION_TYPE_FAILED_VM_GUID_ALREADY_EXIST=Cannot ${action} ${type}. VM with the same identifier already exists. -ACTION_TYPE_FAILED_VM_ATTACHED_TO_POOL=Cannot ${action} ${type}. VM is attached to a VM-Pool. +ACTION_TYPE_FAILED_VM_ATTACHED_TO_POOL=Cannot ${action} ${type}. VM is attached to a VM Pool. ACTION_TYPE_FAILED_NO_AVAILABLE_POOL_VMS=Cannot ${action} ${type}. There are no available VMs in the VM-Pool. ACTION_TYPE_FAILED_VM_FROM_POOL_CANNOT_BE_STATELESS=Cannot ${action} ${type}. VM from Pool cannot be stateless. ACTION_TYPE_FAILED_INVALID_TIMEZONE=Cannot ${action} ${type}. Invalid time zone for given OS type. -- To view, visit http://gerrit.ovirt.org/33896 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fa5e1d5ed9e1448f8c3d711fea714dfeb44dda5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
