Alona Kaplan has uploaded a new change for review.
Change subject: core: Add NetworkLinking support to OvfTemplate.
......................................................................
core: Add NetworkLinking support to OvfTemplate.
- Support null networkName of a vnic.
- New "Linked" property on a vnic-
* Should be written to the ovf.
* Should be read from the ovf if exists (backward compatibility).
Change-Id: Ia11fe29f87836e43bd4de240da9160857b144605
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
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
2 files changed, 21 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/9803/1
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 07ac175..b90fbb1 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
@@ -4,6 +4,7 @@
import java.util.Arrays;
import java.util.Date;
+import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.DisplayType;
import org.ovirt.engine.core.common.businessentities.UsbPolicy;
@@ -107,7 +108,18 @@
if
(!StringHelper.isNullOrEmpty(node.SelectSingleNode("rasd:ResourceSubType",
_xmlNS).InnerText)) {
iface.setType(Integer.parseInt(node.SelectSingleNode("rasd:ResourceSubType",
_xmlNS).InnerText));
}
- iface.setNetworkName(node.SelectSingleNode("rasd:Connection",
_xmlNS).InnerText);
+ String resourceSubNetworkName =
node.SelectSingleNode("rasd:Connection", _xmlNS).InnerText;
+ if (StringUtils.isNotEmpty(resourceSubNetworkName)) {
+ iface.setNetworkName(resourceSubNetworkName);
+ } else {
+ iface.setNetworkName(null);
+ }
+ XmlNode linkedNode = node.SelectSingleNode("rasd:Linked",
_xmlNS);
+ if (linkedNode != null) {
+ iface.setLinked(Boolean.valueOf(linkedNode.InnerText));
+ } else {
+ iface.setLinked(true);
+ }
iface.setName(node.SelectSingleNode("rasd:Name",
_xmlNS).InnerText);
iface.setSpeed((node.SelectSingleNode("rasd:speed", _xmlNS) !=
null) ? Integer
.parseInt(node.SelectSingleNode("rasd:speed",
_xmlNS).InnerText)
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 d81e1c4..a523da9 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
@@ -162,7 +162,8 @@
for (VmNetworkInterface iface : _vmTemplate.getInterfaces()) {
_writer.WriteStartElement("Item");
_writer.WriteStartElement(RASD_URI, "Caption");
- _writer.WriteRaw("Ethernet adapter on " + iface.getNetworkName());
+ String networkName = iface.getNetworkName() != null ?
iface.getNetworkName() : "[No Network]";
+ _writer.WriteRaw("Ethernet adapter on " + networkName);
_writer.WriteEndElement();
_writer.WriteStartElement(RASD_URI, "InstanceId");
_writer.WriteRaw(iface.getId().toString());
@@ -176,7 +177,12 @@
}
_writer.WriteEndElement();
_writer.WriteStartElement(RASD_URI, "Connection");
- _writer.WriteRaw(iface.getNetworkName());
+ if (iface.getNetworkName() != null) {
+ _writer.WriteRaw(iface.getNetworkName());
+ }
+ _writer.WriteEndElement();
+ _writer.WriteStartElement(RASD_URI, "Linked");
+ _writer.WriteRaw(String.valueOf(iface.isLinked()));
_writer.WriteEndElement();
_writer.WriteStartElement(RASD_URI, "Name");
_writer.WriteRaw(iface.getName());
--
To view, visit http://gerrit.ovirt.org/9803
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia11fe29f87836e43bd4de240da9160857b144605
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
