[Engine-patches] Change in ovirt-engine[master]: core: ImportVm cleanup: extract VM.hasImages()

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: ImportVm cleanup: extract VM.hasImages()
......................................................................

core: ImportVm cleanup: extract VM.hasImages()

Added the helper method hasImages() to the VM class, instead of having
to implement it in the ImportVmCommand.

Change-Id: I7486e68268700bd0c55204dce6fb3f711425f931
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/9657/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
index 09ecef4..c897ea3 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
@@ -488,7 +488,7 @@
             VM vm = getVm();
             // if there aren't any images- we can just perform the end
             // vm related ops
-            if (!hasSnappableDisks(vm)) {
+            if (!vm.hasImages()) {
                 endVmRelatedOps();
             } else {
                 processImages();
@@ -499,10 +499,6 @@
         }
 
         setSucceeded(true);
-    }
-
-    private boolean hasSnappableDisks(VM vm) {
-        return !vm.getImages().isEmpty();
     }
 
     private void addVmToDb() {
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
index 6838119..14f7c71 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
@@ -1015,6 +1015,10 @@
         return mVmStatic.getImages();
     }
 
+    public boolean hasImages() {
+        return getImages().isEmpty();
+    }
+
     public void setImages(ArrayList<DiskImage> value) {
         mVmStatic.setImages(value);
     }


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

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