Change in ovirt-engine[master]: core:Replace vm id with number of vms in views.

mlipchuk at redhat.com mlipchuk at redhat.com
Wed Jul 25 15:49:48 UTC 2012


Maor Lipchuk has submitted this change and it was merged.

Change subject: core:Replace vm id with number of vms in views.
......................................................................


core:Replace vm id with number of vms in views.

Remove vm_guid and vm_id from all the images views.
Since disk could not be related to a certain VM (Floating or shareable)
disk should not be related to VM.
Also added number_of_vms field to the disks view

Signed-off-by: Maor Lipchuk <mlipchuk at redhat.com>
Change-Id: Id306d8322245780ea200c10f9e96254cddf3bc76
---
M backend/manager/dbscripts/all_disks_sp.sql
M backend/manager/dbscripts/create_functions.sql
M backend/manager/dbscripts/create_views.sql
M backend/manager/dbscripts/disk_images_sp.sql
M backend/manager/dbscripts/storages_sp.sql
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/AddVmAndCloneImageCommand.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/ImagesHandler.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.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/RestoreAllSnapshotsCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.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/GetAllDisksByVmIdQueryTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotUnPlugDiskFromVmCommandTest.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/RemoveImageCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/itests/BasicTestSetup.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Disk.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IImage.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LunDisk.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AbstractDiskRowMapper.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDynamicDAOTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java
M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleter.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
35 files changed, 162 insertions(+), 135 deletions(-)

Approvals:
  Maor Lipchuk: Verified; Looks good to me, approved


--
To view, visit http://gerrit.ovirt.org/5216
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id306d8322245780ea200c10f9e96254cddf3bc76
Gerrit-PatchSet: 12
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipchuk at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Daniel Erez <derez at redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika at redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk at redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin at redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel at redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>



More information about the Engine-commits mailing list