Roy Golan has uploaded a new change for review. Change subject: core: log instead of CanDo on illegal memory value ......................................................................
core: log instead of CanDo on illegal memory value Change-Id: I6ab029a1bec86cac86b0e29a8e9aaa38bcdf6c87 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1014952 Signed-off-by: Roy Golan <rgo...@redhat.com> --- 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/UpdateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/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 14 files changed, 47 insertions(+), 81 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/20327/1 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 9ec850a..926dc4b 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 @@ -537,6 +537,8 @@ @Override protected void executeVmCommand() { + VmHandler.warnMemorySizeLegal(getParameters().getVm().getStaticData(), getVdsGroup().getcompatibility_version()); + ArrayList<String> errorMessages = new ArrayList<String>(); if (canAddVm(errorMessages, destStorages.values())) { TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @@ -638,10 +640,6 @@ if (!validatePinningAndMigration(reasons, vmStaticData, getParameters().getVm().getCpuPinning())) { returnValue = false; } - - returnValue = returnValue - && VmHandler.isMemorySizeLegal(vmStaticData.getOsId(), vmStaticData.getMemSizeMb(), - reasons, getVdsGroup().getcompatibility_version()); } return returnValue; 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 3ed7e4f..6a53fa6 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 @@ -231,6 +231,8 @@ } }); + VmHandler.warnMemorySizeLegal(getVmTemplate(), getVdsGroup().getcompatibility_version()); + // means that there are no asynchronous tasks to execute and that we can // end the command synchronously boolean pendingAsyncTasks = !getReturnValue().getVdsmTaskIdList().isEmpty(); @@ -243,11 +245,6 @@ protected boolean canDoAction() { if (getVdsGroup() == null) { addCanDoActionMessage(VdcBllMessages.VDS_CLUSTER_IS_NOT_VALID); - return false; - } - if (!VmHandler.isMemorySizeLegal(getParameters().getMasterVm().getOsId(), - getParameters().getMasterVm().getMemSizeMb(), - getReturnValue().getCanDoActionMessages(), getVdsGroup().getcompatibility_version())) { return false; } if (!isVmPriorityValueLegal(getParameters().getMasterVm().getPriority(), getReturnValue() 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 01dc391..747e101 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 @@ -23,7 +23,6 @@ import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainType; -import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VmPool; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.businessentities.VmType; @@ -35,7 +34,6 @@ import org.ovirt.engine.core.common.osinfo.OsRepository; import org.ovirt.engine.core.common.utils.SimpleDependecyInjector; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.dal.job.ExecutionMessageDirector; @@ -76,6 +74,7 @@ if (diskInfoDestinationMap == null) { diskInfoDestinationMap = new HashMap<Guid, DiskImage>(); } + setVdsGroupId(parameters.getVmPool().getVdsGroupId()); } protected void initTemplate() { @@ -92,6 +91,8 @@ */ @Override protected void executeCommand() { + VmHandler.warnMemorySizeLegal(getParameters().getVmStaticData(), getVdsGroup().getcompatibility_version()); + Guid poolId = getPoolId(); boolean isAtLeastOneVMCreationFailed = false; setActionReturnValue(poolId); @@ -187,13 +188,9 @@ @Override protected boolean canDoAction() { - VDSGroup grp = getVdsGroupDAO().get(getParameters().getVmPool().getVdsGroupId()); - if (grp == null) { - addCanDoActionMessage(VdcBllMessages.VDS_CLUSTER_IS_NOT_VALID); - return false; - } - if (!isMemorySizeLegal(grp.getcompatibility_version())) { + if (getVdsGroup() == null) { + addCanDoActionMessage(VdcBllMessages.VDS_CLUSTER_IS_NOT_VALID); return false; } @@ -204,7 +201,7 @@ addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED); return false; } - setStoragePoolId(grp.getStoragePoolId()); + setStoragePoolId(getVdsGroup().getStoragePoolId()); if (!validate(new StoragePoolValidator(getStoragePool()).isUp())) { return false; @@ -244,20 +241,11 @@ } if (Boolean.TRUE.equals(getParameters().isVirtioScsiEnabled()) && - !FeatureSupported.virtIoScsi(grp.getcompatibility_version())) { + !FeatureSupported.virtIoScsi(getVdsGroup().getcompatibility_version())) { return failCanDoAction(VdcBllMessages.VIRTIO_SCSI_INTERFACE_IS_NOT_AVAILABLE_FOR_CLUSTER_LEVEL); } return checkFreeSpaceAndTypeOnDestDomains(); - } - - protected boolean isMemorySizeLegal(Version version) { - VmStatic vmStaticData = getParameters().getVmStaticData(); - return VmHandler.isMemorySizeLegal - (vmStaticData.getOsId(), - vmStaticData.getMemSizeMb(), - getReturnValue().getCanDoActionMessages(), - version); } protected boolean verifyAddVM() { 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 95459f2..ed78f79 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 @@ -80,6 +80,7 @@ @Override protected void executeVmCommand() { oldVm = getVm(); + VmHandler.warnMemorySizeLegal(getParameters().getVm().getStaticData(), getVdsGroup().getcompatibility_version()); getVmStaticDAO().incrementDbGeneration(getVm().getId()); VmStatic newVmStatic = getParameters().getVmStaticData(); newVmStatic.setCreationDate(oldVm.getStaticData().getCreationDate()); @@ -249,12 +250,6 @@ if (!validationErrors.isEmpty()) { VmPropertiesUtils.getInstance().handleCustomPropertiesError(validationErrors, getReturnValue().getCanDoActionMessages()); - return false; - } - - if (!VmHandler.isMemorySizeLegal(vmFromParams.getOs(), - vmFromParams.getMemSizeMb(), getReturnValue().getCanDoActionMessages(), - getVdsGroup().getcompatibility_version())) { 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 e030ee9..66aeb58 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 @@ -69,19 +69,13 @@ } else { if (getVdsGroup() == null) { addCanDoActionMessage(VdcBllMessages.VMT_CLUSTER_IS_NOT_VALID); - } else if (VmHandler.isMemorySizeLegal(mOldTemplate.getOsId(), - mOldTemplate.getMemSizeMb(), - getReturnValue() - .getCanDoActionMessages(), - getVdsGroup().getcompatibility_version())) { - if (isVmPriorityValueLegal(getParameters().getVmTemplateData().getPriority(), getReturnValue() - .getCanDoActionMessages()) - && isDomainLegal(getParameters().getVmTemplateData().getDomain(), getReturnValue() - .getCanDoActionMessages())) { - returnValue = VmTemplateHandler.isUpdateValid(mOldTemplate, getVmTemplate()); - if (!returnValue) { - addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_UPDATE_ILLEGAL_FIELD); - } + } else if (isVmPriorityValueLegal(getParameters().getVmTemplateData().getPriority(), getReturnValue() + .getCanDoActionMessages()) + && isDomainLegal(getParameters().getVmTemplateData().getDomain(), getReturnValue() + .getCanDoActionMessages())) { + returnValue = VmTemplateHandler.isUpdateValid(mOldTemplate, getVmTemplate()); + if (!returnValue) { + addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_UPDATE_ILLEGAL_FIELD); } } } @@ -110,6 +104,9 @@ @Override protected void executeCommand() { + VmHandler.warnMemorySizeLegal(getParameters().getVmTemplateData(), + getVdsGroup().getcompatibility_version()); + if (getVmTemplate() != null) { getVmStaticDAO().incrementDbGeneration(getVmTemplate().getId()); UpdateVmTemplate(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index faa06e4..0c26348 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -324,26 +324,21 @@ /** * Checks the validity of the given memory size according to OS type. * - * @param osId - * Type of the os. - * @param memSizeInMB - * The mem size in MB. - * @param reasons - * The reasons.VdsGroups + * @param vm + * a vm|template. + * @param clusterVersion + * the vm's cluster version. * @return */ - public static boolean isMemorySizeLegal(int osId, - int memSizeInMB, - List<String> reasons, - Version clusterVersion) { - boolean result = VmValidationUtils.isMemorySizeLegal(osId, memSizeInMB, clusterVersion); - if (!result) { - reasons.add(VdcBllMessages.ACTION_TYPE_FAILED_ILLEGAL_MEMORY_SIZE.toString()); - reasons.add(String.format("$minMemorySize %s", VmValidationUtils.getMinMemorySizeInMb(osId, clusterVersion))); - reasons.add(String.format("$maxMemorySize %s", - VmValidationUtils.getMaxMemorySizeInMb(osId, clusterVersion))); + public static void warnMemorySizeLegal(VmBase vm, Version clusterVersion) { + if (! VmValidationUtils.isMemorySizeLegal(vm.getOsId(), vm.getMemSizeMb(), clusterVersion)) { + log.warnFormat("RAM value {0}mb for {1} is exceeding the recommended values {2}mb - {3}mb for {4}", + vm.getMemSizeMb(), + vm.getName(), + VmValidationUtils.getMinMemorySizeInMb(vm.getOsId(), clusterVersion), + VmValidationUtils.getMaxMemorySizeInMb(vm.getOsId(), clusterVersion), + osRepository.getOsName(vm.getOsId())); } - return result; } /** diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java index d943114..b8deadd 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java @@ -47,6 +47,8 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend; +import org.ovirt.engine.core.common.osinfo.OsRepository; +import org.ovirt.engine.core.common.utils.SimpleDependecyInjector; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSParametersBase; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; @@ -99,11 +101,15 @@ @Mock SnapshotDao snapshotDao; + @Mock + OsRepository osRepository; + @Test public void create10GBVmWith11GbAvailableAndA5GbBuffer() throws Exception { VM vm = createVm(); AddVmFromTemplateCommand<AddVmFromTemplateParameters> cmd = createVmFromTemplateCommand(vm); + mockOsRepository(); mockStorageDomainDAOGetForStoragePool(); mockVmTemplateDAOReturnVmTemplate(); mockDiskImageDAOGetSnapshotById(); @@ -121,6 +127,10 @@ .contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN.toString())); } + private void mockOsRepository() { + SimpleDependecyInjector.getInstance().bind(OsRepository.class, osRepository); + } + @Test public void canAddVm() { ArrayList<String> reasons = new ArrayList<String>(); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java index 0b6de67..b265bcf 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java @@ -126,7 +126,6 @@ protected void setUpCommand() { command = createCommand(); doReturn(true).when(command).areTemplateImagesInStorageReady(any(Guid.class)); - doReturn(true).when(command).isMemorySizeLegal(any(Version.class)); doReturn(true).when(command).verifyAddVM(); } 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 8316308..94c4c11 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 @@ -147,15 +147,6 @@ } @Test - public void testInvalidMemory() { - prepareVmToPassCanDoAction(); - vmStatic.setMemSizeMb(99999); - - assertFalse("canDoAction should have failed with invalid memory.", command.canDoAction()); - assertCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_ILLEGAL_MEMORY_SIZE); - } - - @Test public void testDedicatedHostNotExist() { prepareVmToPassCanDoAction(); 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 ec700a2..5eb0ed0 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 @@ -210,7 +210,6 @@ ACTION_TYPE_FAILED_VDS_WITH_INVALID_SSH_PORT(ErrorType.BAD_PARAMETERS), ACTION_TYPE_FAILED_VDS_WITH_INVALID_SSH_USERNAME(ErrorType.BAD_PARAMETERS), ACTION_TYPE_FAILED_VDS_WITH_SAME_UUID_EXIST(ErrorType.CONFLICT), - ACTION_TYPE_FAILED_ILLEGAL_MEMORY_SIZE(ErrorType.CONSTRAINT_VIOLATION), ACTION_TYPE_FAILED_ILLEGAL_NUM_OF_MONITORS(ErrorType.BAD_PARAMETERS), ACTION_TYPE_FAILED_ILLEGAL_SINGLE_DEVICE_DISPLAY_TYPE(ErrorType.BAD_PARAMETERS), ACTION_TYPE_FAILED_ILLEGAL_SINGLE_DEVICE_OS_TYPE(ErrorType.BAD_PARAMETERS), 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 136179a..08efa39 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -572,7 +572,7 @@ ACTION_TYPE_FAILED_VDS_WITH_INVALID_SSH_PORT=Cannot ${action} ${type}. Invalid SSH port was entered. ACTION_TYPE_FAILED_VDS_WITH_INVALID_SSH_USERNAME=Cannot ${action} ${type}. Invalid SSH user name was entered. ACTION_TYPE_FAILED_VDS_WITH_SAME_UUID_EXIST=Cannot ${action} ${type}. Host with the same UUID already exists. -ACTION_TYPE_FAILED_ILLEGAL_MEMORY_SIZE=Cannot ${action} ${type}. Illegal memory size is provided, size needs to be between ${minMemorySize} MB and ${maxMemorySize} MB. + ACTION_TYPE_FAILED_ILLEGAL_NUM_OF_MONITORS=Cannot ${action} ${type}. Illegal number of monitors is provided, max allowed number of monitors is 1 for VNC and the max number in the ValidNumOfMonitors configuration variable for SPICE. ACTION_TYPE_FAILED_ILLEGAL_SINGLE_DEVICE_OS_TYPE=Cannot ${action} ${type}. Cannot set single display device to non Linux operating system. ACTION_TYPE_FAILED_ILLEGAL_SINGLE_DEVICE_DISPLAY_TYPE=Cannot ${action} ${type}. Cannot set single display device via VNC display. 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 1cb765d..7882c73 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 @@ -1552,9 +1552,6 @@ @DefaultStringValue("Cannot ${action} ${type}. Host with the same UUID already exists.") String ACTION_TYPE_FAILED_VDS_WITH_SAME_UUID_EXIST(); - @DefaultStringValue("Cannot ${action} ${type}. Illegal memory size is provided, size needs to be between ${minMemorySize} MB and ${maxMemorySize} MB.") - String ACTION_TYPE_FAILED_ILLEGAL_MEMORY_SIZE(); - @DefaultStringValue("Cannot ${action} ${type}. Illegal number of monitors is provided, max allowed number of monitors is 1 for VNC and the max number in the ValidNumOfMonitors configuration variable for SPICE.") String ACTION_TYPE_FAILED_ILLEGAL_NUM_OF_MONITORS(); 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 ed7926a..17347f6 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 @@ -556,7 +556,7 @@ ACTION_TYPE_FAILED_VDS_WITH_INVALID_SSH_PORT=Cannot ${action} ${type}. Invalid SSH port was entered. ACTION_TYPE_FAILED_VDS_WITH_INVALID_SSH_USERNAME=Cannot ${action} ${type}. Invalid SSH user name was entered. ACTION_TYPE_FAILED_VDS_WITH_SAME_UUID_EXIST=Cannot ${action} ${type}. Host with the same UUID already exists. -ACTION_TYPE_FAILED_ILLEGAL_MEMORY_SIZE=Cannot ${action} ${type}. Illegal memory size is provided, size needs to be between ${minMemorySize} MB and ${maxMemorySize} MB. + ACTION_TYPE_FAILED_ILLEGAL_NUM_OF_MONITORS=Cannot ${action} ${type}. Illegal number of monitors is provided, max allowed number of monitors is 1 for VNC and the max number in the ValidNumOfMonitors configuration variable for SPICE. ACTION_TYPE_FAILED_ILLEGAL_SINGLE_DEVICE_OS_TYPE=Cannot ${action} ${type}. Cannot set single display device to non Linux operating system. ACTION_TYPE_FAILED_ILLEGAL_SINGLE_DEVICE_DISPLAY_TYPE=Cannot ${action} ${type}. Cannot set single display device via VNC display. 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 4f5cb03..4a6ec0c 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 @@ -576,7 +576,7 @@ ACTION_TYPE_FAILED_VDS_WITH_INVALID_SSH_PORT=Cannot ${action} ${type}. Invalid SSH port was entered. ACTION_TYPE_FAILED_VDS_WITH_INVALID_SSH_USERNAME=Cannot ${action} ${type}. Invalid SSH user name was entered. ACTION_TYPE_FAILED_VDS_WITH_SAME_UUID_EXIST=Cannot ${action} ${type}. Host with the same UUID already exists. -ACTION_TYPE_FAILED_ILLEGAL_MEMORY_SIZE=Cannot ${action} ${type}. Illegal memory size is provided, size needs to be between ${minMemorySize} MB and ${maxMemorySize} MB. + ACTION_TYPE_FAILED_ILLEGAL_NUM_OF_MONITORS=Cannot ${action} ${type}. Illegal number of monitors is provided, max allowed number of monitors is 1 for VNC and the max number in the ValidNumOfMonitors configuration variable for SPICE. ACTION_TYPE_FAILED_ILLEGAL_SINGLE_DEVICE_OS_TYPE=Cannot ${action} ${type}. Cannot set single display device to non Linux operating system. ACTION_TYPE_FAILED_ILLEGAL_SINGLE_DEVICE_DISPLAY_TYPE=Cannot ${action} ${type}. Cannot set single display device via VNC display. -- To view, visit http://gerrit.ovirt.org/20327 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ab029a1bec86cac86b0e29a8e9aaa38bcdf6c87 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Roy Golan <rgo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
