Omer Frenkel has submitted this change and it was merged. Change subject: backend: Set Vm.current_cd on RunOnce ...................................................................... backend: Set Vm.current_cd on RunOnce Modified tracking of current CDs. Before the persistent configuration was stored in VmBase#isoPath and if we got another "runtime" value from VDSM we would store that in VmDynamic#currentCd. Otherwise currentCd would be null and when getting the "current" status one would first have to check if currentCd is null and if not then fall back to isoPath. This was not only difficult to use from other parts of code, but it also didn't work for RunOnce where the VDSM would not report the 'cdrom' in getAllVmStats. Now we set the currentCd directly in RunVmCommand and can always access directly the "current" value of cd rom. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1065719 Change-Id: I5bfc4fbfae15e902898859dddf3cdffe9301dab2 Signed-off-by: Martin Betak <mbetak@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCdRomResource.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 8 files changed, 26 insertions(+), 20 deletions(-) Approvals: Martin Betak: Verified Omer Frenkel: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/25585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5bfc4fbfae15e902898859dddf3cdffe9301dab2 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <mbetak@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Martin Betak <mbetak@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: automation@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server