February 2013 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: MoveDisksCommands - disk id for perm subject
by derez＠redhat.com 07 Feb '13

07 Feb '13

Daniel Erez has submitted this change and it was merged. Change subject: core: MoveDisksCommands - disk id for perm subject ...................................................................... core: MoveDisksCommands - disk id for perm subject Passing diskId instead of imageId for permission subject. Change-Id: I87d7733174b7b5af805f53834c64e032aafbe94b Signed-off-by: Daniel Erez <derez(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveDisksCommand.java 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Daniel Erez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11838 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I87d7733174b7b5af805f53834c64e032aafbe94b Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Remove VdcActionParameterBase.httpSessionId
by amureini＠redhat.com 07 Feb '13

07 Feb '13

Allon Mureinik has submitted this change and it was merged. Change subject: core: Remove VdcActionParameterBase.httpSessionId ...................................................................... core: Remove VdcActionParameterBase.httpSessionId httpSessionId in VdcActionParameterBase is a private field that isn't initialized in the constructor and has no set method. I.e., it is always null. Since it's actually a constant, there is no reason to hold it. This patch removes the field and all its references. That refactoring, in turn allows cleaning up login and logout flows a bit, as they have code that only fires when this member is not null. Change-Id: I239d13175a511291def1eb31ce55be17f376bf42 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java 3 files changed, 4 insertions(+), 44 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11732 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I239d13175a511291def1eb31ce55be17f376bf42 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: ActivateStorageDomain - unwrap useless else
by amureini＠redhat.com 07 Feb '13

07 Feb '13

Allon Mureinik has submitted this change and it was merged. Change subject: core: ActivateStorageDomain - unwrap useless else ...................................................................... core: ActivateStorageDomain - unwrap useless else Unwrapped a useless else block, since the if does not terminate normally anyway - it early returns. Change-Id: I333cbbaec533579e0f437bb3fbc28f4cb2ffbfe0 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11829 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I333cbbaec533579e0f437bb3fbc28f4cb2ffbfe0 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Avoid NPE when changing image status (868887)
by tnisan＠redhat.com 07 Feb '13

07 Feb '13

Tal Nisan has submitted this change and it was merged. Change subject: core: Avoid NPE when changing image status (868887) ...................................................................... core: Avoid NPE when changing image status (868887) Sometimes BaseImagesCommand.setImageStatus() checked for getRelevantDiskImage() without checking for null. Higher up in the hierarchy the getDiskImage returned value is tested for null (before unlockImage() calls), even though the status change is always done on getRelevantDiskImage() returned value. Now what is tested for null before unlockImage() is getRelevantDiskImage(). Change-Id: Ica20a2542c07a355720503c25a14fbae3394c4d4 Bug-Url: https://bugzilla.redhat.com/868887 Signed-off-by: Vered Volansky <vvolansk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Tal Nisan: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11833 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ica20a2542c07a355720503c25a14fbae3394c4d4 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: cleanup: Conventional method naming
by tnisan＠redhat.com 07 Feb '13

07 Feb '13

Tal Nisan has submitted this change and it was merged. Change subject: core: cleanup: Conventional method naming ...................................................................... core: cleanup: Conventional method naming Changed getimageStatus and setimageStatus according to java's conventions in DiskImage. Change-Id: I00ed0695c6601aeaa70c4e10279c87989f44182b Signed-off-by: Vered Volansky <vvolansk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.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/AttachDiskToVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java 39 files changed, 63 insertions(+), 63 deletions(-) Approvals: Tal Nisan: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11832 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00ed0695c6601aeaa70c4e10279c87989f44182b Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: packaging: Remove dependency on jsch
by juan.hernandez＠redhat.com 07 Feb '13

07 Feb '13

Juan Hernandez has submitted this change and it was merged. Change subject: packaging: Remove dependency on jsch ...................................................................... packaging: Remove dependency on jsch The dependency on this package has been removed long ago (in commit 426294) but the RPM dependency is still hanging around. Change-Id: Ibb507534b8e4be810221054a28d3a68427c3900a Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M packaging/fedora/spec/ovirt-engine.spec.in 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11681 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb507534b8e4be810221054a28d3a68427c3900a Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: cleanup: remove unnecessary variable and ifs
by tnisan＠redhat.com 07 Feb '13

07 Feb '13

Tal Nisan has submitted this change and it was merged. Change subject: core: cleanup: remove unnecessary variable and ifs ...................................................................... core: cleanup: remove unnecessary variable and ifs BaseImagesCommand.getImage() used unnecessary auxiliary variable and if statements for class member mImage assignment, and now only uses class member mImage. Change-Id: If4ce2493c4cda5bc851aafb7a1abdc2dba9a99b5 Signed-off-by: Vered Volansky <vvolansk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java 1 file changed, 3 insertions(+), 8 deletions(-) Approvals: Tal Nisan: Verified; Looks good to me, approved Vered Volansky: Verified -- To view, visit http://gerrit.ovirt.org/11831 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If4ce2493c4cda5bc851aafb7a1abdc2dba9a99b5 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: engine: Null Pointer Exception when during preview mode acti...
by mkublin＠redhat.com 07 Feb '13

07 Feb '13

Michael Kublin has submitted this change and it was merged. Change subject: engine: Null Pointer Exception when during preview mode action, service ovirt-engine restart ...................................................................... engine: Null Pointer Exception when during preview mode action, service ovirt-engine restart The following bug was caused because of wrong member name, which was caused by not passing serialization by dstSnapshotId, and after restoring it from DB after restart its value was Guid.Empty, so because of that we usually failed at endSuccessfully because of NullPointerException. Thise caused for VM to be stuck in status locked. Change-Id: I273369d20ae3db3e9598f33ff75eb094dd420f65 Bug-Url: https://bugzilla.redhat.com/871802 Signed-off-by: Michael Kublin <mkublin(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TryBackToAllSnapshotsOfVmParameters.java 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11828 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I273369d20ae3db3e9598f33ff75eb094dd420f65 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>

1 0

Change in ovirt-engine[master]: engine: Fixing compensation for RemoveVmTemplateCommand and ...
by mkublin＠redhat.com 07 Feb '13

07 Feb '13

Michael Kublin has submitted this change and it was merged. Change subject: engine: Fixing compensation for RemoveVmTemplateCommand and possible other commands ...................................................................... engine: Fixing compensation for RemoveVmTemplateCommand and possible other commands So, the fix is simple - change name. After a restart of engine - RemoveVmTemplate command is created based on parameters, but with old name vmTemplateId did not pass json serialization and get default value - Guid.Empty, which is id of blank template. After that , we are trying to delete blank template and failed (We are lucky) - means command failed, a origin template left with status Locked Change-Id: Ifb042d6cb8276a3c457a94823e90c1e6936cfa69 Signed-off-by: Michael Kublin <mkublin(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmTemplateParametersBase.java 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11813 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb042d6cb8276a3c457a94823e90c1e6936cfa69 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: engine: Fix name in parameter
by mkublin＠redhat.com 07 Feb '13

07 Feb '13

Michael Kublin has submitted this change and it was merged. Change subject: engine: Fix name in parameter ...................................................................... engine: Fix name in parameter Small cosmetic fix Change-Id: I1f7d45d2cff0f162f8b58e107a75f8caaa85ada0 Signed-off-by: Michael Kublin <mkublin(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmOperationParameterBase.java 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11814 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f7d45d2cff0f162f8b58e107a75f8caaa85ada0 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0