Omer Frenkel has uploaded a new change for review. Change subject: core: don't write payload data on export ......................................................................
core: don't write payload data on export when creating OVF for export or snapshot, the payload data should not be part of it, as it may contain sensitive data and may be malformed for the xml. Change-Id: I662aff50ee5cf7174a135a004081c48c4e1ab5b1 Bug-Url: https://bugzilla.redhat.com/997910 Signed-off-by: Omer Frenkel <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/18995/1 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 ddce822..1405287 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 @@ -13,6 +13,7 @@ import org.ovirt.engine.core.common.businessentities.VmBase; import org.ovirt.engine.core.common.businessentities.VmDevice; import org.ovirt.engine.core.common.businessentities.VmDeviceGeneralType; +import org.ovirt.engine.core.common.businessentities.VmPayload; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; @@ -385,7 +386,8 @@ _writer.WriteStartElement(OvfProperties.VMD_ALIAS); _writer.WriteRaw(String.valueOf(vmDevice.getAlias())); _writer.WriteEndElement(); - if (vmDevice.getSpecParams() != null && vmDevice.getSpecParams().size() != 0) { + if (vmDevice.getSpecParams() != null && vmDevice.getSpecParams().size() != 0 + && !VmPayload.isPayload(vmDevice.getSpecParams())) { _writer.WriteStartElement(OvfProperties.VMD_SPEC_PARAMS); _writer.WriteMap(vmDevice.getSpecParams()); _writer.WriteEndElement(); -- To view, visit http://gerrit.ovirt.org/18995 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I662aff50ee5cf7174a135a004081c48c4e1ab5b1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Omer Frenkel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
