Libor Spevak has uploaded a new change for review. Change subject: engine: Guaranteed memory not propagated to export storage ......................................................................
engine: Guaranteed memory not propagated to export storage Min. allocated memory value for VM template not stored in export storage domain fixed. Storing of min. allocated memory value for VM template extracted to common code base shared with VM export (XML transfer format). Change-Id: Idc06026d1dc92236fe2a25c3bde25023ad4d5861 Signed-off-by: Libor Spevak <[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/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 4 files changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/13037/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 9a2f763..8d61105 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 @@ -431,6 +431,13 @@ } } + node = content.SelectSingleNode("MinAllocatedMem"); + if (node != null) { + if (StringUtils.isNotEmpty(node.InnerText)) { + vmBase.setMinAllocatedMem(Integer.parseInt(node.InnerText)); + } + } + readGeneralData(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 b1b477f..8faa867 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 @@ -207,13 +207,6 @@ _vm.setAppList(_images.get(0).getAppList()); } } - - node = content.SelectSingleNode("MinAllocatedMem"); - if (node != null) { - if (StringUtils.isNotEmpty(node.InnerText)) { - _vm.setMinAllocatedMem(Integer.parseInt(node.InnerText)); - } - } } @Override 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 32ca04b..8afc0aa 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 @@ -60,9 +60,6 @@ _writer.WriteStartElement("DefaultDisplayType"); _writer.WriteRaw(String.valueOf(_vm.getDefaultDisplayType().getValue())); _writer.WriteEndElement(); - _writer.WriteStartElement("MinAllocatedMem"); - _writer.WriteRaw(String.valueOf(_vm.getMinAllocatedMem())); - _writer.WriteEndElement(); OvfLogEventHandler<VmStatic> handler = new VMStaticOvfLogHandler(_vm.getStaticData()); // Gets a map that its keys are aliases to fields that should be OVF // logged. 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 f4a15b3..5f1286f 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 @@ -246,6 +246,10 @@ _writer.WriteRaw(vmBase.getVncKeyboardLayout()); _writer.WriteEndElement(); } + + _writer.WriteStartElement("MinAllocatedMem"); + _writer.WriteRaw(String.valueOf(vmBase.getMinAllocatedMem())); + _writer.WriteEndElement(); } protected abstract void WriteAppList(); -- To view, visit http://gerrit.ovirt.org/13037 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc06026d1dc92236fe2a25c3bde25023ad4d5861 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Libor Spevak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
