From: Ben Pfaff Date: Mon, 22 Feb 2010 21:27:19 +0000 (-0800) Subject: xenserver: Avoid doing unneeded work in deconfigure_datapath(). X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a75efe8236e0c98838d866399cc0092fc7f2cd1;p=openvswitch xenserver: Avoid doing unneeded work in deconfigure_datapath(). Deleting a bridge deletes all of its ports, too, so there's no benefit in doing so manually beforehand. Signed-off-by: Ben Pfaff --- diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py index 91204884..1dcac61d 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py @@ -265,20 +265,7 @@ def deconfigure_datapath(pif): bridge = pif_bridge_name(pif) - physical_devices = datapath_get_physical_pifs(pif) - - log("deconfigure_datapath: bridge - %s" % bridge) - log("deconfigure_datapath: physical devices - %s" % [pif_netdev_name(p) for p in physical_devices]) - - for p in physical_devices: - dev = pif_netdev_name(p) - vsctl_argv += ['# deconfigure physical port %s' % dev] - vsctl_argv += datapath_deconfigure_physical(dev) - netdev_down(dev) - - if len(physical_devices) > 1: - vsctl_argv += ['# deconfigure bond %s' % pif_netdev_name(pif)] - vsctl_argv += datapath_deconfigure_bond(pif_netdev_name(pif)) + log("deconfigure_bridge: bridge - %s" % bridge) vsctl_argv += ['# deconfigure bridge %s' % bridge] vsctl_argv += ['--', '--if-exists', 'del-br', bridge]