# HG changeset patch
# User Ben Pfaff <blp@xxxxxxxxxx>
# Date 1278595551 -3600
# Node ID 0ceb138d722ae98fc62245b4dba9d1dedfa3f86f
# Parent a3c387c9835cee7e280e5e99436d720ff8971738
[PATCH] xenserver: Avoid doing unneeded work in deconfigure_datapath().
>From 2a75efe8236e0c98838d866399cc0092fc7f2cd1 Mon Sep 17 00:00:00 2001
Date: Mon, 22 Feb 2010 13:27:19 -0800
Deleting a bridge deletes all of its ports, too, so there's no benefit in
doing so manually beforehand.
Signed-off-by: Ben Pfaff <blp@xxxxxxxxxx>
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
...ensource_libexec_InterfaceReconfigureVswitch.py | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff -r a3c387c9835c -r 0ceb138d722a 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
@@ -265,20 +265,7 @@
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]
scripts/InterfaceReconfigureVswitch.py | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
txt42cNCpcfkV.txt
Description: Text Data
_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
|
Home