Eldan Shachar has uploaded a new change for review. Change subject: core: Cluster parameters override - OVF ......................................................................
core: Cluster parameters override - OVF This feature allows to configure the 'emulated machine' and 'cpu model' parameters for each VM separately instead of relying on the cluster default. Change-Id: Ib772f8674ffb5297fbdce25f2fcf1121851a9def Bug-Url: https://bugzilla.redhat.com/838487 Feature-page: http://www.ovirt.org/Features/Cluster_parameters_override Signed-off-by: Eldan Shachar <[email protected]> --- 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/OvfVmReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java 3 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/32547/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 8a013b2..930e2d6 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 @@ -69,4 +69,6 @@ final static String IS_SPICE_FILE_TRANSFER_ENABLED = "IsSpiceFileTransferEnabled"; final static String IS_SPICE_COPY_PASTE_ENABLED = "IsSpiceCopyPasteEnabled"; final static String COMMENT = "Comment"; + final static String CUSTOM_EMULATED_MACHINE = "CustomEmulatedMachine"; + final static String CUSTOM_CPU_NAME = "CustomCpuName"; } 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 76726d2..ef8e0b8 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 @@ -208,6 +208,20 @@ if (node != null) { _vm.setUseLatestVersion(Boolean.parseBoolean(node.innerText)); } + + node = content.SelectSingleNode(OvfProperties.CUSTOM_EMULATED_MACHINE); + if (node != null) { + if (StringUtils.isNotEmpty(node.innerText)) { + _vm.setCustomEmulatedMachine(node.innerText); + } + } + + node = content.SelectSingleNode(OvfProperties.CUSTOM_CPU_NAME); + if (node != null) { + if (StringUtils.isNotEmpty(node.innerText)) { + _vm.setCustomCpuName(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 97bd737..1c87347 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 @@ -90,6 +90,14 @@ _writer.WriteRaw(String.valueOf(_vm.isUseLatestVersion())); _writer.WriteEndElement(); + _writer.WriteStartElement(OvfProperties.CUSTOM_EMULATED_MACHINE); + _writer.WriteRaw(_vm.getCustomEmulatedMachine()); + _writer.WriteEndElement(); + + _writer.WriteStartElement(OvfProperties.CUSTOM_CPU_NAME); + _writer.WriteRaw(_vm.getCustomCpuName()); + _writer.WriteEndElement(); + OvfLogEventHandler<VmStatic> handler = new VMStaticOvfLogHandler(_vm.getStaticData()); // Gets a map that its keys are aliases to fields that should be OVF // logged. -- To view, visit http://gerrit.ovirt.org/32547 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib772f8674ffb5297fbdce25f2fcf1121851a9def Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eldan Shachar <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
