X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;fp=planetlab%2Fexp-tool%2FMakefile;h=b797f9fae4267795c9b49b4358e5ba5e1d991821;hb=3c7126b933c3ccb263648c59ffd010e97f2fb634;hp=4eaf8387db67a88d9e15eed0ed5b4f6ea698c309;hpb=9339f53ac84c4e8734e878e522e4cd174aca3453;p=sliver-openvswitch.git

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index 4eaf8387d..b797f9fae 100644
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -202,8 +202,9 @@ U/%: del-iface.%@1 del-iface.%@2
 # 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 +212,8 @@ del-bridge.%: | cache/db.%
 	      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 +221,7 @@ del-bridge.%: | cache/db.%
 # 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 +229,8 @@ del-switch.%:
 	@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 +413,7 @@ stop.$(1): cache/stop.$(1) FORCE
 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