Petr Horáček has uploaded a new change for review. Change subject: net: add virtual port to network def ......................................................................
net: add virtual port to network def We need to set virtualport for libvirt network in order to support OVS. Change-Id: I7d081cb51d9f01eccbe28ced62e8bed07ac12396 Bug-Url: https://bugzilla.redhat.com/1195208 Signed-off-by: Petr Horáček <phora...@redhat.com> --- M lib/vdsm/network/configurators/libvirt.py M tests/network/conf_test.py 2 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/56828/1 diff --git a/lib/vdsm/network/configurators/libvirt.py b/lib/vdsm/network/configurators/libvirt.py index a88ded7..8ca95db 100644 --- a/lib/vdsm/network/configurators/libvirt.py +++ b/lib/vdsm/network/configurators/libvirt.py @@ -40,7 +40,7 @@ raise -def createNetworkDef(network, bridged=True, iface=None): +def createNetworkDef(network, bridged=True, iface=None, virtualport=None): """ Creates Network Xml e.g.: <network> @@ -48,6 +48,8 @@ <forward mode='bridge'/><bridge name='awesome_net'/> || <forward mode='passthrough'><interface dev='incredible'/></forward> + [<virtualport type='openvswitch'/>] + [<vlan><tag id='10'/></vlan>] </network> Forward mode can be either bridge or passthrough, @@ -78,6 +80,8 @@ root.append(EtreeElement('bridge', name=network)) else: forwardElem.append(EtreeElement('interface', dev=iface)) + if virtualport: + root.append(EtreeElement('virtualport', type=virtualport)) return etree.tostring(root) diff --git a/tests/network/conf_test.py b/tests/network/conf_test.py index 9b3e69b..4ad972a 100644 --- a/tests/network/conf_test.py +++ b/tests/network/conf_test.py @@ -156,3 +156,16 @@ iface=iface) self.assertEqualXml(expectedDoc, actualDoc) + + def testCreateNetXmlVirtualport(self): + virtualport = "openvswitch" + expectedDoc = """<network> + <name>vdsm-awesome_net</name> + <forward mode='bridge'/> + <bridge name='awesome_net'/> + <virtualport type='openvswitch'/> + </network>""" + actualDoc = libvirt.createNetworkDef('awesome_net', bridged=True, + virtualport=virtualport) + + self.assertEqualXml(expectedDoc, actualDoc) -- To view, visit https://gerrit.ovirt.org/56828 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d081cb51d9f01eccbe28ced62e8bed07ac12396 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phora...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
