Tomas Jelinek has uploaded a new change for review. Change subject: engine: added missing devices to edit template ......................................................................
engine: added missing devices to edit template It was not possible to edit virtio-scsi and mem balloon for the template. This patch adds it. Change-Id: I286575e8b84881bf49d71e30cfdcb4f3d61475c7 Signed-off-by: Tomas Jelinek <[email protected]> --- 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/utils/VmDeviceUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmTemplateParametersBase.java 4 files changed, 32 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/25260/1 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 d426c06..d19c188 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 @@ -219,6 +219,8 @@ getParameters().isSoundDeviceEnabled()); VmDeviceUtils.updateConsoleDevice(getVmTemplateId(), getParameters().isConsoleEnabled()); + VmDeviceUtils.updateVirtioScsiController(getVmTemplateId(), getParameters().isVirtioScsiEnabled()); + VmDeviceUtils.updateMemoryBalloon(getVmTemplateId(), getParameters().isBalloonEnabled()); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java index b074c96..d49d558 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java @@ -88,7 +88,7 @@ } } updateUSBSlots(oldVmBase, entity); - updateMemoryBalloon(oldVmBase, entity, params.isBalloonEnabled()); + updateMemoryBalloon(entity, params.isBalloonEnabled()); updateAudioDevice(oldVm.getStaticData(), entity, oldVm.getVdsGroupCompatibilityVersion(), params.isSoundDeviceEnabled()); updateSmartcardDevice(oldVm, entity); updateConsoleDevice(entity, params.isConsoleEnabled()); @@ -298,7 +298,7 @@ // updating USB slots updateUSBSlots(null, vmBase); // add mem balloon if defined - updateMemoryBalloon(null, vmBase, isBalloonEnabled); + updateMemoryBalloon(vmBase, isBalloonEnabled); } switch(device.getType()) { @@ -969,23 +969,27 @@ null); } - private static void updateMemoryBalloon(VmBase oldVm, VmBase newVm, boolean shouldHaveBalloon) { - Guid id = newVm.getId(); + private static void updateMemoryBalloon(VmBase newVm, boolean shouldHaveBalloon) { + updateMemoryBalloon(newVm.getId(), shouldHaveBalloon); + + } + + public static void updateMemoryBalloon(Guid id, boolean shouldHaveBalloon) { boolean hasBalloon = dao.isMemBalloonEnabled(id); if (hasBalloon != shouldHaveBalloon) { if (!hasBalloon && shouldHaveBalloon) { // add a balloon device Map<String, Object> specParams = new HashMap<String, Object>(); specParams.put(VdsProperties.Model, VdsProperties.Virtio); - addManagedDevice(new VmDeviceId(Guid.newGuid(), newVm.getId()) , VmDeviceGeneralType.BALLOON, VmDeviceType.MEMBALLOON, specParams, true, true, null); + addManagedDevice(new VmDeviceId(Guid.newGuid(), id) , VmDeviceGeneralType.BALLOON, VmDeviceType.MEMBALLOON, specParams, true, true, null); } else { // remove the balloon device List<VmDevice> list = DbFacade - .getInstance() - .getVmDeviceDao() - .getVmDeviceByVmIdAndType(newVm.getId(), - VmDeviceGeneralType.BALLOON); + .getInstance() + .getVmDeviceDao() + .getVmDeviceByVmIdAndType(id, + VmDeviceGeneralType.BALLOON); removeNumberOfDevices(list, 1); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java index d8d31f1..f5767ab 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateParameters.java @@ -49,10 +49,6 @@ private Boolean consoleEnabled; - private Boolean virtioScsiEnabled; - - private boolean balloonEnabled; - private String templateVersionName; private Guid baseTemplateId; @@ -151,14 +147,6 @@ this.copyVmPermissions = copyVmPermissions; } - public Boolean isVirtioScsiEnabled() { - return virtioScsiEnabled; - } - - public void setVirtioScsiEnabled(Boolean virtioScsiEnabled) { - this.virtioScsiEnabled = virtioScsiEnabled; - } - public VmEntityType getTemplateType() { return templateType; } @@ -183,11 +171,4 @@ this.baseTemplateId = baseTemplateId; } - public boolean isBalloonEnabled() { - return balloonEnabled; - } - - public void setBalloonEnabled(boolean balloonEnabled) { - this.balloonEnabled = balloonEnabled; - } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmTemplateParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmTemplateParametersBase.java index 64fc221..57150d9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmTemplateParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmTemplateParametersBase.java @@ -12,6 +12,9 @@ private Guid quotaId; private boolean privateCheckDisksExists; private VmWatchdog watchdog; + private Boolean virtioScsiEnabled; + private boolean balloonEnabled; + /* * see VmManagementParametersBase#updateWatchdog for details */ @@ -80,5 +83,19 @@ this.updateWatchdog = updateWatchdog; } + public Boolean isVirtioScsiEnabled() { + return virtioScsiEnabled; + } + public void setVirtioScsiEnabled(Boolean virtioScsiEnabled) { + this.virtioScsiEnabled = virtioScsiEnabled; + } + + public boolean isBalloonEnabled() { + return balloonEnabled; + } + + public void setBalloonEnabled(boolean balloonEnabled) { + this.balloonEnabled = balloonEnabled; + } } -- To view, visit http://gerrit.ovirt.org/25260 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I286575e8b84881bf49d71e30cfdcb4f3d61475c7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
