Vitor de Lima has uploaded a new change for review. Change subject: core, engine, userportal, webadmin: Fix balloon device presence in VM pools ......................................................................
core, engine, userportal, webadmin: Fix balloon device presence in VM pools During the creation of VM pools the balloon device was enabled regardless if the user disabled it in the VM Pool Dialog. This patch fixes this bug. Change-Id: I379532f2a62ff16d8d11f34d62896125569197a1 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1150777 Signed-off-by: Vitor de Lima <vdel...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmPoolWithVmsParameters.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java 5 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/34009/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java index 3e42db2..8fe81f5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java @@ -76,6 +76,7 @@ parameters.setSoundDeviceEnabled(getParameters().isSoundDeviceEnabled()); parameters.setConsoleEnabled(getParameters().isConsoleEnabled()); parameters.setVirtioScsiEnabled(getParameters().isVirtioScsiEnabled()); + parameters.setBalloonEnabled(getParameters().isBalloonEnabled()); if (getParameters().isUpdateRngDevice()) { parameters.setUpdateRngDevice(true); 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 97bed22..8f78f5f 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 @@ -185,6 +185,7 @@ : VmType.Desktop == getParameters().getVmStaticData().getVmType()); parameters.setConsoleEnabled(getParameters().isConsoleEnabled()); parameters.setVirtioScsiEnabled(getParameters().isVirtioScsiEnabled()); + parameters.setBalloonEnabled(getParameters().isBalloonEnabled()); VmRngDevice rngDevice = getParameters().getRngDevice(); if (rngDevice != null) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmPoolWithVmsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmPoolWithVmsParameters.java index e78aefc..21e651d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmPoolWithVmsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmPoolWithVmsParameters.java @@ -22,6 +22,7 @@ private Boolean soundDeviceEnabled; private Boolean consoleEnabled; private Boolean virtioScsiEnabled; + private boolean balloonEnabled; private VmRngDevice rngDevice; public AddVmPoolWithVmsParameters() { @@ -87,4 +88,12 @@ public void setRngDevice(VmRngDevice rngDevice) { this.rngDevice = rngDevice; } + + public boolean isBalloonEnabled() { + return balloonEnabled; + } + + public void setBalloonEnabled(boolean isBallonEnabled) { + this.balloonEnabled = isBallonEnabled; + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java index 91e4bcd..6ceb87a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java @@ -453,6 +453,7 @@ VM vm = buildVmOnSave(model); vm.setVmInit(model.getVmInitModel().buildCloudInitParameters(model)); + vm.setBalloonEnabled(model.getMemoryBalloonDeviceEnabled().getEntity()); vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(model.getTemplate().getSelectedItem().getTemplateVersionName())); vm.setStateless(false); @@ -471,6 +472,8 @@ param.setRngDevice(model.getIsRngEnabled().getEntity() ? model.generateRngDevice() : null); param.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity()); + param.setBalloonEnabled(model.getMemoryBalloonDeviceEnabled().getEntity()); + if (model.getQuota().getSelectedItem() != null) { vm.setQuotaId(model.getQuota().getSelectedItem().getId()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index 4d95ef1..c201e29 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -1398,6 +1398,7 @@ addVmTemplateParameters.setDiskInfoDestinationMap( model.getDisksAllocationModel().getImageToDestinationDomainMap()); addVmTemplateParameters.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity()); + addVmTemplateParameters.setBalloonEnabled(balloonEnabled(model)); addVmTemplateParameters.setCopyVmPermissions(model.getCopyPermissions().getEntity()); model.startProgress(null); addVmTemplateParameters.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity()); -- To view, visit http://gerrit.ovirt.org/34009 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I379532f2a62ff16d8d11f34d62896125569197a1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Vitor de Lima <vdel...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
