[Engine-patches] Change in ovirt-engine[master]: core: Remove a proxy use of ImagesHandler filter

[mlipchuk]

Maor Lipchuk has uploaded a new change for review.

Change subject: core: Remove a proxy use of ImagesHandler filter
......................................................................

core: Remove a proxy use of ImagesHandler filter

Remove the use of parameters in VmHandler

Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
Change-Id: I87f74d76771b3fe3fb31a4d9c731ec0139515694
---
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/VmHandler.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
3 files changed, 5 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/26205/1

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 9798a0f..542d2da 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
@@ -146,7 +146,7 @@
 
     protected void updateVmDisks() {
         VmHandler.updateDisksFromDb(getVm());
-        VmHandler.filterImageDisksForVM(getVm(), false, false, true);
+        VmHandler.filterImageDisksForVM(getVm());
         mImages.addAll(getVm().getDiskList());
     }
 
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
index 14c7f87..fd23593 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
@@ -337,14 +337,8 @@
         return db.getVmInitByIds(ids);
     }
 
-    /**
-     * Filters the vm image disks/disk devices according to the given 
parameters
-     * note: all the given parameters are relevant for image disks, luns will 
be filtered.
-     */
-    public static void filterImageDisksForVM(VM vm, boolean 
allowOnlyNotShareableDisks,
-                                             boolean allowOnlySnapableDisks, 
boolean allowOnlyActiveDisks) {
-        List<DiskImage> filteredDisks = 
ImagesHandler.filterImageDisks(vm.getDiskMap().values(),
-                allowOnlyNotShareableDisks, allowOnlySnapableDisks, 
allowOnlyActiveDisks);
+    public static void filterImageDisksForVM(VM vm) {
+        List<DiskImage> filteredDisks = 
ImagesHandler.filterImageDisks(vm.getDiskMap().values(), false, false, true);
         Collection<? extends Disk> vmDisksToRemove = 
CollectionUtils.subtract(vm.getDiskMap().values(), filteredDisks);
         vm.clearDisks();
         updateDisksForVm(vm, filteredDisks);
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
index 45ad727..470dacf 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
@@ -108,7 +108,7 @@
         disks.add(snapshotDisk1);
         disks.add(snapshotDisk2);
         populateVmWithDisks(disks, vm);
-        VmHandler.filterImageDisksForVM(vm, false, false, true);
+        VmHandler.filterImageDisksForVM(vm);
         assertTrue(vm.getDiskList().isEmpty());
         assertTrue(vm.getManagedVmDeviceMap().isEmpty());
     }
@@ -121,7 +121,7 @@
         VM vm = new VM();
         vm.setId(Guid.newGuid());
         populateVmWithDisks(Arrays.asList(snapshotDisk, regularDisk, lunDisk), 
vm);
-        VmHandler.filterImageDisksForVM(vm, false, false, true);
+        VmHandler.filterImageDisksForVM(vm);
         assertFalse(vm.getDiskList().contains(snapshotDisk));
         assertTrue(vm.getDiskList().contains(regularDisk));
         
assertTrue(vm.getManagedVmDeviceMap().containsKey(regularDisk.getId()));


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87f74d76771b3fe3fb31a4d9c731ec0139515694
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches