Arik Hadas has uploaded a new change for review. Change subject: core: backward compatibility for template's monitor devices ......................................................................
core: backward compatibility for template's monitor devices In 8c53fa4 we implemented backward compatibility for VM's monitor devices. This patch do the same for templates. Change-Id: I00f365263827b4c154cd1f762fce9afbe73e5015 Signed-off-by: Arik Hadas <[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/OvfTemplateReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java 3 files changed, 11 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/29843/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 fa6bdfc..5c4c584 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 @@ -371,6 +371,16 @@ if (node.SelectSingleNode("rasd:SinglePciQxl", _xmlNS) != null) { vmBase.setSingleQxlPci(Boolean.parseBoolean(node.SelectSingleNode("rasd:SinglePciQxl", _xmlNS).innerText)); } + + if (new Version(getVersion()).compareTo(Version.v3_1) >= 0) { + readManagedVmDevice(node, Guid.newGuid()); + } else { + // before v3.1 we had just one monitor item for all the monitors so in this + // case we need to add monitor devices according to the numOfMonitors field + for (int i=0; i<vmBase.getNumOfMonitors(); ++i) { + readManagedVmDevice(node, Guid.newGuid()); + } + } } private void readCpuItem(XmlNode node) { diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java index bf4fdb4..0df9ca7 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java @@ -45,12 +45,6 @@ } @Override - protected void readMonitorItem(XmlNode node) { - super.readMonitorItem(node); - readManagedVmDevice(node, Guid.newGuid()); - } - - @Override protected void readDiskImageItem(XmlNode node) { final Guid guid = new Guid(node.SelectSingleNode("rasd:InstanceId", _xmlNS).innerText); 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 4f3211f..a577fe4 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 @@ -7,20 +7,16 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.core.common.businessentities.ArchitectureType; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.Snapshot; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotStatus; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; -import org.ovirt.engine.core.common.businessentities.ArchitectureType; -import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmDevice; -import org.ovirt.engine.core.common.businessentities.VmDeviceGeneralType; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; -import org.ovirt.engine.core.common.utils.VmDeviceCommonUtils; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.compat.backendcompat.XmlDocument; import org.ovirt.engine.core.compat.backendcompat.XmlNode; import org.ovirt.engine.core.compat.backendcompat.XmlNodeList; @@ -100,21 +96,6 @@ VmDevice readDevice = readManagedVmDevice(node, image.getId()); image.setPlugged(readDevice.getIsPlugged()); image.setReadOnly(readDevice.getIsReadOnly()); - } - - @Override - protected void readMonitorItem(XmlNode node) { - super.readMonitorItem(node); - - if (new Version(getVersion()).compareTo(Version.v3_1) >= 0) { - readManagedVmDevice(node, Guid.newGuid()); - } else { - // before v3.1 we had just one monitor item for all the monitors so in this - // case we need to add monitor devices according to the numOfMonitors field - for (int i=0; i<_vm.getStaticData().getNumOfMonitors(); ++i) { - readManagedVmDevice(node, Guid.newGuid()); - } - } } @Override -- To view, visit http://gerrit.ovirt.org/29843 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00f365263827b4c154cd1f762fce9afbe73e5015 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
