Maor Lipchuk has uploaded a new change for review. Change subject: core: Fix disk storage type in OVF ......................................................................
core: Fix disk storage type in OVF Fix the read and the write in the snapshot's OVF. Change-Id: If73ffd17db43239ebfbb25ffbaf0219a9dd40815 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Maor Lipchuk <[email protected]> --- 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/OvfVmWriter.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java 3 files changed, 4 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/42374/1 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 faa6094..774fe41 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 @@ -875,15 +875,12 @@ DiskImage disk = new DiskImage(); // If the OVF is old and does not contain any storage type reference then we assume we can only have disk image. - XmlNode xmlDiskStorageType = node.SelectSingleNode("rasd:DiskStorageType", _xmlNS); - String diskStorageTypeFromOvf = xmlDiskStorageType != null ? xmlDiskStorageType.innerText : null; - if (StringUtils.isNotEmpty(diskStorageTypeFromOvf)) { - DiskStorageType diskStorageType = DiskStorageType.valueOf(diskStorageTypeFromOvf); - if (diskStorageType == DiskStorageType.CINDER) { + if (node.attributes.get("ovf:disk_storage_type") != null) { + String diskStorageType = node.attributes.get("ovf:disk_storage_type").getValue(); + if (diskStorageType != null && diskStorageType.equals(DiskStorageType.CINDER.name())) { disk = new CinderDisk(); } } - disk.setImageId(new Guid(node.attributes.get("ovf:id").getValue())); disk.setId(OvfParser.GetImageGrupIdFromImageFile(node.attributes.get("ovf:href").getValue())); // Default values: diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java index 3ad8968..5d8bb41 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java @@ -244,9 +244,6 @@ _writer.WriteStartElement(RASD_URI, "Template"); _writer.WriteRaw(image.getImageTemplateId().toString()); _writer.WriteEndElement(); - _writer.WriteStartElement(RASD_URI, "DiskStorageType"); - _writer.WriteRaw(image.getDiskStorageType().name()); - _writer.WriteEndElement(); _writer.WriteStartElement(RASD_URI, "ApplicationList"); _writer.WriteRaw(image.getAppList()); _writer.WriteEndElement(); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java index 12daabc..cc68ccc 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java @@ -83,6 +83,7 @@ _writer.WriteAttributeString(OVF_URI, "id", image.getImageId().toString()); _writer.WriteAttributeString(OVF_URI, "size", String.valueOf(image.getSize())); _writer.WriteAttributeString(OVF_URI, "description", StringUtils.defaultString(image.getDescription())); + _writer.WriteAttributeString(OVF_URI, "disk_storage_type", image.getDiskStorageType().name()); _writer.WriteEndElement(); } -- To view, visit https://gerrit.ovirt.org/42374 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If73ffd17db43239ebfbb25ffbaf0219a9dd40815 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
