Jiří Moskovčák has uploaded a new change for review. Change subject: engine: keep the HA flag when importing/exporting VM template ......................................................................
engine: keep the HA flag when importing/exporting VM template Change-Id: I25cabbc1bc5d5386d88574185c46f780a11fc0f6 Bug-Url: https://bugzilla.redhat.com/1066406 Signed-off-by: Jiri Moskovcak <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.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/OvfTemplateWriter.java 3 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/25000/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java index c9af2da..0eeff84 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java @@ -626,6 +626,10 @@ autoStartup = value; } + public boolean getAutoStartup() { + return autoStartup; + } + public boolean isStateless() { return stateless; } 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 48033f3..3c24641 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 @@ -214,6 +214,11 @@ if (node != null) { _vmTemplate.setTemplateVersionName(node.innerText); } + + node = content.SelectSingleNode("AutoStartup"); + if (node != null) { + _vmTemplate.setAutoStartup(Boolean.parseBoolean(node.innerText)); + } } @Override diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java index b698343..35ca9ff 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java @@ -55,6 +55,9 @@ _writer.WriteStartElement("TemplateVersionName"); _writer.WriteRaw(_vmTemplate.getTemplateVersionName()); _writer.WriteEndElement(); + _writer.WriteStartElement("AutoStartup"); // aka highly available + _writer.WriteRaw(String.valueOf(_vmTemplate.getAutoStartup())); + _writer.WriteEndElement(); } @Override -- To view, visit http://gerrit.ovirt.org/25000 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25cabbc1bc5d5386d88574185c46f780a11fc0f6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Jiří Moskovčák <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
