Alon Bar-Lev has uploaded a new change for review. Change subject: host-deploy: always register as standard host ......................................................................
host-deploy: always register as standard host during host-deploy (post approve) we detect if host is node and set type. this will enable for regular hosts to be registered as well. Change-Id: Ie2449527d7dba92179e22ddc97521841b3e02010 Signed-off-by: Alon Bar-Lev <[email protected]> --- 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/ApproveVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java 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/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties 24 files changed, 12 insertions(+), 63 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/20611/1 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 54a8d2a..2341fcf 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 @@ -35,7 +35,6 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.common.businessentities.VdsDynamic; import org.ovirt.engine.core.common.businessentities.VdsStatistics; import org.ovirt.engine.core.common.config.Config; @@ -271,11 +270,11 @@ VdsDynamic vdsDynamic = new VdsDynamic(); vdsDynamic.setId(getParameters().getVdsStaticData().getId()); // TODO: oVirt type - here oVirt behaves like power client? - if (Config.<Boolean> GetValue(ConfigValues.InstallVds) - && getParameters().getVdsStaticData().getVdsType() == VDSType.VDS) { - vdsDynamic.setStatus(VDSStatus.Installing); - } else if (getParameters().getAddPending()) { + if (getParameters().getAddPending()) { vdsDynamic.setStatus(VDSStatus.PendingApproval); + } + else if (Config.<Boolean> GetValue(ConfigValues.InstallVds)) { + vdsDynamic.setStatus(VDSStatus.Installing); } DbFacade.getInstance().getVdsDynamicDao().save(vdsDynamic); getCompensationContext().snapshotNewEntity(vdsDynamic); @@ -416,7 +415,10 @@ protected boolean canConnect(VDS vds) { // execute the connectivity and id uniqueness validation for VDS type hosts - if (vds.getVdsType() == VDSType.VDS && Config.<Boolean> GetValue(ConfigValues.InstallVds)) { + if ( + !getParameters().getAddPending() && + Config.<Boolean> GetValue(ConfigValues.InstallVds) + ) { EngineSSHClient sshclient = null; try { sshclient = getSSHClient(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ApproveVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ApproveVdsCommand.java index 6b4f453..f2ff3b9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ApproveVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ApproveVdsCommand.java @@ -3,7 +3,6 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.ApproveVdsParameters; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBllMessages; @@ -22,9 +21,6 @@ boolean returnValue = true; if (getVds() == null) { addCanDoActionMessage(VdcBllMessages.VDS_APPROVE_VDS_NOT_FOUND); - returnValue = false; - } else if (getVds().getVdsType() != VDSType.oVirtNode) { - addCanDoActionMessage(VdcBllMessages.VDS_APPROVE_WRONG_VDS_TYPE); returnValue = false; } else if (getVds().getStatus() != VDSStatus.PendingApproval && getVds().getStatus() != VDSStatus.InstallFailed) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java index 7769571..9e87769 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java @@ -156,9 +156,7 @@ VDS vdsByUniqueId = getVdssByUniqueId().size() != 0 ? getVdssByUniqueId().get(0) : null; // in case oVirt host was added for the second time - perform approval - if (vdsByUniqueId != null && vdsByUniqueId.getStatus() == VDSStatus.PendingApproval - && getParameters().getVdsType() == VDSType.oVirtNode) { - + if (vdsByUniqueId != null && vdsByUniqueId.getStatus() == VDSStatus.PendingApproval) { getQueryReturnValue().setSucceeded(dispatchOvirtApprovalCommand(vdsByUniqueId.getId())); return; } @@ -285,13 +283,7 @@ getParameters().getSSHUser(), vdsGroupId, Guid.Empty, getParameters().getVdsName(), Config.<Boolean> GetValue(ConfigValues.SSLEnabled), - getParameters().getVdsType()); // management - // ip - // not - // currently - // passed - // by - // registration + VDSType.VDS); log.debugFormat( "RegisterVdsQuery::Register - Will try now to add VDS from scratch; Name: {0}, Hostname: {1}, Unique: {2}, VdsPort: {3},Subnet mask: {4}, IsPending: {5} with force synchronize", diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java index 67db599..7f9f8f2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java @@ -402,7 +402,6 @@ ERROR_CANNOT_ATTACH_ACTION_GROUP_TO_ROLE_ATTACHED(ErrorType.CONFLICT), ERROR_CANNOT_DETACH_ACTION_GROUP_TO_ROLE_NOT_ATTACHED(ErrorType.BAD_PARAMETERS), VDS_APPROVE_VDS_NOT_FOUND(ErrorType.BAD_PARAMETERS), - VDS_APPROVE_WRONG_VDS_TYPE(ErrorType.BAD_PARAMETERS), VDS_APPROVE_VDS_IN_WRONG_STATUS(ErrorType.CONFLICT), VDS_SHUTDOWN_VDS_NOT_FOUND(ErrorType.BAD_PARAMETERS), VDS_SHUTDOWN_NO_RESPONSE(ErrorType.CONFLICT), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java index b6a0900..1181e6e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java @@ -2,7 +2,6 @@ import java.io.Serializable; -import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.compat.Guid; public class RegisterVdsParameters extends VdcQueryParametersBase implements Serializable { @@ -68,16 +67,6 @@ privateVdsGroupId = value; } - private VDSType privateVdsType; - - public VDSType getVdsType() { - return privateVdsType; - } - - private void setVdsType(VDSType value) { - privateVdsType = value; - } - private int privateSSHPort; public int getSSHPort() { @@ -99,7 +88,7 @@ } public RegisterVdsParameters(Guid vdsId, String vds_host_name, int ssh_port, String ssh_user, String vds_name, String vds_unique_id, int vds_port, - Guid vds_group_id, VDSType vds_type) { + Guid vds_group_id) { setVdsId(vdsId); setVdsHostName(vds_host_name); setSSHPort(ssh_port); @@ -108,10 +97,8 @@ setVdsUniqueId(vds_unique_id); setVdsPort(vds_port); setVdsGroupId(vds_group_id); - setVdsType(vds_type); } public RegisterVdsParameters() { - privateVdsType = VDSType.VDS; } } 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 069562e..5f12379 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -384,8 +384,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=Cannot remove Role, invalid Role id. 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\ - -Please use New operation in order to install RHEL hosts. VDS_APPROVE_VDS_IN_WRONG_STATUS=Cannot approve RHEV Hypervisor Host.\n\ -Host must be in "Pending Approval" or "Install Failed" status in order to be approved. VDS_NEW_CLUSTER_ILLEGAL=Cannot update Host properties. Mismatch between Cluster CPU and Host CPU. diff --git a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java index c647c0c..779caaf 100644 --- a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java +++ b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java @@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletResponse; import org.ovirt.engine.core.bll.interfaces.BackendInternal; -import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.common.queries.RegisterVdsParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -71,7 +70,7 @@ */ String strIDNoMAC = strID.split("_")[0]; params = new RegisterVdsParameters(Guid.Empty, strIP, SSH_PORT, SSH_USER, strName, strIDNoMAC, nPort, - Guid.Empty, VDSType.oVirtNode); + Guid.Empty); fReturn = backend.runInternalQuery(VdcQueryType.RegisterVds, params); if (fReturn == null) { 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 7163e5b2..fd4fa6b 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 @@ -1069,9 +1069,6 @@ @DefaultStringValue("Cannot ${action} Role. Changing Role type is not allowed.") String ERROR_CANNOT_UPDATE_ROLE_TYPE(); - @DefaultStringValue("Cannot approve Host. Approve operation is applicable only on RHEV Hypervisor hosts.\n-Please use New operation in order to install RHEL hosts.") - String VDS_APPROVE_WRONG_VDS_TYPE(); - @DefaultStringValue("Cannot approve RHEV Hypervisor Host.\n-Host must be in \"Pending Approval\" or \"Install Failed\" status in order to be approved.") String VDS_APPROVE_VDS_IN_WRONG_STATUS(); 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 52a824f..ba5105d 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 @@ -365,8 +365,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=Cannot remove Role, invalid Role id. 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\ - -Please use New operation in order to install RHEL hosts. VDS_APPROVE_VDS_IN_WRONG_STATUS=Cannot approve RHEV Hypervisor Host.\n\ -Host must be in "Pending Approval" or "Install Failed" status in order to be approved. VDS_NEW_CLUSTER_ILLEGAL=Cannot update Host properties. Mismatch between Cluster CPU and Host CPU. diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties index 70ef28b..d148743 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties @@ -296,7 +296,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=Kann die Role nicht entfernen, ung\u00FCltige Role Id. ERROR_CANNOT_UPDATE_ROLE_ID=Kann nicht ${action} Role. \u00C4nderung der Role ID ist nicht zul\u00E4ssig. ERROR_CANNOT_UPDATE_ROLE_TYPE=Kann nicht ${action} Role. \u00C4nderung der Role Type ist nicht zul\u00E4ssig. -VDS_APPROVE_WRONG_VDS_TYPE=Kann Host nicht genehmigen. Genehmigungsvorgang ist nur anwendbar auf RHEV Hypervisor-Hosts. \n- Bitte verwenden Sie die New Operation, um RHEL-Hosts zu installieren. VDS_APPROVE_VDS_IN_WRONG_STATUS=Kann RHEV Hypervisor-Host nicht genehmigen. \n- Host muss in "Pending Approval" oder "Install Failed" Status sein, um zugelassen zu werden. VDS_NEW_CLUSTER_ILLEGAL=Kann Host Eigenschaften nicht aktualisieren. Diskrepanz zwischen Cluster-CPU und Host-CPU. VDS_CLUSTER_IS_NOT_VALID=Kann nicht ${action} ${type}. Cluster ID ung\u00FCltig. diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties index c544c93..9209fb0 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties @@ -300,7 +300,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=No se puede borrar el rol, id de rol inv\u00E1lido. ERROR_CANNOT_UPDATE_ROLE_ID=No se puede ${action} el rol. No se permite cambiar el id del rol. ERROR_CANNOT_UPDATE_ROLE_TYPE=No se puede ${action} el rol. No se permite cambiar el tipo del rol. -VDS_APPROVE_WRONG_VDS_TYPE=No se puede aprobar el host. La operaci\u00F3n de aprobaci\u00F3n es aplicable s\u00F3lamente en hosts del Hypervisor RHEV.\n-Use una nueva operaci\u00F3n con el fin de instalar hosts RHEL. VDS_APPROVE_VDS_IN_WRONG_STATUS=No se puede aprobar el host Hypervisor RHEV.\n-El host debe estar en estado de "Pending Approval" o "Install Failed" con el fin de aprobarlo. VDS_NEW_CLUSTER_ILLEGAL=No se pueden actualizar las propiedades del host. Las CPUs del cl\u00FAster y del host no coinciden. VDS_CLUSTER_IS_NOT_VALID=No se puede ${action} ${type}. El id del cl\u00FAster no es v\u00E1lido. diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties index 234eec0..2bfe6ef 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties @@ -296,7 +296,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=Impossible de supprimer le r\u00F4le, id de r\u00F4le non valide. ERROR_CANNOT_UPDATE_ROLE_ID=Impossible de ${action} R\u00F4le. Modifier l'ID du r\u00F4le n'est pas autoris\u00E9. ERROR_CANNOT_UPDATE_ROLE_TYPE=Impossible de ${action} R\u00F4le. Modifier le type du r\u00F4le n'est pas autoris\u00E9. -VDS_APPROVE_WRONG_VDS_TYPE=Impossible d'approuver l'h\u00F4te. L'op\u00E9ration \u00ABapprouver\u00BB ne s'applique qu'aux h\u00F4tes de l'Hyperviseur RHEV.\n-Veuillez utiliser la Nouvelle op\u00E9ration au lieu d'installer les h\u00F4tes RHEL. VDS_APPROVE_VDS_IN_WRONG_STATUS=Impossible d'approuver l'H\u00F4te d'hypervieur RHEV.\n- L'h\u00F4te doit poss\u00E9der le statut "Pending Approval (en attente d'acceptation) ou "Install Failed" (erreur d'installation) pour pouvoir \u00EAtre approuv\u00E9. VDS_NEW_CLUSTER_ILLEGAL=Impossible de mettre \u00E0 jour les propri\u00E9t\u00E9s de l'h\u00F4te. Mauvaise correspondance entre le CPU Cluster et CPU H\u00F4te. VDS_CLUSTER_IS_NOT_VALID=Impossible de ${action} ${type}. L'ID Cluster n'est pas valide. diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties index cc82633..4b89084 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties @@ -296,7 +296,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=\u30ED\u30FC\u30EB\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\u30ED\u30FC\u30EB\u306E ID \u304C\u7121\u52B9\u3067\u3059\u3002 ERROR_CANNOT_UPDATE_ROLE_ID=\u30ED\u30FC\u30EB\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30ED\u30FC\u30EB ID \u306E\u5909\u66F4\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 ERROR_CANNOT_UPDATE_ROLE_TYPE=\u30ED\u30FC\u30EB\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30ED\u30FC\u30EB\u30BF\u30A4\u30D7\u306E\u5909\u66F4\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 -VDS_APPROVE_WRONG_VDS_TYPE=\u30DB\u30B9\u30C8\u3092\u627F\u8A8D\u3067\u304D\u307E\u305B\u3093\u3002\u627F\u8A8D\u64CD\u4F5C\u306F RHEV Hypervisor \u30DB\u30B9\u30C8\u306E\u307F\u304C\u5BFE\u8C61\u3068\u306A\u308A\u307E\u3059\u3002\n- RHEL \u30DB\u30B9\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u884C\u3046\u306B\u306F\u3001\u65B0\u898F\u4F5C\u6210\u306E\u64CD\u4F5C\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002 VDS_APPROVE_VDS_IN_WRONG_STATUS=RHEV Hypervisor \u30DB\u30B9\u30C8\u3092\u627F\u8A8D\u3067\u304D\u307E\u305B\u3093\u3002\n- \u30DB\u30B9\u30C8\u3092\u627F\u8A8D\u3059\u308B\u306B\u306F\u3001\u30B9\u30C6\u30FC\u30BF\u30B9\u304C\u300CPending Approval\u300D\u307E\u305F\u306F\u300CInstall Failed\u300D\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 VDS_NEW_CLUSTER_ILLEGAL=\u30DB\u30B9\u30C8\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u66F4\u65B0\u3067\u304D\u307E\u305B\u3093\u3002\u30AF\u30E9\u30B9\u30BF\u30FC\u306E CPU \u3068\u30DB\u30B9\u30C8\u306E CPU \u304C\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002 VDS_CLUSTER_IS_NOT_VALID=${type}\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30AF\u30E9\u30B9\u30BF\u30FC ID \u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties index aa8c74a..432617f 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties @@ -263,7 +263,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=\uC5ED\uD560\uC744 \uC0AD\uC81C\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4, \uC5ED\uD560 ID\uAC00 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4. ERROR_CANNOT_UPDATE_ROLE_ID=\uC5ED\uD560\uC744 $ {action} \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC5ED\uD560 ID\uC758 \uBCC0\uACBD\uC740 \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. ERROR_CANNOT_UPDATE_ROLE_TYPE=\uC5ED\uD560\uC744 $ {action} \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC5ED\uD560 type\uC758 \uBCC0\uACBD\uC740 \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. -VDS_APPROVE_WRONG_VDS_TYPE=\uD638\uC2A4\uD2B8\uB97C \uC2B9\uC778\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC2B9\uC778 \uC791\uC5C5\uC740 RHEV Hypervisor \uD638\uC2A4\uD2B8\uC5D0\uB9CC \uC801\uC6A9\uB429\uB2C8\uB2E4. \n- RHEL \uD638\uC2A4\uD2B8\uB97C \uC124\uCE58\uD558\uB824\uBA74 \uC0C8\uB85C \uB9CC\uB4E4\uAE30 \uC791\uC5C5\uC744 \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624 VDS_APPROVE_VDS_IN_WRONG_STATUS=RHEV Hypervisor \uD638\uC2A4\uD2B8\uB97C \uC2B9\uC778\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n- \uD558\uC2A4\uD2B8\uB97C \uC2B9\uC778\uD558\uB824\uBA74 \uC0C1\uD0DC\uAC00 'Pending Approval' \uB610\uB294 'Install Failed' \uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. VDS_NEW_CLUSTER_ILLEGAL=\uD638\uC2A4\uD2B8\uC758 \uC18D\uC131\uC744 \uC5C5\uB370\uC774\uD2B8 \uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD074\uB7EC\uC2A4\uD130\uC758 CPU\uC640 \uD638\uC2A4\uD2B8\uC758 CPU\uAC00 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. VDS_CLUSTER_IS_NOT_VALID=${type}\uC744/\uB97C ${action} \uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD074\uB7EC\uC2A4\uD130 ID\uAC00 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties index db7c57f..5dea200 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties @@ -304,8 +304,6 @@ ERROR_CANNOT_UPDATE_ROLE_ID=N\u00E3o foi poss\u00EDvel ${action} a Fun\u00E7\u00E3o. A altera\u00E7\u00E3o da ID da Fun\u00E7\u00E3o n\u00E3o \u00E9 permitida. ERROR_CANNOT_UPDATE_ROLE_TYPE=N\u00E3o foi poss\u00EDvel ${action} a Fun\u00E7\u00E3o. A altera\u00E7\u00E3o do tipo da Fun\u00E7\u00E3o n\u00E3o \u00E9 permitida. # auto translated by TM merge -VDS_APPROVE_WRONG_VDS_TYPE=N\u00E3o foi poss\u00EDvel aprovar o Host. A opera\u00E7\u00E3o de aprova\u00E7\u00E3o \u00E9 aplic\u00E1vel apenas nos hosts do Hypervisor do RHEV.\n-Por favor use uma Nova opera\u00E7\u00E3o com o objetivo de instalar os hosts do RHEL. -# auto translated by TM merge VDS_APPROVE_VDS_IN_WRONG_STATUS=N\u00E3o foi poss\u00EDvel aprovar o Host do Hypervisor do RHEV.\n- O Host deve estar no status de "Pending Approval" ou "Install Failed" com o objetivo de ser aprovado. VDS_NEW_CLUSTER_ILLEGAL=N\u00E3o foi poss\u00EDvel atualizar as propriedades do Host. A CPU do Cluster e do Host n\u00E3o coincidem. # auto translated by TM merge diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties index 42e8315..29d399c 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties @@ -296,7 +296,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=\u65E0\u6CD5\u5220\u9664\u89D2\u8272\uFF0C\u65E0\u6548\u7684\u89D2\u8272 ID\u3002 ERROR_CANNOT_UPDATE_ROLE_ID=\u65E0\u6CD5 ${action} \u89D2\u8272\u3002\u4E0D\u5141\u8BB8\u4FEE\u6539\u89D2\u8272 ID\u3002 ERROR_CANNOT_UPDATE_ROLE_TYPE=\u65E0\u6CD5 ${action} \u89D2\u8272\u3002\u4E0D\u5141\u8BB8\u4FEE\u6539\u89D2\u8272\u7C7B\u578B\u3002 -VDS_APPROVE_WRONG_VDS_TYPE=\u65E0\u6CD5\u6279\u51C6\u4E3B\u673A\u3002\u6279\u51C6\u64CD\u4F5C\u53EA\u9002\u7528\u4E8E RHEV \u865A\u62DF\u4E3B\u673A\u3002\n- \u8BF7\u4F7F\u7528 New \u64CD\u4F5C\u6765\u5B89\u88C5 RHEL \u4E3B\u673A\u3002 VDS_APPROVE_VDS_IN_WRONG_STATUS=\u65E0\u6CD5\u6279\u51C6 RHEV \u865A\u62DF\u4E3B\u673A\u3002\n- \u8981\u88AB\u6279\u51C6\uFF0C\u4E3B\u673A\u5FC5\u987B\u5904\u4E8E "Pending Approval" \u6216 "Install Failed" \u72B6\u6001\u3002 VDS_NEW_CLUSTER_ILLEGAL=\u65E0\u6CD5\u66F4\u65B0\u4E3B\u673A\u5C5E\u6027\u3002\u7FA4\u96C6 CPU \u548C\u4E3B\u673A CPU \u4E0D\u5339\u914D\u3002 VDS_CLUSTER_IS_NOT_VALID=\u65E0\u6CD5 ${action} ${type}\u3002\u7FA4\u96C6 ID \u662F\u65E0\u6548\u7684\u3002 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 bbb11cf..b35ce35 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 @@ -388,8 +388,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=Cannot remove Role, invalid Role id. 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\ - -Please use New operation in order to install RHEL hosts. VDS_APPROVE_VDS_IN_WRONG_STATUS=Cannot approve RHEV Hypervisor Host.\n\ -Host must be in "Pending Approval" or "Install Failed" status in order to be approved. VDS_NEW_CLUSTER_ILLEGAL=Cannot update Host properties. Mismatch between Cluster CPU and Host CPU. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties index df06f25..3c0ff8c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties @@ -315,7 +315,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=Kann die Role nicht entfernen, ung\u00FCltige Role Id. ERROR_CANNOT_UPDATE_ROLE_ID=Kann nicht ${action} Role. \u00C4nderung der Role ID ist nicht zul\u00E4ssig. ERROR_CANNOT_UPDATE_ROLE_TYPE=Kann nicht ${action} Role. \u00C4nderung der Role Type ist nicht zul\u00E4ssig. -VDS_APPROVE_WRONG_VDS_TYPE=Kann Host nicht genehmigen. Genehmigungsvorgang ist nur anwendbar auf RHEV Hypervisor-Hosts.\n- Bitte verwenden Sie die New Operation, um RHEL-Hosts zu installieren. VDS_APPROVE_VDS_IN_WRONG_STATUS=Kann RHEV Hypervisor-Host nicht genehmigen.\n- Host muss in "Pending Approval" oder "Install Failed" Status sein, um zugelassen zu werden. VDS_NEW_CLUSTER_ILLEGAL=Kann Host Eigenschaften nicht aktualisieren. Diskrepanz zwischen Cluster-CPU und Host-CPU. VDS_CLUSTER_IS_NOT_VALID=Kann nicht ${action} ${type}. Cluster ID ung\u00FCltig. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties index 8c5000b..20f3f50 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties @@ -329,7 +329,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=No se puede borrar el rol, id de rol inv\u00E1lido. ERROR_CANNOT_UPDATE_ROLE_ID=No se puede ${action} el rol. No se permite cambiar el id del rol. ERROR_CANNOT_UPDATE_ROLE_TYPE=No se puede ${action} el rol. No se permite cambiar el tipo del rol. -VDS_APPROVE_WRONG_VDS_TYPE=No se puede aprobar el host. La operaci\u00F3n de aprobaci\u00F3n es aplicable s\u00F3lamente en hosts del Hypervisor RHEV.\n-Use una nueva operaci\u00F3n con el fin de instalar hosts RHEL. VDS_APPROVE_VDS_IN_WRONG_STATUS=No se puede aprobar el host Hypervisor RHEV.\n-El host debe estar en estado de "Pending Approval" o "Install Failed" con el fin de aprobarlo. VDS_NEW_CLUSTER_ILLEGAL=No se pueden actualizar las propiedades del host. Las CPUs del cl\u00FAster y del host no coinciden. VDS_CLUSTER_IS_NOT_VALID=No se puede ${action} ${type}. El id del cl\u00FAster no es v\u00E1lido. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties index 8fd024a..332ce22 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties @@ -557,8 +557,6 @@ # auto translated by TM merge ERROR_CANNOT_UPDATE_ROLE_TYPE=Impossible de ${action} R\u00F4le. Modifier le type du R\u00F4le n'est pas autoris\u00E9. # auto translated by TM merge -VDS_APPROVE_WRONG_VDS_TYPE=Impossible d'approuver l'H\u00F4te. L'op\u00E9ration \u00ABapprouve\u00BB ne s'applique qu'aux h\u00F4tes de l'Hyperviseur RHEV.\n-Veuillez utiliser l'op\u00E9ration \u00ABNew\u00BB au lieu d'installer les h\u00F4tes RHEL. -# auto translated by TM merge VDS_APPROVE_VDS_IN_WRONG_STATUS=Impossible d'approuver l'H\u00F4te Hypervieur RHEV.\n- L'h\u00F4te doit poss\u00E9der le statut "Pending Approval" (en attente d'acceptation) ou "Install Failed" (erreur d'installation) pour pouvoir \u00EAtre approuv\u00E9. # auto translated by TM merge VDS_NEW_CLUSTER_ILLEGAL=Impossible de mettre \u00E0 jour les propri\u00E9t\u00E9s de l'H\u00F4te. Mauvaise correspondance entre le CPU Cluster et CPU H\u00F4te. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties index 44b1418..87ab9e7 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties @@ -315,7 +315,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=\u30ED\u30FC\u30EB\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\u30ED\u30FC\u30EB\u306E ID \u304C\u7121\u52B9\u3067\u3059\u3002 ERROR_CANNOT_UPDATE_ROLE_ID=\u30ED\u30FC\u30EB\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30ED\u30FC\u30EB ID \u306E\u5909\u66F4\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 ERROR_CANNOT_UPDATE_ROLE_TYPE=\u30ED\u30FC\u30EB\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30ED\u30FC\u30EB\u30BF\u30A4\u30D7\u306E\u5909\u66F4\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 -VDS_APPROVE_WRONG_VDS_TYPE=\u30DB\u30B9\u30C8\u3092\u627F\u8A8D\u3067\u304D\u307E\u305B\u3093\u3002\u627F\u8A8D\u64CD\u4F5C\u306F RHEV Hypervisor \u30DB\u30B9\u30C8\u306E\u307F\u304C\u5BFE\u8C61\u3068\u306A\u308A\u307E\u3059\u3002\n- RHEL \u30DB\u30B9\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u884C\u3046\u306B\u306F\u3001\u65B0\u898F\u4F5C\u6210\u306E\u64CD\u4F5C\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002 VDS_APPROVE_VDS_IN_WRONG_STATUS=RHEV Hypervisor \u30DB\u30B9\u30C8\u3092\u627F\u8A8D\u3067\u304D\u307E\u305B\u3093\u3002.\n- \u30DB\u30B9\u30C8\u3092\u627F\u8A8D\u3059\u308B\u306B\u306F\u3001\u30B9\u30C6\u30FC\u30BF\u30B9\u304C\u300CPending Approval\u300D\u307E\u305F\u306F\u300CInstall Failed\u300D\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 VDS_NEW_CLUSTER_ILLEGAL=\u30DB\u30B9\u30C8\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u66F4\u65B0\u3067\u304D\u307E\u305B\u3093\u3002\u30AF\u30E9\u30B9\u30BF\u30FC\u306E CPU \u3068\u30DB\u30B9\u30C8\u306E CPU \u304C\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002 VDS_CLUSTER_IS_NOT_VALID=${type}\u3092${action}\u3067\u304D\u307E\u305B\u3093\u3002\u30AF\u30E9\u30B9\u30BF\u30FC ID \u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties index 0a3af4d..fcb497f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties @@ -261,7 +261,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=\uC5ED\uD560\uC744 \uC0AD\uC81C\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4, \uC5ED\uD560 ID\uAC00 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4. ERROR_CANNOT_UPDATE_ROLE_ID=\uC5ED\uD560\uC744 $ {action} \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC5ED\uD560 ID\uC758 \uBCC0\uACBD\uC740 \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. ERROR_CANNOT_UPDATE_ROLE_TYPE=\uC5ED\uD560\uC744 $ {action} \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC5ED\uD560 type\uC758 \uBCC0\uACBD\uC740 \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. -VDS_APPROVE_WRONG_VDS_TYPE=\uD638\uC2A4\uD2B8\uB97C \uC2B9\uC778\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC2B9\uC778 \uC791\uC5C5\uC740 RHEV Hypervisor \uD638\uC2A4\uD2B8\uC5D0\uB9CC \uC801\uC6A9\uB429\uB2C8\uB2E4.\n- RHEL \uD638\uC2A4\uD2B8\uB97C \uC124\uCE58\uD558\uB824\uBA74 \uC0C8\uB85C \uB9CC\uB4E4\uAE30 \uC791\uC5C5\uC744 \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624. VDS_APPROVE_VDS_IN_WRONG_STATUS=RHEV Hypervisor \uD638\uC2A4\uD2B8\uB97C \uC2B9\uC778\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n- \uD558\uC2A4\uD2B8\uB97C \uC2B9\uC778\uD558\uB824\uBA74 \uC0C1\uD0DC\uAC00 'Pending Approval' \uB610\uB294 'Install Failed' \uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. VDS_NEW_CLUSTER_ILLEGAL=\uD638\uC2A4\uD2B8\uC758 \uC18D\uC131\uC744 \uC5C5\uB370\uC774\uD2B8 \uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD074\uB7EC\uC2A4\uD130\uC758 CPU\uC640 \uD638\uC2A4\uD2B8\uC758 CPU\uAC00 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. VDS_CLUSTER_IS_NOT_VALID=${type}\uC744/\uB97C ${action} \uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD074\uB7EC\uC2A4\uD130 ID\uAC00 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties index f31dc1d..6adbb7e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties @@ -329,7 +329,6 @@ ERROR_CANNOT_REMOVE_ROLE_INVALID_ROLE_ID=N\u00E3o foi poss\u00EDvel remover a Fun\u00E7\u00E3o, a id da Fun\u00E7\u00E3o est\u00E1 inv\u00E1lida. ERROR_CANNOT_UPDATE_ROLE_ID=N\u00E3o foi poss\u00EDvel ${action} a Fun\u00E7\u00E3o. A altera\u00E7\u00E3o da ID da Fun\u00E7\u00E3o n\u00E3o \u00E9 permitida. ERROR_CANNOT_UPDATE_ROLE_TYPE=N\u00E3o foi poss\u00EDvel ${action} a Fun\u00E7\u00E3o. A altera\u00E7\u00E3o do tipo da Fun\u00E7\u00E3o n\u00E3o \u00E9 permitida. -VDS_APPROVE_WRONG_VDS_TYPE=N\u00E3o foi poss\u00EDvel aprovar o Host. A opera\u00E7\u00E3o de aprova\u00E7\u00E3o \u00E9 aplic\u00E1vel apenas nos hosts do Hypervisor do RHEV.\n-Por favor use uma Nova opera\u00E7\u00E3o com o objetivo de instalar os hosts do RHEL. VDS_APPROVE_VDS_IN_WRONG_STATUS=N\u00E3o foi poss\u00EDvel aprovar o Host do Hypervisor do RHEV.\n- O Host deve estar no status de "Pending Approval" ou "Install Failed" com o objetivo de ser aprovado. VDS_NEW_CLUSTER_ILLEGAL=N\u00E3o foi poss\u00EDvel atualizar as propriedades do Host. A CPU do Cluster e do Host n\u00E3o coincidem. VDS_CLUSTER_IS_NOT_VALID=N\u00E3o foi poss\u00EDvel ${action} ${type}. A ID do cluster est\u00E1 inv\u00E1lida. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties index f6e234b..af2a4dd 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties @@ -544,8 +544,6 @@ # auto translated by TM merge ERROR_CANNOT_UPDATE_ROLE_TYPE=\u65E0\u6CD5 ${action} \u89D2\u8272\u3002\u4E0D\u5141\u8BB8\u4FEE\u6539\u89D2\u8272\u7C7B\u578B\u3002 # auto translated by TM merge -VDS_APPROVE_WRONG_VDS_TYPE=\u65E0\u6CD5\u6279\u51C6\u4E3B\u673A\u3002\u6279\u51C6\u64CD\u4F5C\u53EA\u9002\u7528\u4E8E RHEV \u865A\u62DF\u4E3B\u673A\u3002\n- \u8BF7\u4F7F\u7528 New \u64CD\u4F5C\u6765\u5B89\u88C5 RHEL \u4E3B\u673A\u3002 -# auto translated by TM merge VDS_APPROVE_VDS_IN_WRONG_STATUS=\u65E0\u6CD5\u6279\u51C6 RHEV \u865A\u62DF\u4E3B\u673A\u3002\n- \u8981\u88AB\u6279\u51C6\uFF0C\u4E3B\u673A\u5FC5\u987B\u5904\u4E8E "Pending Approval" \u6216 "Install Failed" \u72B6\u6001\u3002 # auto translated by TM merge VDS_NEW_CLUSTER_ILLEGAL=\u65E0\u6CD5\u66F4\u65B0\u4E3B\u673A\u5C5E\u6027\u3002\u7FA4\u96C6 CPU \u548C\u4E3B\u673A CPU \u4E0D\u5339\u914D\u3002 -- To view, visit http://gerrit.ovirt.org/20611 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2449527d7dba92179e22ddc97521841b3e02010 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
