Gustavo Frederico Temple Pedrosa has uploaded a new change for review.
Change subject: core: [Fix] Disabled Balloon in Add Vm
......................................................................
core: [Fix] Disabled Balloon in Add Vm
Currently, it is impossible to add a VM with balloon disabled
(REST/UI), this change fixes this bug.
Change-Id: I508ff77c1e309be0b492f46c31311e03f33fc728
Signed-off-by: Gustavo Pedrosa <gustavo.pedr...@eldorado.org.br>
---
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/AddVmFromSnapshotCommand.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/utils/VmDeviceUtils.java
4 files changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/22943/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 02b8b63..bf8e8e9 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
@@ -302,7 +302,7 @@
getVmDisks(),
isVirtioScsiEnabled(),
hasWatchdog(),
- getParameters().isBalloonEnabled(),
+ isBalloonEnabled(),
getParameters().isSoundDeviceEnabled(),
getReturnValue().getCanDoActionMessages())
&& canAddVm(getReturnValue().getCanDoActionMessages(),
destStorages.values())
@@ -706,7 +706,9 @@
getSrcDeviceIdToTargetDeviceIdMapping(),
getParameters().isSoundDeviceEnabled(),
getParameters().isConsoleEnabled(),
- isVirtioScsiEnabled(), false);
+ isVirtioScsiEnabled(),
+ isBalloonEnabled(),
+ false);
}
protected static boolean isLegalClusterId(Guid clusterId, List<String>
reasons) {
@@ -1084,6 +1086,10 @@
FeatureSupported.virtIoScsi(getVdsGroup().getcompatibility_version());
}
+ protected boolean isBalloonEnabled() {
+ return getParameters().isBalloonEnabled();
+ }
+
protected boolean hasWatchdog() {
return getParameters().getWatchdog() != null;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
index a0d4651..bd9b863 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
@@ -271,6 +271,7 @@
getParameters().isSoundDeviceEnabled(),
getParameters().isConsoleEnabled(),
isVirtioScsiEnabled(),
+ isBalloonEnabled(),
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 63be43c..773d716 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
@@ -218,6 +218,7 @@
getParameters().isSoundDeviceEnabled(),
getParameters().isConsoleEnabled(),
getParameters().isVirtioScsiEnabled(),
+ VmDeviceUtils.isBalloonEnabled(getVmId()),
false);
} else {
// sending true for isVm in order to create basic devices
needed
@@ -231,6 +232,7 @@
getParameters().isSoundDeviceEnabled(),
getParameters().isConsoleEnabled(),
getParameters().isVirtioScsiEnabled(),
+ getVm().isBalloonEnabled(),
false);
}
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 c965046..ab86489 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
@@ -269,6 +269,7 @@
boolean soundDeviceEnabled,
boolean isConsoleEnabled,
Boolean isVirtioScsiEnabled,
+ boolean isBalloonEnabled,
boolean copySnapshotDevices) {
Guid id;
String isoPath=vmBase.getIsoPath();
@@ -297,7 +298,7 @@
// updating USB slots
updateUSBSlots(null, vmBase);
// add mem balloon if defined
- updateMemoryBalloon(null, vmBase, vm.isBalloonEnabled());
+ updateMemoryBalloon(null, vmBase, isBalloonEnabled);
}
switch(device.getType()) {
@@ -439,6 +440,7 @@
boolean soundDeviceEnabled,
boolean isConsoleEnabled,
Boolean isVirtioScsiEnabled,
+ boolean isBalloonEnabled,
boolean copySnapshotDevices) {
VM vm = DbFacade.getInstance().getVmDao().get(dstId);
VmBase vmBase = (vm != null) ? vm.getStaticData() : null;
@@ -450,7 +452,7 @@
List<VmDevice> devices = dao.getVmDeviceByVmId(srcId);
copyVmDevices(srcId, dstId, vm, vmBase, isVm, devices,
srcDeviceIdToTargetDeviceIdMapping,
- soundDeviceEnabled, isConsoleEnabled, isVirtioScsiEnabled,
copySnapshotDevices);
+ soundDeviceEnabled, isConsoleEnabled, isVirtioScsiEnabled,
isBalloonEnabled, copySnapshotDevices);
}
private static void addVideoDevice(VmBase vm) {
--
To view, visit http://gerrit.ovirt.org/22943
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I508ff77c1e309be0b492f46c31311e03f33fc728
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gustavo Frederico Temple Pedrosa <gustavo.pedr...@eldorado.org.br>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
