# HG changeset patch # User Ben Pfaff # Date 1278595551 -3600 # Node ID 73cc0a5b9f6e8c3d1762f66244c96fe2238c519c # Parent 0ceb138d722ae98fc62245b4dba9d1dedfa3f86f [PATCH] xenserver: Remove a VLAN's bridge when bringing down its PIF. >From 7966caf4a08629f7d0498427420ef83b44838f44 Mon Sep 17 00:00:00 2001 Date: Mon, 22 Feb 2010 13:32:01 -0800 Before, interface-reconfigure would only bring remove a VLAN's bridge incidentally as part of removing its datapath's bridge. This commit fixes it. Signed-off-by: Ben Pfaff Signed-off-by: Ian Campbell --- ...ensource_libexec_InterfaceReconfigureVswitch.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff -r 0ceb138d722a -r 73cc0a5b9f6e scripts/InterfaceReconfigureVswitch.py --- a/scripts/InterfaceReconfigureVswitch.py Thu Jul 08 14:25:51 2010 +0100 +++ b/scripts/InterfaceReconfigureVswitch.py Thu Jul 08 14:25:51 2010 +0100 @@ -260,7 +260,7 @@ vsctl_argv += set_br_external_ids(pif) return vsctl_argv,extra_up_ports -def deconfigure_datapath(pif): +def deconfigure_bridge(pif): vsctl_argv = [] bridge = pif_bridge_name(pif) @@ -401,6 +401,9 @@ vsctl_argv += datapath_deconfigure_ipdev(ipdev) if pif_is_vlan(self._pif): + # Delete the VLAN bridge. + vsctl_argv += deconfigure_bridge(self._pif) + # If the VLAN's slave is attached, leave datapath setup. slave = pif_get_vlan_slave(self._pif) if db().get_pif_record(slave)['currently_attached']: @@ -424,6 +427,6 @@ dp = None if dp: - vsctl_argv += deconfigure_datapath(dp) + vsctl_argv += deconfigure_bridge(dp) datapath_modify_config(vsctl_argv)