Arik Hadas has uploaded a new change for review. Change subject: core: export & import highly available parameters ......................................................................
core: export & import highly available parameters The 'auto startup' and 'priority' attributes of VM/Template were not copied on export & import operations. Now they are. Change-Id: I194b70181cf4ab0420044a22dd8a382766d9019d Bug-Url: https://bugzilla.redhat.com/1057048 Signed-off-by: Arik Hadas <aha...@redhat.com> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.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 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 5 files changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/25765/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.java index dc1dd3e..c8321e6 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.java @@ -19,4 +19,7 @@ final static String VMD_ALIAS = "Alias"; final static String VMD_CUSTOM_PROP = "CustomProperties"; final static String VMD_SNAPSHOT_PROP = "SnapshotId"; + + final static String AUTO_STARTUP = "AutoStartup"; + final static String PRIORITY = "Priority"; } 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 2ca2f0c..e839566 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 @@ -509,6 +509,16 @@ } } + node = content.SelectSingleNode(OvfProperties.AUTO_STARTUP); + if (node != null) { + vmBase.setAutoStartup(Boolean.parseBoolean(node.innerText)); + } + + node = content.SelectSingleNode(OvfProperties.PRIORITY); + if (node != null) { + vmBase.setPriority(Integer.parseInt(node.innerText)); + } + readGeneralData(content); readVmInit(content); 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 a168a13..160a2d1 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 @@ -248,11 +248,6 @@ _vm.getStaticData().setOriginalTemplateName(node.innerText); } - node = content.SelectSingleNode("AutoStartup"); - if (node != null) { - _vm.setAutoStartup(Boolean.parseBoolean(node.innerText)); - } - node = content.SelectSingleNode("UseLatestVersion"); if (node != null) { _vm.setUseLatestVersion(Boolean.parseBoolean(node.innerText)); 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 b526d99..1a2a0b5 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 @@ -86,10 +86,6 @@ _writer.WriteEndElement(); } - _writer.WriteStartElement("AutoStartup"); - _writer.WriteRaw(String.valueOf(_vm.isAutoStartup())); - _writer.WriteEndElement(); - _writer.WriteStartElement("UseLatestVersion"); _writer.WriteRaw(String.valueOf(_vm.isUseLatestVersion())); _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 007fab6..90dcbf1 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 @@ -321,6 +321,14 @@ _writer.WriteRaw(String.valueOf(vmBase.isRunAndPause())); _writer.WriteEndElement(); + _writer.WriteStartElement(OvfProperties.AUTO_STARTUP); + _writer.WriteRaw(String.valueOf(vmBase.isAutoStartup())); + _writer.WriteEndElement(); + + _writer.WriteStartElement(OvfProperties.PRIORITY); + _writer.WriteRaw(String.valueOf(vmBase.getPriority())); + _writer.WriteEndElement(); + if (vmBase.getCreatedByUserId() != null) { _writer.WriteStartElement("CreatedByUserId"); _writer.WriteRaw(String.valueOf(vmBase.getCreatedByUserId())); -- To view, visit http://gerrit.ovirt.org/25765 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I194b70181cf4ab0420044a22dd8a382766d9019d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Arik Hadas <aha...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
