Change in vdsm[master]: interface xml: add <driver> subelement in an extendible way

[Dan Kenigsberg]

Dan Kenigsberg has uploaded a new change for review.

Change subject: interface xml: add <driver> subelement in an extendible way
......................................................................

interface xml: add <driver> subelement in an extendible way

This patch makes no functional change. A <driver> subelement is added to
an <interface> element iff requested by the "vhost" custom property.

Change-Id: I1514fa11734e8d7e71a8c4aa51733d5087c38828
Signed-off-by: Dan Kenigsberg 
---
M vdsm/vm.py
1 file changed, 7 insertions(+), 2 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/25389/1

diff --git a/vdsm/vm.py b/vdsm/vm.py
index af8b3be..549421c 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -1354,8 +1354,12 @@

def _customize(self):
         # Customize network device
+        self.driver = {}
+
         vhosts = self._getVHostSettings()
-        self.driver = vhosts.get(self.network, False)
+        if vhosts:
+            self.driver['name'] = vhosts.get(self.network, False)
+
         try:
             self.sndbufParam = self.conf['custom']['sndbuf']
         except KeyError:
@@ -1384,6 +1388,7 @@
             <mac address="aa:bb:dd:dd:aa:bb"/>
             <model type="virtio"/>
             <source bridge="engine"/>
+            [<driver name="vhost/qemu"/>]
             [<filterref filter='filter name'/>]
             [<tune><sndbuf>0</sndbuf></tune>]
             [<link state='up|down'/>]
@@ -1409,7 +1414,7 @@
             iface.appendChildWithArgs('boot', order=self.bootOrder)

if self.driver:
-            iface.appendChildWithArgs('driver', name=self.driver)
+            iface.appendChildWithArgs('driver', **self.driver)

if self.sndbufParam:
             tune = iface.appendChildWithArgs('tune')

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: interface xml: add <driver> subelement in an extendible way
......................................................................

Patch Set 1:

Build Successful

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7414/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6621/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7523/ : SUCCESS

Antoni Segura Puimedon has posted comments on this change.

Change subject: interface xml: add <driver> subelement in an extendible way
......................................................................

Patch Set 1: Code-Review+1

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: interface xml: add <driver> subelement in an extendible way
......................................................................

Patch Set 1: Verified+1 Code-Review+2

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: interface xml: add <driver> subelement in an extendible way
......................................................................

interface xml: add <driver> subelement in an extendible way

This patch makes no functional change. A <driver> subelement is added to
an <interface> element iff requested by the "vhost" custom property.

Change-Id: I1514fa11734e8d7e71a8c4aa51733d5087c38828
Signed-off-by: Dan Kenigsberg 
Reviewed-on: http://gerrit.ovirt.org/25389
Reviewed-by: Antoni Segura Puimedon 
---
M vdsm/vm.py
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Antoni Segura Puimedon: Looks good to me, but someone else must approve
  Dan Kenigsberg: Verified; Looks good to me, approved