xenserver: Add assertion and additional comments to ovs-vsctl commands.

I found these useful while debugging.

Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
index 73c0104a38e32bf86308a79e1d9b0303b2e57ebc..831846a2ad910bc687eca9aa7a9a6fc87179cd3f 100644 (file)
--- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
+++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
@@ -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):