X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=4eaf8387db67a88d9e15eed0ed5b4f6ea698c309;hb=9339f53ac84c4e8734e878e522e4cd174aca3453;hp=fdfff1637b21f619aaf77b6c408bb04514136105;hpb=fc582831c774c336fe2a961ffea02de10be6818e;p=sliver-openvswitch.git diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile index fdfff1637..4eaf8387d 100644 --- a/planetlab/exp-tool/Makefile +++ b/planetlab/exp-tool/Makefile @@ -101,6 +101,8 @@ ovsversions: $(foreach id,$(ALL_NODE_IDS),ovsversion-$(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) @@ -142,6 +144,9 @@ ovsversion-%: FORCE 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,$*)" @@ -299,12 +304,14 @@ cache/rsnap.links.%: # redo the delete if the db daemon is restarted. # # This also invalidates the local port of the tunnel and the endpoint -# info on both sides of the tunnel. +# info on both sides of the tunnel. The link goes down. del-iface.%: | cache/db.$$(call get,%) @echo "Removing interface for link $(call linkpart,$*) from $(call get,$*)" @$(SSH) $(HOST_$(call get,$*)) \ $(SUDO) sliver-ovs del-port L$(call linkpart,$*) - @rm -f cache/iface.$* cache/port.$* cache/endpoint.$* cache/endpoint.$(call opp,$*) + @rm -f cache/iface.$* \ + cache/port.$* cache/endpoint.$* cache/endpoint.$(call opp,$*) \ + L/$(call linkpart,$*) ### '%' here is leftid-rightid@{1,2}