Liron Ar has uploaded a new change for review. Change subject: core: OvfReader- setPlugged for disks ......................................................................
core: OvfReader- setPlugged for disks When reading disks data of vm from an ovf file, set "plugged" to have the correct value from the ovf. Change-Id: I85263335508b6281a085b37412dc960468f25725 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java 3 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/15625/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java index 4b17d1c..97ed257 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java @@ -158,6 +158,7 @@ disk.setDiskInterface(DiskInterface.VirtIO); disk.setStoragePoolId(vm.getStoragePoolId()); disk.setActive(Boolean.TRUE); + disk.setPlugged(Boolean.TRUE); disk.setVmSnapshotId(snapshotId); disk.setImageStatus(ImageStatus.OK); disk.setAppList(""); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java index f1db59a..d6c2225 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java @@ -184,7 +184,7 @@ * @param vmBase * @param deviceId */ - public void readVmDevice(XmlNode node, VmBase vmBase, Guid deviceId, boolean isManaged) { + public VmDevice readVmDevice(XmlNode node, VmBase vmBase, Guid deviceId, boolean isManaged) { VmDevice vmDevice = new VmDevice(); vmDevice.setId(new VmDeviceId(deviceId, vmBase.getId())); if (node.SelectSingleNode(OvfProperties.VMD_ADDRESS, _xmlNS) != null @@ -252,6 +252,7 @@ } else { vmBase.getUnmanagedDeviceList().add(vmDevice); } + return vmDevice; } /** diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java index 7d24b5f..07789c3 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java @@ -105,7 +105,8 @@ if (last_modified_date != null) { image.setLastModifiedDate(last_modified_date); } - readVmDevice(node, _vm.getStaticData(), image.getId(), Boolean.TRUE); + VmDevice readDevice = readVmDevice(node, _vm.getStaticData(), image.getId(), Boolean.TRUE); + image.setPlugged(readDevice.getIsPlugged()); } else if (OvfHardware.Network.equals(resourceType)) { VmNetworkInterface iface = getNetwotkInterface(node); updateSingleNic(node, iface); -- To view, visit http://gerrit.ovirt.org/15625 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85263335508b6281a085b37412dc960468f25725 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
