Sergey Gotliv has uploaded a new change for review.

Change subject: engine: Fix creation of template from VM containing direct luns
......................................................................

engine: Fix creation of template from VM containing direct luns

Change-Id: I49a41624529301e26a14f2a69e2b364d6d380ffa
Bug-Url: https://bugzilla.redhat.com/999951
Signed-off-by: Sergey Gotliv <sgot...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/18453/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
index bafc9c9..f8480f5 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
@@ -263,7 +263,9 @@
             switch(device.getType()) {
                 case DISK:
                     if 
(VmDeviceType.DISK.getName().equals(device.getDevice())) {
+                        if 
(srcDeviceIdToTargetDeviceIdMapping.containsKey(device.getDeviceId())) {
                             id = 
srcDeviceIdToTargetDeviceIdMapping.get(device.getDeviceId());
+                        }
                     } else if 
(VmDeviceType.CDROM.getName().equals(device.getDevice())) {
                         // check here is source VM had CD (Vm from snapshot)
                         String srcCdPath = (String) 
device.getSpecParams().get(VdsProperties.Path);
@@ -278,7 +280,9 @@
                     break;
 
                 case INTERFACE:
-                    id = 
srcDeviceIdToTargetDeviceIdMapping.get(device.getDeviceId());
+                    if 
(srcDeviceIdToTargetDeviceIdMapping.containsKey(device.getDeviceId())) {
+                        id = 
srcDeviceIdToTargetDeviceIdMapping.get(device.getDeviceId());
+                    }
                     break;
 
                 case CONTROLLER:


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

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

Reply via email to