Mike Kolesnik has uploaded a new change for review.
Change subject: core: Change to use generic "name exists" message
......................................................................
core: Change to use generic "name exists" message
Where applicable, commands were changed to use the generic "name already
exists" error message, thus preventing duplication of messages that are
the same except the effected type.
Change-Id: Ibbe8d4c2cc2510bba7aab1f4b760fb77528a118d
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleWithActionGroupsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateComputerAccountCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.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
22 files changed, 26 insertions(+), 87 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/13063/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java
index c7ce7bc..2b830f7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java
@@ -16,7 +16,7 @@
.getByName(getBookmark().getbookmark_name()) != null) {
AddErrorMessages(
VdcBllMessages.VAR__ACTION__ADD,
-
VdcBllMessages.ACTION_TYPE_FAILED_BOOKMARK_NAME_ALREADY_EXISTS);
+ VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
return false;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleCommand.java
index 3c75d27..4e27dfd 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleCommand.java
@@ -3,8 +3,8 @@
import java.util.Collections;
import java.util.List;
-import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
+import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.RolesOperationsParameters;
import org.ovirt.engine.core.compat.Guid;
@@ -22,7 +22,8 @@
boolean returnValue = true;
if (getRoleDao().getByName(getRoleName()) != null) {
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD);
-
addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_UPDATE_ROLE_NAME);
+ addCanDoActionMessage(VdcBllMessages.VAR__TYPE__ROLE);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
returnValue = false;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleWithActionGroupsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleWithActionGroupsCommand.java
index 9098a0b..0e13c13 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleWithActionGroupsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddRoleWithActionGroupsCommand.java
@@ -3,16 +3,16 @@
import java.util.Collections;
import java.util.List;
-import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
+import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.ActionGroupsToRoleParameter;
import org.ovirt.engine.core.common.action.RoleWithActionGroupsParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
-import org.ovirt.engine.core.common.businessentities.RoleType;
import org.ovirt.engine.core.common.businessentities.Role;
+import org.ovirt.engine.core.common.businessentities.RoleType;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.utils.transaction.TransactionMethod;
@@ -44,7 +44,8 @@
}
if (getRoleDao().getByName(getRoleName()) != null) {
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD);
-
addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_UPDATE_ROLE_NAME);
+ addCanDoActionMessage(VdcBllMessages.VAR__TYPE__ROLE);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
return false;
}
RoleType roleType = getRole().getType();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
index c1e79c2..5df1a24 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
@@ -304,7 +304,7 @@
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_INVALID_VDS_HOSTNAME);
returnValue = false;
} else if (getVdsDAO().getAllWithName(vdsName).size() != 0) {
-
addCanDoActionMessage(VdcBllMessages.VDS_TRY_CREATE_WITH_EXISTING_PARAMS);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
returnValue = false;
} else if (getVdsDAO().getAllForHostname(hostName).size() != 0) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VDS_WITH_SAME_HOST_EXIST);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
index d5ab358..8b11eda 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
@@ -32,6 +32,7 @@
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.MigrationSupport;
import org.ovirt.engine.core.common.businessentities.OriginType;
+import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
@@ -41,7 +42,6 @@
import org.ovirt.engine.core.common.businessentities.VmStatic;
import org.ovirt.engine.core.common.businessentities.VmStatistics;
import org.ovirt.engine.core.common.businessentities.permissions;
-import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.config.Config;
@@ -443,7 +443,7 @@
if (exists) {
if (reasons != null) {
-
reasons.add(VdcBllMessages.ACTION_TYPE_FAILED_VM_ALREADY_EXIST.toString());
+
reasons.add(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED.toString());
}
return false;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index f33d7d3..3d6cd7c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -177,7 +177,7 @@
}
if (isVmTemlateWithSameNameExist(getVmTemplateName())) {
-
addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_CREATE_DUPLICATE_NAME);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
return false;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
index 6945cf9..b4b20b4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
@@ -194,7 +194,7 @@
if (pool != null
&& (getActionType() == VdcActionType.AddVmPoolWithVms ||
!pool.getVmPoolId().equals(
getParameters().getVmPoolId()))) {
-
addCanDoActionMessage(VdcBllMessages.VM_POOL_CANNOT_CREATE_DUPLICATE_NAME);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
return false;
}
setStoragePoolId(grp.getStoragePoolId().getValue());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateComputerAccountCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateComputerAccountCommand.java
index 52b753b..8011835 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateComputerAccountCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateComputerAccountCommand.java
@@ -8,8 +8,8 @@
import org.ovirt.engine.core.bll.adbroker.LdapCreateComputerAccountParameters;
import org.ovirt.engine.core.bll.adbroker.LdapFactory;
import
org.ovirt.engine.core.bll.adbroker.LdapIsComputerWithSameNameExistsParameters;
-import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
+import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.CreateComputerAccountParameters;
import org.ovirt.engine.core.common.businessentities.VmStatic;
import org.ovirt.engine.core.dal.VdcBllMessages;
@@ -53,7 +53,7 @@
getComputerName()))
.getReturnValue()).booleanValue();
if (returnValue) {
-
addCanDoActionMessage(VdcBllMessages.DIRECTORY_COMPUTER_WITH_THE_SAME_NAME_ALREADY_EXITS);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
}
} else {
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__CREATE);
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 fc9889a..337f365 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
@@ -27,12 +27,12 @@
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.Snapshot;
import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType;
+import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.businessentities.VolumeFormat;
-import org.ovirt.engine.core.common.businessentities.StorageDomain;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.errors.VdcBLLException;
import org.ovirt.engine.core.common.queries.DiskImageList;
@@ -354,7 +354,7 @@
break;
}
} else if (vm.getName().equals(getVm().getName())) {
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_ALREADY_EXIST);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
retVal = false;
break;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
index 781d168..8c408fe 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
@@ -104,7 +104,7 @@
retVal =
!ExportVmCommand.CheckTemplateInStorageDomain(getVmTemplate().getstorage_pool_id().getValue(),
getParameters().getStorageDomainId(), getVmTemplateId());
if (!retVal) {
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_NAME_ALREADY_EXISTS);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
}
}
return retVal;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java
index 2490f14..432529e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QuotaCRUDCommand.java
@@ -58,7 +58,7 @@
// Check if there is no quota with the same name that already exists.
if ((quotaByName != null) &&
(!quotaByName.getId().equals(quota.getId()))) {
-
messages.add(VdcBllMessages.ACTION_TYPE_FAILED_QUOTA_NAME_ALREADY_EXISTS.toString());
+
messages.add(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED.toString());
return false;
}
return true;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
index 6a3eb01..067797e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
@@ -29,7 +29,7 @@
updated.getbookmark_id()))) {
AddErrorMessages(
VdcBllMessages.VAR__ACTION__UPDATE,
-
VdcBllMessages.ACTION_TYPE_FAILED_BOOKMARK_NAME_ALREADY_EXISTS);
+ VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
} else {
result = true;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
index cca23e6..e49d9cc 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
@@ -31,7 +31,7 @@
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE);
} else if (!StringUtils.equals(getRole().getname(),
oldRole.getname())
&& getRoleDao().getByName(getRole().getname()) != null) {
-
addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_UPDATE_ROLE_NAME);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
returnValue = false;
} // changing role type isn't allowed
else if (getRole().getType() != oldRole.getType()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
index baba60f..f8e4197 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
@@ -51,7 +51,7 @@
if (VdsHandler.IsUpdateValid(getParameters().getVdsStaticData(),
_oldVds.getStaticData(),
_oldVds.getStatus())) {
if ("".equals(getParameters().getVdsStaticData().getName())) {
-
addCanDoActionMessage(VdcBllMessages.VDS_TRY_CREATE_WITH_EXISTING_PARAMS);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
}
String vdsName = getParameters().getvds().getName();
String hostName = getParameters().getvds().getHostName();
@@ -72,7 +72,7 @@
else if (!StringUtils.equalsIgnoreCase(_oldVds.getName(),
getParameters().getVdsStaticData()
.getName())
&& getVdsDAO().getAllWithName(vdsName).size() != 0) {
-
addCanDoActionMessage(VdcBllMessages.VDS_TRY_CREATE_WITH_EXISTING_PARAMS);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
} else if
(!StringUtils.equalsIgnoreCase(_oldVds.getHostName(),
getParameters().getVdsStaticData()
.getHostName())
&& getVdsDAO().getAllForHostname(hostName).size() !=
0) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
index 2f152a6..7ed8c4f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
@@ -187,7 +187,7 @@
new
IsVmWithSameNameExistParameters(vmFromParams.getName()))
.getReturnValue();
if (exists) {
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_ALREADY_EXIST);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
return false;
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
index 85bc2bf..b346d20 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
@@ -55,7 +55,7 @@
}
if (!StringUtils.equals(mOldTemplate.getName(),
getVmTemplate().getName())
&& isVmTemlateWithSameNameExist(getVmTemplateName())) {
-
addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_CREATE_DUPLICATE_NAME);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
} else {
if (getVdsGroup() == null) {
addCanDoActionMessage(VdcBllMessages.VMT_CLUSTER_IS_NOT_VALID);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
index af3912f..10e60e0 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
@@ -120,7 +120,7 @@
mockSameNameQuery(true);
assertFalse("canDoAction should have failed with vm name already in
use.", command.canDoAction());
-
assertCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_ALREADY_EXIST);
+
assertCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
}
@Test
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
index 21e2666..3afcb1e 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
@@ -99,7 +99,6 @@
ACTION_TYPE_FAILED_VM_IS_DURING_SNAPSHOT,
ACTION_TYPE_FAILED_VM_NOT_FOUND,
ACTION_TYPE_FAILED_VM_NOT_EXIST,
- ACTION_TYPE_FAILED_VM_ALREADY_EXIST,
ACTION_TYPE_FAILED_VM_GUID_ALREADY_EXIST,
ACTION_TYPE_FAILED_VM_ATTACHED_TO_POOL,
ACTION_TYPE_FAILED_VM_WITH_BLANK_TEMPLATE,
@@ -142,7 +141,6 @@
ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST,
ACTION_TYPE_FAILED_TEMPLATE_IS_DISABLED,
ACTION_TYPE_FAILED_IMAGE_ALREADY_EXISTS,
- ACTION_TYPE_FAILED_TEMPLATE_NAME_ALREADY_EXISTS,
ACTION_TYPE_FAILED_TEMPLATE_GUID_ALREADY_EXISTS,
ACTION_TYPE_FAILED_CANDIDATE_ALREADY_EXISTS,
ACTION_TYPE_FAILED_ROLE_IS_READ_ONLY,
@@ -213,7 +211,6 @@
VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL,
VDS_FENCE_DISABLED_AT_QUIET_TIME,
VDS_STATUS_NOT_VALID_FOR_UPDATE,
- VDS_TRY_CREATE_WITH_EXISTING_PARAMS,
VDS_EMPTY_NAME,
VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND,
VDS_CANNOT_INSTALL_EMPTY_PASSWORD,
@@ -287,7 +284,6 @@
VMT_CANNOT_EXPORT_BLANK_TEMPLATE,
VMT_CANNOT_UPDATE_ILLEGAL_FIELD,
VMT_CANNOT_REMOVE_VDS_GROUP_VMTS_DETECTED,
- VMT_CANNOT_CREATE_DUPLICATE_NAME,
VMT_CLUSTER_IS_NOT_VALID,
VMT_CANNOT_CHANGE_IMAGES_TEMPLATE,
VMT_CANNOT_IMPORT_RAW_IMAGE_WITH_TEMPLATE,
@@ -330,7 +326,6 @@
VM_POOL_CANNOT_ADD_VM_ATTACHED_TO_POOL,
VM_POOL_CANNOT_DETACH_VM_NOT_ATTACHED_TO_POOL,
VM_POOL_CANNOT_ADD_VM_DIFFERENT_CLUSTER,
- VM_POOL_CANNOT_CREATE_DUPLICATE_NAME,
VM_POOL_CANNOT_CREATE_WITH_NO_VMS,
ACTION_TYPE_FAILED_NO_AVAILABLE_POOL_VMS,
VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE,
@@ -342,7 +337,6 @@
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM_POOL,
DIRECTORY_GROUP_CANNOT_ATTACH_TO_VM_ALREADY_ATTACHED,
DIRECTORY_GROUP_NOT_ATTACH_TO_VM,
- DIRECTORY_COMPUTER_WITH_THE_SAME_NAME_ALREADY_EXITS,
ERROR_LICENSE_NO_LICENSE,
ERROR_LICENSE_SYSTEM_CLOCK_MODIFIED,
ERROR_LICENSE_EXPIRED,
@@ -352,7 +346,6 @@
ERROR_CANNOT_REMOVE_LAST_SUPER_USER_ROLE,
ERROR_CANNOT_REMOVE_ROLE_ATTACHED_TO_PERMISSION,
ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID,
- ERROR_CANNOT_UPDATE_ROLE_NAME,
ERROR_CANNOT_UPDATE_ROLE_ID,
ERROR_CANNOT_UPDATE_ROLE_TYPE,
ERROR_CANNOT_ATTACH_ACTION_GROUP_TO_ROLE_ATTACHED,
@@ -524,7 +517,6 @@
VMPAYLOAD_FLOPPY_EXCEEDED,
CONFIG_UNKNOWN_KEY,
- ACTION_TYPE_FAILED_BOOKMARK_NAME_ALREADY_EXISTS,
ACTION_TYPE_FAILED_BOOKMARK_INVALID_ID,
VDS_FENCE_OPERATION_FAILED,
ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL,
@@ -645,7 +637,6 @@
ACTION_TYPE_FAILED_QUOTA_IS_NO_LONGER_AVAILABLE_IN_SYSTEM,
ACTION_TYPE_FAILED_QUOTA_LIMIT_IS_SPECIFIC_AND_GENERAL,
ACTION_TYPE_FAILED_QUOTA_LIMIT_IS_NOT_SPECIFIC_OR_GENERAL,
- ACTION_TYPE_FAILED_QUOTA_NAME_ALREADY_EXISTS,
ACTION_TYPE_FAILED_QUOTA_NAME_RESERVED_FOR_DEFAULT,
ACTION_TYPE_FAILED_QUOTA_CAN_NOT_HAVE_DEFAULT_INDICATION,
ACTION_TYPE_FAILED_QUOTA_WITH_DEFAULT_INDICATION_CAN_NOT_BE_REMOVED,
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 d8f86d4..1eff122 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -90,7 +90,6 @@
VDS_CANNOT_ACTIVATE_VDS_ALREADY_UP=Cannot ${action} ${type}. Host in Up status.
VDS_CANNOT_ACTIVATE_VDS_NOT_EXIST=Cannot ${action} ${type}. Host does not
exist.
VDS_INVALID_SERVER_ID=Cannot ${action} ${type}. Invalid Host Id.
-VDS_TRY_CREATE_WITH_EXISTING_PARAMS=Cannot ${action} ${type}. Host with the
same name already exists.
VDS_EMPTY_NAME=Cannot ${action} ${type}. Host name cannot be empty.
VDS_CANNOT_INSTALL_EMPTY_PASSWORD=Cannot install Host with empty password.
VDS_CANNOT_INSTALL_STATUS_ILLEGAL=Cannot install Host. Please move Host to
Maintenance mode first.
@@ -123,7 +122,6 @@
VMT_CANNOT_EXPORT_BLANK_TEMPLATE=Cannot export Blank Template.
VMT_CANNOT_UPDATE_ILLEGAL_FIELD=Failed updating the properties of the VM
template.
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
-DIRECTORY_COMPUTER_WITH_THE_SAME_NAME_ALREADY_EXITS=A Computer with the same
name already exists.
VM_NOT_FOUND=VM not found
ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS=Cannot ${action} ${type}.
One or more provided storage domains are in maintenance/non-operational status.
ACTION_TYPE_FAILED_STOARGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided
wrong storage domain, which is not related to disk.
@@ -156,7 +154,6 @@
HOST_NAME_NOT_AVAILABLE=$VdsName [N/A]
VM_HOSTCPU_MUST_BE_PINNED_TO_HOST=Cannot ${action} ${type}. VM with host cpu
flags must be pinned to host.
ACTION_TYPE_FAILED_VM_NOT_EXIST=Cannot ${action} ${type}. VM doesn't exist.
-ACTION_TYPE_FAILED_VM_ALREADY_EXIST=Cannot ${action} ${type}. VM with the same
name already exists.
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.
@@ -193,7 +190,6 @@
ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST=Cannot ${action} ${type}. The
relevant Template doesn't exist.
ACTION_TYPE_FAILED_TEMPLATE_IS_DISABLED=Cannot ${action} ${type}. The Template
is disabled, please try to enable the template first and try again.
ACTION_TYPE_FAILED_IMAGE_ALREADY_EXISTS=Cannot ${action} ${type}. One of the
Template Images already exists.
-ACTION_TYPE_FAILED_TEMPLATE_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. A
Template with the same name already exists.
ACTION_TYPE_FAILED_TEMPLATE_GUID_ALREADY_EXISTS=Cannot ${action} ${type}. A
Template with the same identifier already exists.
ACTION_TYPE_FAILED_CANDIDATE_ALREADY_EXISTS=Cannot ${action} ${type}. The
export candidate already exists in the specified path.\n\
- Use the 'Force Override' option to override the existing file.
@@ -293,7 +289,6 @@
USER_FAILED_TO_AUTHENTICATE_KERBEROS_ERROR=Login failed. Client not found in
kerberos database. Please verify your login information or contact the system
administrator.
USER_FAILED_TO_AUTHENTICATION_WRONG_AUTHENTICATION_METHOD=Login failed
(Authentication Failed).\n\
- Please verify that the correct authentication method is used in your
system.
-VMT_CANNOT_CREATE_DUPLICATE_NAME=Cannot ${action} ${type}. Template name
already exists.
VMT_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid.
USER_ACCOUNT_DISABLED=Cannot Login. User Account is Disabled or Locked, Please
contact your system administrator.
USER_PERMISSION_DENIED=Permission denied. Engine Administrator permission is
required.
@@ -306,7 +301,6 @@
USER_DOES_NOT_HAVE_A_VALID_EMAIL=User does not have a valid e-mail address.
USB_NATIVE_SUPPORT_ONLY_AVAILABLE_ON_CLUSTER_LEVEL=Native USB support is only
available on cluster level 3.1 or higher.
USB_LEGACY_NOT_SUPPORTED_ON_LINUX_VMS=Legacy USB support is not available on
Linux VMs.
-VM_POOL_CANNOT_CREATE_DUPLICATE_NAME=Cannot ${action} VM-Pool. VM-Pool with
the same name already exists.
VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE=VM-Pool must be based on non-blank
Template.
VM_POOL_CANNOT_UPDATE_POOL_NOT_FOUND=Cannot edit VM-Pool properties - VM-Pool
not found.
ACTION_TYPE_FAILED_VM_TASKS_ARE_ALREADY_RUNNING=Cannot ${action} ${type}.
There are already asynchronous running tasks, please retry later.
@@ -318,7 +312,6 @@
ERROR_CANNOT_REMOVE_ROLE_ATTACHED_TO_PERMISSION=One or more Permissions is
still associated with Role.\n\
- Please remove all Permissions first.
ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=Cannot remove Role, invalid Role id.
-ERROR_CANNOT_UPDATE_ROLE_NAME=Cannot ${action} Role. Role with the same name
already exists.
ERROR_CANNOT_UPDATE_ROLE_ID=Cannot ${action} Role. Changing Role ID is not
allowed.
ERROR_CANNOT_UPDATE_ROLE_TYPE=Cannot ${action} Role. Changing Role type is not
allowed.
VDS_APPROVE_WRONG_VDS_TYPE=Cannot approve Host. Approve operation is
applicable only on RHEV Hypervisor hosts.\n\
@@ -474,7 +467,6 @@
TAGS_SPECIFY_TAG_IS_IN_USE=The specified Tag name already exists.
NETWORK_NOT_EXISTS_IN_CLUSTER=The specified Logical Network does not exist in
Cluster.
ACTION_LIST_CANNOT_BE_EMPTY=Actions list cannot be empty.
-ACTION_TYPE_FAILED_BOOKMARK_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. A
Bookmark with the same name already exists.
ACTION_TYPE_FAILED_BOOKMARK_INVALID_ID=Cannot ${action} ${type}. Bookmark ID
is not valid.
ACTION_TYPE_FAILED_VDS_STATUS_ILLEGAL=Cannot ${action} ${type}. Operation can
be performed only when Host status is ${hostStatus}.
ACTION_TYPE_FAILED_MIGRATE_BETWEEN_TWO_CLUSTERS=Cannot ${action} ${type}. VM
can be migrated only between Hosts in the same Cluster.\n\
@@ -670,7 +662,6 @@
ACTION_TYPE_FAILED_QUOTA_IS_NO_LONGER_AVAILABLE_IN_SYSTEM=Cannot ${action}
${type}. The quota associated with VM ${VmName} is no longer available. This
may be a result of an import or snapshot restoring actions. Please reassign a
quota to this VM.
ACTION_TYPE_FAILED_QUOTA_LIMIT_IS_SPECIFIC_AND_GENERAL=Cannot ${action}
${type}. Limitation can not be configured as specific and general in the same
Quota. Please choose whether the limitation should be enforced on the Data
Center or on specific storage.
ACTION_TYPE_FAILED_QUOTA_LIMIT_IS_NOT_SPECIFIC_OR_GENERAL=Cannot ${action}
${type}. Quota limitation must be configured specific or general.
-ACTION_TYPE_FAILED_QUOTA_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. Quota
with same name already exists.
ACTION_TYPE_FAILED_QUOTA_NAME_RESERVED_FOR_DEFAULT=Cannot ${action} ${type}.
The prefix DefaultQuota is reserved for the default quota.
ACTION_TYPE_FAILED_QUOTA_CAN_NOT_HAVE_DEFAULT_INDICATION=Cannot ${action}
${type}. Quota can not have default indication.
ACTION_TYPE_FAILED_QUOTA_WITH_DEFAULT_INDICATION_CAN_NOT_BE_REMOVED_=Cannot
${action} ${type}. Quota with default indication can not be removed while Data
Center is at disable mode.
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 399e19e..a1b4b60 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
@@ -211,9 +211,6 @@
@DefaultStringValue("Cannot ${action} ${type}. Invalid Host Id.")
String VDS_INVALID_SERVER_ID();
- @DefaultStringValue("Cannot ${action} ${type}. Host with the same name
already exists.")
- String VDS_TRY_CREATE_WITH_EXISTING_PARAMS();
-
@DefaultStringValue("Cannot ${action} ${type}. Host name cannot be empty.")
String VDS_EMPTY_NAME();
@@ -310,9 +307,6 @@
@DefaultStringValue("Cannot remove Directory Group. Detach Directory Group
from VM first.")
String DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM();
- @DefaultStringValue("A Computer with the same name already exists.")
- String DIRECTORY_COMPUTER_WITH_THE_SAME_NAME_ALREADY_EXITS();
-
@DefaultStringValue("VM not found")
String VM_NOT_FOUND();
@@ -408,9 +402,6 @@
@DefaultStringValue("Cannot ${action} ${type}. VM doesn't exist.")
String ACTION_TYPE_FAILED_VM_NOT_EXIST();
-
- @DefaultStringValue("Cannot ${action} ${type}. VM with the same name
already exists.")
- String ACTION_TYPE_FAILED_VM_ALREADY_EXIST();
@DefaultStringValue("Cannot ${action} ${type}. A highly available VM
cannot be pinned to a specific Host")
String
ACTION_TYPE_FAILED_VM_CANNOT_BE_HIGHLY_AVAILABLE_AND_PINNED_TO_HOST();
@@ -510,9 +501,6 @@
@DefaultStringValue("Cannot ${action} ${type}. One of the Template Images
already exists.")
String ACTION_TYPE_FAILED_IMAGE_ALREADY_EXISTS();
-
- @DefaultStringValue("Cannot ${action} ${type}. A Template with the same
name already exists.")
- String ACTION_TYPE_FAILED_TEMPLATE_NAME_ALREADY_EXISTS();
@DefaultStringValue("Cannot ${action} ${type}. A Template with the same
identifier already exists.")
String ACTION_TYPE_FAILED_TEMPLATE_GUID_ALREADY_EXISTS();
@@ -832,9 +820,6 @@
@DefaultStringValue("Login failed (Authentication Failed).\n- Please
verify that the correct authentication method is used in your system.")
String USER_FAILED_TO_AUTHENTICATION_WRONG_AUTHENTICATION_METHOD();
- @DefaultStringValue("Cannot ${action} ${type}. Template name already
exists.")
- String VMT_CANNOT_CREATE_DUPLICATE_NAME();
-
@DefaultStringValue("Cannot ${action} ${type}. Cluster ID is not valid.")
String VMT_CLUSTER_IS_NOT_VALID();
@@ -871,9 +856,6 @@
@DefaultStringValue("Legacy USB support is not available on Linux VMs.")
String USB_LEGACY_NOT_SUPPORTED_ON_LINUX_VMS();
- @DefaultStringValue("Cannot ${action} VM-Pool. VM-Pool with the same name
already exists. ")
- String VM_POOL_CANNOT_CREATE_DUPLICATE_NAME();
-
@DefaultStringValue("VM-Pool must be based on non-blank Template.")
String VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE();
@@ -903,9 +885,6 @@
@DefaultStringValue("Cannot remove Role, invalid Role id.")
String ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID();
-
- @DefaultStringValue("Cannot ${action} Role. Role with the same name
already exists.")
- String ERROR_CANNOT_UPDATE_ROLE_NAME();
@DefaultStringValue("Cannot ${action} Role. Changing Role ID is not
allowed.")
String ERROR_CANNOT_UPDATE_ROLE_ID();
@@ -1275,9 +1254,6 @@
@DefaultStringValue("Actions list cannot be empty.")
String ACTION_LIST_CANNOT_BE_EMPTY();
-
- @DefaultStringValue("Cannot ${action} ${type}. A Bookmark with the same
name already exists.")
- String ACTION_TYPE_FAILED_BOOKMARK_NAME_ALREADY_EXISTS();
@DefaultStringValue("Cannot ${action} ${type}. Bookmark ID is not valid.")
String ACTION_TYPE_FAILED_BOOKMARK_INVALID_ID();
@@ -1804,9 +1780,6 @@
@DefaultStringValue("Cannot ${action} ${type}. Quota limitation must be
configured specific or general.")
String ACTION_TYPE_FAILED_QUOTA_LIMIT_IS_NOT_SPECIFIC_OR_GENERAL();
-
- @DefaultStringValue("Cannot ${action} ${type}. Quota with same name
already exists.")
- String ACTION_TYPE_FAILED_QUOTA_NAME_ALREADY_EXISTS();
@DefaultStringValue("Cannot ${action} ${type}. The prefix DefaultQuota is
reserved for the default quota.")
String ACTION_TYPE_FAILED_QUOTA_NAME_RESERVED_FOR_DEFAULT();
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 f555897..785c00e 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
@@ -90,7 +90,6 @@
VDS_CANNOT_ACTIVATE_VDS_ALREADY_UP=Cannot ${action} ${type}. Host in Up status.
VDS_CANNOT_ACTIVATE_VDS_NOT_EXIST=Cannot ${action} ${type}. Host does not
exist.
VDS_INVALID_SERVER_ID=Cannot ${action} ${type}. Invalid Host Id.
-VDS_TRY_CREATE_WITH_EXISTING_PARAMS=Cannot ${action} ${type}. Host with the
same name already exists.
VDS_EMPTY_NAME=Cannot ${action} ${type}. Host name cannot be empty.
VDS_CANNOT_INSTALL_EMPTY_PASSWORD=Cannot install Host with empty password.
VDS_CANNOT_INSTALL_STATUS_ILLEGAL=Cannot install Host. Please move Host to
Maintenance mode first.
@@ -123,7 +122,6 @@
VMT_CANNOT_EXPORT_BLANK_TEMPLATE=Cannot export Blank Template.
VMT_CANNOT_UPDATE_ILLEGAL_FIELD=Failed updating the properties of the VM
template.
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
-DIRECTORY_COMPUTER_WITH_THE_SAME_NAME_ALREADY_EXITS=A Computer with the same
name already exists.
VM_NOT_FOUND=VM not found
ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a
Snapshot.
ACTION_TYPE_FAILED_DISKS_LOCKED=Cannot ${action} ${type}: The following disks
are locked: ${diskAliases}. Please try again in a few minutes.
@@ -154,7 +152,6 @@
HOST_NAME_NOT_AVAILABLE=$VdsName [N/A]
VM_HOSTCPU_MUST_BE_PINNED_TO_HOST=Cannot ${action} ${type}. VM with host cpu
flags must be pinned to host.
ACTION_TYPE_FAILED_VM_NOT_EXIST=Cannot ${action} ${type}. VM doesn't exist.
-ACTION_TYPE_FAILED_VM_ALREADY_EXIST=Cannot ${action} ${type}. VM with the same
name already exists.
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_CANNOT_BE_PINNED_TO_CPU_AND_MIGRATABLE=Migratable VM's
cannot be pinned to CPU.
ACTION_TYPE_FAILED_VM_GUID_ALREADY_EXIST=Cannot ${action} ${type}. VM with the
same identifier already exists.
@@ -192,7 +189,6 @@
ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST=Cannot ${action} ${type}. The
relevant Template doesn't exist.
ACTION_TYPE_FAILED_TEMPLATE_IS_DISABLED=Cannot ${action} ${type}. The Template
is disabled, please try to enable the template first and try again.
ACTION_TYPE_FAILED_IMAGE_ALREADY_EXISTS=Cannot ${action} ${type}. One of the
Template Images already exists.
-ACTION_TYPE_FAILED_TEMPLATE_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. A
Template with the same name already exists.
ACTION_TYPE_FAILED_TEMPLATE_GUID_ALREADY_EXISTS=Cannot ${action} ${type}. A
Template with the same identifier already exists.
ACTION_TYPE_FAILED_CANDIDATE_ALREADY_EXISTS=Cannot ${action} ${type}. The
export candidate already exists in the specified path.\n\
- Use the 'Force Override' option to override the existing file.
@@ -289,7 +285,6 @@
USER_FAILED_TO_AUTHENTICATE_KERBEROS_ERROR=Login failed. Client not found in
kerberos database. Please verify your login information or contact the system
administrator.
USER_FAILED_TO_AUTHENTICATION_WRONG_AUTHENTICATION_METHOD=Login failed
(Authentication Failed).\n\
- Please verify that the correct authentication method is used in your
system.
-VMT_CANNOT_CREATE_DUPLICATE_NAME=Cannot ${action} ${type}. Template name
already exists.
VMT_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid.
USER_ACCOUNT_DISABLED=Cannot Login. User Account is Disabled or Locked, Please
contact your system administrator.
USER_PERMISSION_DENIED=Permission denied. Engine Administrator permission is
required.
@@ -302,7 +297,6 @@
USER_DOES_NOT_HAVE_A_VALID_EMAIL=User does not have a valid e-mail address.
USB_NATIVE_SUPPORT_ONLY_AVAILABLE_ON_CLUSTER_LEVEL=Native USB support is only
available on cluster level 3.1 or higher.
USB_LEGACY_NOT_SUPPORTED_ON_LINUX_VMS=Legacy USB support is not available on
Linux VMs.
-VM_POOL_CANNOT_CREATE_DUPLICATE_NAME=Cannot ${action} VM-Pool. VM-Pool with
the same name already exists.
VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE=VM-Pool must be based on non-blank
Template.
VM_POOL_CANNOT_UPDATE_POOL_NOT_FOUND=Cannot edit VM-Pool properties - VM-Pool
not found.
ACTION_TYPE_FAILED_VM_TASKS_ARE_ALREADY_RUNNING=Cannot ${action} ${type}.
There are already asynchronous running tasks, please retry later.
@@ -314,7 +308,6 @@
ERROR_CANNOT_REMOVE_ROLE_ATTACHED_TO_PERMISSION=One or more Permissions is
still associated with Role.\n\
- Please remove all Permissions first.
ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=Cannot remove Role, invalid Role id.
-ERROR_CANNOT_UPDATE_ROLE_NAME=Cannot ${action} Role. Role with the same name
already exists.
ERROR_CANNOT_UPDATE_ROLE_ID=Cannot ${action} Role. Changing Role ID is not
allowed.
ERROR_CANNOT_UPDATE_ROLE_TYPE=Cannot ${action} Role. Changing Role type is not
allowed.
VDS_APPROVE_WRONG_VDS_TYPE=Cannot approve Host. Approve operation is
applicable only on RHEV Hypervisor hosts.\n\
@@ -471,7 +464,6 @@
TAGS_SPECIFY_TAG_IS_IN_USE=The specified Tag name already exists.
NETWORK_NET_EXISTS_IN_CLUSTER=The specified Logical Network does not exist in
Cluster.
ACTION_LIST_CANNOT_BE_EMPTY=Actions list cannot be empty.
-ACTION_TYPE_FAILED_BOOKMARK_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. A
Bookmark with the same name already exists.
ACTION_TYPE_FAILED_BOOKMARK_INVALID_ID=Cannot ${action} ${type}. Bookmark ID
is not valid.
ACTION_TYPE_FAILED_VDS_STATUS_ILLEGAL=Cannot ${action} ${type}. Operation can
be performed only when Host status is ${hostStatus}.
ACTION_TYPE_FAILED_MIGRATE_BETWEEN_TWO_CLUSTERS=Cannot ${action} ${type}. VM
can be migrated only between Hosts in the same Cluster.\n\
@@ -664,7 +656,6 @@
ACTION_TYPE_FAILED_QUOTA_IS_NO_LONGER_AVAILABLE_IN_SYSTEM=Cannot ${action}
${type}. The quota associated with VM ${VmName} is no longer available. This
may be a result of an import or snapshot restoring actions. Please reassign a
quota to this VM.
ACTION_TYPE_FAILED_QUOTA_LIMIT_IS_SPECIFIC_AND_GENERAL=Cannot ${action}
${type}. Limitation can not be configured as specific and general in the same
Quota. Please choose whether the limitation should be enforced on the Data
Center or on specific storage.
ACTION_TYPE_FAILED_QUOTA_LIMIT_IS_NOT_SPECIFIC_OR_GENERAL=Cannot ${action}
${type}. Quota limitation must be configured specific or general.
-ACTION_TYPE_FAILED_QUOTA_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. Quota
with same name already exists.
ACTION_TYPE_FAILED_QUOTA_NAME_RESERVED_FOR_DEFAULT=Cannot ${action} ${type}.
The prefix DefaultQuota is reserved for the default quota.
ACTION_TYPE_FAILED_QUOTA_CAN_NOT_HAVE_DEFAULT_INDICATION=Cannot ${action}
${type}. Quota can not have default indication.
ACTION_TYPE_FAILED_QUOTA_WITH_DEFAULT_INDICATION_CAN_NOT_BE_REMOVED=Cannot
${action} ${type}. Quota with default indication can not be removed while Data
Center is at disable mode.
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 ab127e6..0907e4e 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
@@ -89,7 +89,6 @@
VDS_CANNOT_ACTIVATE_VDS_ALREADY_UP=Cannot ${action} ${type}. Host in Up status.
VDS_CANNOT_ACTIVATE_VDS_NOT_EXIST=Cannot ${action} ${type}. Host does not
exist.
VDS_INVALID_SERVER_ID=Cannot ${action} ${type}. Invalid Host Id.
-VDS_TRY_CREATE_WITH_EXISTING_PARAMS=Cannot ${action} ${type}. Host with the
same name already exists.
VDS_EMPTY_NAME=Cannot ${action} ${type}. Host name cannot be empty.
VDS_CANNOT_INSTALL_EMPTY_PASSWORD=Cannot install Host with empty password.
VDS_CANNOT_INSTALL_STATUS_ILLEGAL=Cannot install Host. Please move Host to
Maintenance mode first.
@@ -122,7 +121,6 @@
VMT_CANNOT_EXPORT_BLANK_TEMPLATE=Cannot export Blank Template.
VMT_CANNOT_UPDATE_ILLEGAL_FIELD=Failed updating the properties of the VM
template.
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
-DIRECTORY_COMPUTER_WITH_THE_SAME_NAME_ALREADY_EXITS=A Computer with the same
name already exists.
VM_NOT_FOUND=VM not found
ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a
Snapshot.
ACTION_TYPE_FAILED_DISKS_LOCKED=Cannot ${action} ${type}: The following disks
are locked: ${diskAliases}. Please try again in a few minutes.
@@ -153,7 +151,6 @@
HOST_NAME_NOT_AVAILABLE=$VdsName [N/A]
VM_HOSTCPU_MUST_BE_PINNED_TO_HOST=Cannot ${action} ${type}. VM with host cpu
flags must be pinned to host.
ACTION_TYPE_FAILED_VM_NOT_EXIST=Cannot ${action} ${type}. VM doesn't exist.
-ACTION_TYPE_FAILED_VM_ALREADY_EXIST=Cannot ${action} ${type}. VM with the same
name already exists.
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.
@@ -190,7 +187,6 @@
ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST=Cannot ${action} ${type}. The
relevant Template doesn't exist.
ACTION_TYPE_FAILED_TEMPLATE_IS_DISABLED=Cannot ${action} ${type}. The Template
is disabled, please try to enable the template first and try again.
ACTION_TYPE_FAILED_IMAGE_ALREADY_EXISTS=Cannot ${action} ${type}. One of the
Template Images already exists.
-ACTION_TYPE_FAILED_TEMPLATE_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. A
Template with the same name already exists.
ACTION_TYPE_FAILED_TEMPLATE_GUID_ALREADY_EXISTS=Cannot ${action} ${type}. A
Template with the same identifier already exists.
ACTION_TYPE_FAILED_CANDIDATE_ALREADY_EXISTS=Cannot ${action} ${type}. The
export candidate already exists in the specified path.\n\
- Use the 'Force Override' option to override the existing file.
@@ -287,7 +283,6 @@
USER_FAILED_TO_AUTHENTICATE_KERBEROS_ERROR=Login failed. Client not found in
kerberos database. Please verify your login information or contact the system
administrator.
USER_FAILED_TO_AUTHENTICATION_WRONG_AUTHENTICATION_METHOD=Login failed
(Authentication Failed).\n\
- Please verify that the correct authentication method is used in your
system.
-VMT_CANNOT_CREATE_DUPLICATE_NAME=Cannot ${action} ${type}. Template name
already exists.
VMT_CLUSTER_IS_NOT_VALID=Cannot ${action} ${type}. Cluster ID is not valid.
USER_ACCOUNT_DISABLED=Cannot Login. User Account is Disabled or Locked, Please
contact your system administrator.
USER_PERMISSION_DENIED=Permission denied. Engine Administrator permission is
required.
@@ -300,7 +295,6 @@
USER_DOES_NOT_HAVE_A_VALID_EMAIL=User does not have a valid e-mail address.
USB_NATIVE_SUPPORT_ONLY_AVAILABLE_ON_CLUSTER_LEVEL=Native USB support is only
available on cluster level 3.1 or higher.
USB_LEGACY_NOT_SUPPORTED_ON_LINUX_VMS=Legacy USB support is not available on
Linux VMs.
-VM_POOL_CANNOT_CREATE_DUPLICATE_NAME=Cannot ${action} VM-Pool. VM-Pool with
the same name already exists.
VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE=VM-Pool must be based on non-blank
Template.
VM_POOL_CANNOT_UPDATE_POOL_NOT_FOUND=Cannot edit VM-Pool properties - VM-Pool
not found.
ACTION_TYPE_FAILED_VM_TASKS_ARE_ALREADY_RUNNING=Cannot ${action} ${type}.
There are already asynchronous running tasks, please retry later.
@@ -312,7 +306,6 @@
ERROR_CANNOT_REMOVE_ROLE_ATTACHED_TO_PERMISSION=One or more Permissions is
still associated with Role.\n\
- Please remove all Permissions first.
ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=Cannot remove Role, invalid Role id.
-ERROR_CANNOT_UPDATE_ROLE_NAME=Cannot ${action} Role. Role with the same name
already exists.
ERROR_CANNOT_UPDATE_ROLE_ID=Cannot ${action} Role. Changing Role ID is not
allowed.
ERROR_CANNOT_UPDATE_ROLE_TYPE=Cannot ${action} Role. Changing Role type is not
allowed.
VDS_APPROVE_WRONG_VDS_TYPE=Cannot approve Host. Approve operation is
applicable only on RHEV Hypervisor hosts.\n\
@@ -468,7 +461,6 @@
TAGS_SPECIFY_TAG_IS_IN_USE=The specified Tag name already exists.
NETWORK_NET_EXISTS_IN_CLUSTER=The specified Logical Network does not exist in
Cluster.
ACTION_LIST_CANNOT_BE_EMPTY=Actions list cannot be empty.
-ACTION_TYPE_FAILED_BOOKMARK_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. A
Bookmark with the same name already exists.
ACTION_TYPE_FAILED_BOOKMARK_INVALID_ID=Cannot ${action} ${type}. Bookmark ID
is not valid.
ACTION_TYPE_FAILED_VDS_STATUS_ILLEGAL=Cannot ${action} ${type}. Operation can
be performed only when Host status is ${hostStatus}.
ACTION_TYPE_FAILED_MIGRATE_BETWEEN_TWO_CLUSTERS=Cannot ${action} ${type}. VM
can be migrated only between Hosts in the same Cluster.\n\
@@ -662,7 +654,6 @@
ACTION_TYPE_FAILED_QUOTA_IS_NO_LONGER_AVAILABLE_IN_SYSTEM=Cannot ${action}
${type}. The quota associated with VM ${VmName} is no longer available. This
may be a result of an import or snapshot restoring actions. Please reassign a
quota to this VM.
ACTION_TYPE_FAILED_QUOTA_LIMIT_IS_SPECIFIC_AND_GENERAL=Cannot ${action}
${type}. Limitation can not be configured as specific and general in the same
Quota. Please choose whether the limitation should be enforced on the Data
Center or on specific storage.
ACTION_TYPE_FAILED_QUOTA_LIMIT_IS_NOT_SPECIFIC_OR_GENERAL=Cannot ${action}
${type}. Quota limitation must be configured specific or general.
-ACTION_TYPE_FAILED_QUOTA_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. Quota
with same name already exists.
ACTION_TYPE_FAILED_QUOTA_NAME_RESERVED_FOR_DEFAULT=Cannot ${action} ${type}.
The prefix DefaultQuota is reserved for the default quota.
ACTION_TYPE_FAILED_QUOTA_CAN_NOT_HAVE_DEFAULT_INDICATION=Cannot ${action}
${type}. Quota can not have default indication.
ACTION_TYPE_FAILED_QUOTA_WITH_DEFAULT_INDICATION_CAN_NOT_BE_REMOVED=Cannot
${action} ${type}. Quota with default indication can not be removed while Data
Center is at disable mode.
--
To view, visit http://gerrit.ovirt.org/13063
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbe8d4c2cc2510bba7aab1f4b760fb77528a118d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
