From cd1766287862162aadf1c111a4807f7618f34578 Mon Sep 17 00:00:00 2001
From: Anthony PERARD <anthony.perard@citrix.com>
Date: Mon, 6 Jul 2015 17:47:17 +0100
Subject: [PATCH] libvirt-vif: Allow to configure a script on bridge interface

While running with libvirt-xen driver, it is possible to have the Xen
toolstack running a different script than the default on a vif. This patch
allow Nova to change this script.

Also do not set script to the empty string '' in designer.py for a linux
bridge. The empty string for script does not appear to be use anywhere in
the libvirt code when the vif is a bridge.

Change-Id: Ib6d6542d22decccfa68a058d362a42d60e6c2cca
Partial-Bug: #1461642
---
 nova/tests/unit/virt/libvirt/test_config.py | 15 +++++++++++++++
 nova/virt/libvirt/config.py                 |  4 ++++
 nova/virt/libvirt/designer.py               |  1 -
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/nova/tests/unit/virt/libvirt/test_config.py b/nova/tests/unit/virt/libvirt/test_config.py
index 2b4f6cc8f239..a208bd3c0a4e 100644
--- a/nova/tests/unit/virt/libvirt/test_config.py
+++ b/nova/tests/unit/virt/libvirt/test_config.py
@@ -1243,6 +1243,21 @@ class LibvirtConfigGuestInterfaceTest(LibvirtConfigBaseTest):
               </virtualport>
             </interface>""")
 
+    def test_config_bridge_xen(self):
+        obj = config.LibvirtConfigGuestInterface()
+        obj.net_type = "bridge"
+        obj.source_dev = "br0"
+        obj.mac_addr = "CA:FE:BE:EF:CA:FE"
+        obj.script = "/path/to/test-vif-openstack"
+
+        xml = obj.to_xml()
+        self.assertXmlEqual(xml, """
+            <interface type="bridge">
+              <mac address="CA:FE:BE:EF:CA:FE"/>
+              <source bridge="br0"/>
+              <script path="/path/to/test-vif-openstack"/>
+            </interface>""")
+
     def test_config_8021Qbh(self):
         obj = config.LibvirtConfigGuestInterface()
         obj.net_type = "direct"
diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py
index 754d305295c4..ba4341eeda2d 100644
--- a/nova/virt/libvirt/config.py
+++ b/nova/virt/libvirt/config.py
@@ -1173,6 +1173,10 @@ class LibvirtConfigGuestInterface(LibvirtConfigGuestDevice):
             dev.append(etree.Element("source", type=self.vhostuser_type,
                                      mode=self.vhostuser_mode,
                                      path=self.vhostuser_path))
+        elif self.net_type == "bridge":
+            dev.append(etree.Element("source", bridge=self.source_dev))
+            if self.script is not None:
+                dev.append(etree.Element("script", path=self.script))
         else:
             dev.append(etree.Element("source", bridge=self.source_dev))
 
diff --git a/nova/virt/libvirt/designer.py b/nova/virt/libvirt/designer.py
index 7218f6bb775f..5c99fd9d2722 100644
--- a/nova/virt/libvirt/designer.py
+++ b/nova/virt/libvirt/designer.py
@@ -43,7 +43,6 @@ def set_vif_host_backend_bridge_config(conf, brname, tapname=None):
     conf.source_dev = brname
     if tapname:
         conf.target_dev = tapname
-    conf.script = ""
 
 
 def set_vif_host_backend_ethernet_config(conf, tapname):