Change in vdsm[master]: libvirtvm: use <interface type='network'> - vdsm-patches - Fedora mailing-lists

25 Nov 2012

Dan Kenigsberg has uploaded a new change for review.
Change subject: libvirtvm: use <interface type='network'>
......................................................................
libvirtvm: use <interface type='network'>
In the future, this would allow us to migrate a VM from a bridge-based
network to funkier types of networks defined in
http://libvirt.org/formatnetwork.html .
Change-Id: If173a6351b1033c3a1c821cbadd05a2cbdf3d76c
Signed-off-by: Dan Kenigsberg danken@redhat.com
---
M tests/libvirtvmTests.py
M vdsm/libvirtvm.py
2 files changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/9441/1

diff --git a/tests/libvirtvmTests.py b/tests/libvirtvmTests.py
index 4293276..2a0f097 100644
--- a/tests/libvirtvmTests.py
+++ b/tests/libvirtvmTests.py
@@ -261,10 +261,10 @@
def testInterfaceXML(self):
         interfaceXML = """
-            <interface type="bridge"> <address %s/>
+            <interface type="network"> <address %s/>
                 <mac address="52:54:00:59:F5:3F"/>
                 <model type="virtio"/>
-                <source bridge="ovirtmgmt"/>
+                <source network="vdsm-ovirtmgmt"/>
                 <filterref filter="no-mac-spoofing"/>
                 <boot order="1"/>
                 <driver name="vhost"/>
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 3439dc3..7bbab95 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -982,16 +982,17 @@
         """
         Create domxml for network interface.
-        <interface type="bridge">
+        <interface type="network">
             <mac address="aa:bb:dd:dd:aa:bb"/>
             <model type="virtio"/>
-            <source bridge="engine"/>
+            <source network="vdsm-engine"/>
             [<filterref filter='filter name'/>]
             [<tune><sndbuf>0</sndbuf></tune>]
         </interface>
         """
         doc = xml.dom.minidom.Document()
         iface = self.createXmlElem('interface', self.device, ['address'])
+        iface.setAttribute('type', 'network')
         m = doc.createElement('mac')
         m.setAttribute('address', self.macAddr)
         iface.appendChild(m)
@@ -999,7 +1000,7 @@
         m.setAttribute('type', self.nicModel)
         iface.appendChild(m)
         m = doc.createElement('source')
-        m.setAttribute('bridge', self.network)
+        m.setAttribute('network', netinfo.LIBVIRT_NET_PREFIX + self.network)
         iface.appendChild(m)
         if hasattr(self, 'filter'):
             m = doc.createElement('filterref')
@@ -2790,10 +2791,15 @@
             mac = x.getElementsByTagName('mac')[0].getAttribute('address')
             alias = x.getElementsByTagName('alias')[0].getAttribute('name')
             model = x.getElementsByTagName('model')[0].getAttribute('type')
-            bridge = None
+
+            network = None
             source = x.getElementsByTagName('source')
             if source:
-                bridge = source[0].getAttribute('bridge')
+                network = source[0].getAttribute('bridge')
+                if not network:
+                    network = source[0].getAttribute('network')
+                    network = network[len(netinfo.LIBVIRT_NET_PREFIX):]
+
             # Get nic address
             address = self._getUnderlyingDeviceAddress(x)
             for nic in self._devices[vm.NIC_DEVICES]:
@@ -2819,8 +2825,8 @@
                           'address': address,
                           'alias': alias,
                           'name': name}
-                if bridge:
-                    nicDev['network'] = bridge
+                if network:
+                    nicDev['network'] = network
                 self.conf['devices'].append(nicDev)
def _setWriteWatermarks(self):
--
To view, visit http://gerrit.ovirt.org/9441
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If173a6351b1033c3a1c821cbadd05a2cbdf3d76c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg danken@redhat.com

    