]> xenbits.xensource.com Git - xcp/xen-api.git/commitdiff
[PATCH] xenserver: Add assertion and additional comments to ovs-vsctl commands.
authorBen Pfaff <blp@nicira.com>
Thu, 8 Jul 2010 13:25:51 +0000 (14:25 +0100)
committerBen Pfaff <blp@nicira.com>
Thu, 8 Jul 2010 13:25:51 +0000 (14:25 +0100)
From 86e1bb44dadf886a34bfef00b5523873081f32fe Mon Sep 17 00:00:00 2001
Date: Mon, 22 Feb 2010 13:42:02 -0800
I found these useful while debugging.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 ...ensource_libexec_InterfaceReconfigureVswitch.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

scripts/InterfaceReconfigureVswitch.py

index 2b3108e01394a7596d468cdda2ac4433c862ac3c..0d14251bff2b7f615cd9986d4d479de09b42154e 100644 (file)
@@ -171,10 +171,13 @@ def configure_datapath(pif):
     vsctl_argv = []
     extra_up_ports = []
 
+    assert not pif_is_vlan(pif)
     bridge = pif_bridge_name(pif)
 
     physical_devices = datapath_get_physical_pifs(pif)
 
+    vsctl_argv += ['## configuring datapath %s' % bridge]
+
     # Determine additional devices to deconfigure.
     #
     # Given all physical devices which are part of this PIF we need to
@@ -258,6 +261,8 @@ def configure_datapath(pif):
         vsctl_argv += ['--', '--may-exist', 'add-port', bridge, iface]
 
     vsctl_argv += set_br_external_ids(pif)
+    vsctl_argv += ['## done configuring datapath %s' % bridge]
+
     return vsctl_argv,extra_up_ports
 
 def deconfigure_bridge(pif):