Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

diff --combined planetlab/exp-tool/Makefile
index 4eaf838,2590fb6..b797f9f
--- 1/planetlab/exp-tool/Makefile
--- 2/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@@ -101,8 -101,6 +101,8 @@@ ovsversions: $(foreach id,$(ALL_NODE_ID
  # more general form; run with  make sshs SSH-COMMAND="bla bla bla"
  sshs: $(foreach id,$(ALL_NODE_IDS),ssh-$(id))
  .PHONY: sshs
 +showdpids: $(foreach id,$(ALL_NODE_IDS),showdpid-$(id))
 +.PHONY: showdpids
  
  DBS=$(foreach id,$(ALL_NODE_IDS),cache/db.$(id))
  dbs: $(DBS)
@@@ -144,9 -142,6 +144,9 @@@ ovsversion-%: FORC
  ssh-%: FORCE
        @$(SSH) $(HOST_$*) $(SUDO) $(SSH-COMMAND)
  
 +showdpid-%: FORCE
 +      @echo $(call display,$*) uses dpid=$$( $(SSH) $(HOST_$*) $(SUDO) ovs-vsctl get bridge $(BRIDGE) datapath_id)
 +
  # should probably replace sshcheck
  cache/status.%: FORCE
        @echo "=== DB and SWITCH processes on $(call display,$*)"
@@@ -202,8 -197,9 +202,9 @@@ U/%: del-iface.%@1 del-iface.%@
  # Deleting a bridge also deletes all interfaces of the bridge
  # as a side effect. This in turn invalidates local tunnel
  # port numbers and endpoint info on both sides of each affected tunnel.
- # The corresponding links obviously go down. We invalidate the
- # cache accordingly.
+ # The corresponding links obviously go down. 
+ # Controller information is also lost.
+ # We invalidate the cache accordingly.
  del-bridge.%: | cache/db.%
        @echo "Deleting bridge on $(call display,$*)"
        @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-bridge $(BRIDGE);
@@@ -211,7 -207,8 +212,8 @@@
              cache/iface.$*$(SEP)*@1 cache/iface.*$(SEP)$*@2 \
              cache/port.$*$(SEP)*@1  cache/port.*$(SEP)$*@2  \
              cache/endpoint.$*$(SEP)*@?  cache/endpoint.*$(SEP)$*@?  \
-             L/$*$(SEP)*             L/*$(SEP)$*
+             L/$*$(SEP)*             L/*$(SEP)$* \
+             cache/controller.$*
  
  # del-switch.<node_id>: Stops the switch daemon on <node_id>.
  #
@@@ -219,6 -216,7 +221,7 @@@
  # are no longer valid (they will change when the daemon is restarted)
  # and, therefore, the endpoint info on the remote side of
  # the tunnels must be invalidated. The links also go down.
+ # Controller information is also lost.
  # We invalidate the cache accordingly.
  del-switch.%:
        @echo "Shutting down switch on $(call display,$*)"
@@@ -226,7 -224,8 +229,8 @@@
        @rm -f cache/switch.$* \
               cache/port.$*$(SEP)*@1  cache/port.*$(SEP)$*@2  \
               cache/endpoint.$*$(SEP)*@2  cache/endpoint.*$(SEP)$*@1  \
-              L/$*$(SEP)*            L/*$(SEP)$*
+              L/$*$(SEP)*            L/*$(SEP)$* \
+              cache/controller.$*
  
  # del-db.<node_id>: Stops the db daemon on <node_id>.
  #
@@@ -409,6 -408,7 +413,7 @@@ stop.$(1): cache/stop.$(1) FORC
  status.$(1): cache/status.$(1) FORCE
  bridge.$(1): cache/bridge.$(1) FORCE
  host.$(1): cache/host.$(1) FORCE
+ controller.$(1): cache/controller.$(1) FORCE
  # switch already depends on db, but well
  cache/start.$(1): cache/db.$(1) cache/switch.$(1) FORCE
  endef