X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=728e260e751a68929d261c3b54cb9344d880fa2d;hb=eeec419708b0d85114a831ce6d442b97ed2449cd;hp=58708540ad8530a05fa4cca751394f1ee44358d0;hpb=f2f3c6399f6e87d2d60497ffc8ed3ff7355cbb51;p=sliver-openvswitch.git

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index 58708540a..728e260e7 100644
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -38,6 +38,7 @@ opp=$(call linkpart,$(1))@$(call flip,$(call endpart,$(1)))
 # rget(x-y@2) = x
 rget=$(call get,$(call opp,$(1)))
 ###
+default=$(if $($(1)_$(2)),$($(1)_$(2)),$($(1)))
 solve=$(HOST_$(1))
 solve_ip=$(IP_$(1))
 # can be redefined in conf.mk if that's not the expected behaviour
@@ -59,16 +60,17 @@ SSH = ssh $(SSH_OPTIONS)
 SUDO ?= sudo -S
 
 ALL_NODE_IDS=$(sort $(foreach link,$(LINKS),$(call leftnode,$(link))) $(foreach link,$(LINKS),$(call rightnode,$(link))))
+ALL_NODE_HOSTS=$(foreach id,$(ALL_NODE_IDS),$(call solve,$(id)))
 ALL_LINK_IDS=$(addsuffix @1,$(LINKS)) $(addsuffix @2,$(LINKS))
+CONF_NODE_IDS=$(subst HOST_,,$(filter HOST_%,$(.VARIABLES)))
 
 ####################
-all+init: init all
+init+all: init all
 init:
 	@[ -d L ] || ( echo Creating tmp dir L; mkdir L)
-	@[ -d U ] || ( echo Creating tmp dir U; mkdir U)
 	@[ -d log ] || (echo Creating tmp dir log; mkdir log)
 	@[ -d cache ] || ( echo Creating tmp dir cache; mkdir cache)
-.PHONY: all+init init
+.PHONY: init+all init
 
 FORCE:
 
@@ -83,14 +85,19 @@ showslice: ++SLICE FORCE
 
 shownodes:
 	@$(foreach id,$(ALL_NODE_IDS),echo $(id)=$(call display,$(id));)
+showhostnames: ++ALL_NODE_HOSTS
 showips:
 	@$(foreach id,$(ALL_NODE_IDS),echo $(id)=$(call display,$(id)) has ip/network set to $(IP_$(id));)
 showlinks:
 	@$(foreach link,$(LINKS), echo $(call display,$(call leftnode,$(link))) '====>' $(call display,$(call rightnode,$(link)));)
-.PHONY: shownodes showips showlinks
+showcontrollers:
+	@$(foreach id,$(ALL_NODE_IDS), echo $(call display,$(id)) has controller $(call default,CONTROLLER,$(id));)
+.PHONY: shownodes showhostnames showips showlinks showcontrollers
 
-sshchecks: $(foreach id,$(ALL_NODE_IDS),cache/sshcheck.$(id))
+sshchecks: $(foreach id,$(ALL_NODE_IDS),sshcheck-$(id))
 .PHONY: sshchecks
+ovsversions: $(foreach id,$(ALL_NODE_IDS),ovsversion-$(id))
+.PHONY: ovsversions
 
 DBS=$(foreach id,$(ALL_NODE_IDS),cache/db.$(id))
 dbs: $(DBS)
@@ -113,12 +120,22 @@ BRIDGES=$(foreach id,$(ALL_NODE_IDS),cache/bridge.$(id))
 bridges: $(BRIDGES)
 .PHONY: bridges
 
+CONTROLLERS=$(foreach id,$(ALL_NODE_IDS),cache/controller.$(id))
+controllers: $(CONTROLLERS)
+.PHONY: controllers
+
+del-controllers: $(foreach id,$(ALL_NODE_IDS),del-controller-$(id))
+.PHONY: del-controllers
+
 ### node-oriented targets
 # check ssh connectivity
-cache/sshcheck.%: FORCE
-	@if $(SSH) $(HOST_$*) hostname 2> /dev/null; then echo "ssh on" $(call display,$*) "OK" ; \
+sshcheck-%: FORCE
+	@if $(SSH) $(HOST_$*) hostname &> /dev/null; then echo "ssh on" $(call display,$*) "OK" ; \
 	 else echo "ssh on" $(call display,$*) "KO !!!"; fi
 
+ovsversion-%: FORCE
+	@OVSVERSION=$$($(SSH) $(HOST_$*) rpm -q sliver-openvswitch); echo $(call display,$*) has $$OVSVERSION
+
 # should probably replace sshcheck
 cache/status.%: FORCE
 	@echo "=== DB and SWITCH processes on $(call display,$*)"
@@ -141,6 +158,10 @@ cache/bridge.%: cache/switch.%
 	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs create-bridge $(BRIDGE) $(IP_$*) > $@ 2> $(call log,$@) || { rm $@; exit 1; }
 	@echo Created bridge with tap $$(cat $@) on $(call display,$*)
 
+cache/controller.%: cache/bridge.%
+	@echo "Setting controller $(call default,CONTROLLER,$*) on $(call display,$*) - logs in $(call log,$@)"
+	@$(SSH) $(HOST_$*) $(SUDO) ovs-vsctl set-controller $(BRIDGE) $(call default,CONTROLLER,$*) &> $(call log,$@) || { rm $@; exit 1; }
+
 # xxx this probably needs a more thorough cleanup in cache/
 cache/stop.%: del-bridge.%
 	@echo "Stopping switch & db on $(call display,$*)"
@@ -158,9 +179,7 @@ U/%: del-iface.%@1 del-iface.%@2
 
 del-bridge.%: cache/db.%
 	@echo "Deleting bridge on $(call display,$*)"
-	@if [ -f cache/bridge.$* ]; then \
-		$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-bridge $(BRIDGE);\
-	 fi
+	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-bridge $(BRIDGE);
 	@rm -f cache/bridge.$* \
 	      cache/iface.$*$(SEP)*@1 cache/iface.*$(SEP)$*@2 \
 	      cache/link.$*$(SEP)*@?  cache/link.*$(SEP)$*@?  \
@@ -176,6 +195,11 @@ del-db.%:
 	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop-db
 	@rm -f cache/db.$*
 
+del-controller.%:
+	@echo "Removing controller for $(call display,$*)"
+	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-controller $(BRIDGE)
+	@rm -f cache/controller.$*
+
 del-links: $(addprefix U/,$(notdir $(filter-out %.log,$(wildcard L/*))))
 
 del-switchs: $(addprefix del-,$(notdir $(filter-out %.log,$(wildcard cache/switch.*))))
@@ -186,6 +210,41 @@ shutdown: del-switchs del-dbs
 
 .PHONY: del-links del-switchs del-dbs shutdown
 
+
+### snapshots
+remote-snapshot: remote-snapshot-ips remote-snapshot-links
+	@true
+
+remote-snapshot-ips: $(addprefix cache/rsnap.ip.,$(CONF_NODE_IDS))
+	@cat /dev/null $^
+
+remote-snapshot-links: $(addprefix cache/rsnap.links.,$(CONF_NODE_IDS))
+	@sort -u /dev/null $^
+
+### update sliver-ovs
+update: $(addprefix update-,$(CONF_NODE_IDS))
+	@true
+
+update-%: FORCE
+	@[ -n "$(SLIVER_OVS)" ] || { echo "SLIVER_OVS not set" >&2; exit 1; }
+	@[ -f "$(SLIVER_OVS)" ] || { echo "$(SLIVER_OVS) not found" >&2; exit 1; }
+	@echo "Sending $(SLIVER_OVS) to $(call display,$*)"
+	@scp -q $(SLIVER_OVS) $(SLICE)@$(call solve,$*):
+	@$(SSH) $(call solve,$*) $(SUDO) mv $(notdir $(SLIVER_OVS)) /usr/sbin/sliver-ovs
+
+.PHONY: remote-snapshot remote-snapshot-ips remote-snapshot-links
+
+cache/rsnap.ip.%: 
+	@$(SSH) $(HOST_$*) $(SUDO) ovs-vsctl -- \
+		get interface $(BRIDGE) options:local_ip options:local_netmask |\
+		sed -n 's|"||g;1h;2{G;s|\(.*\)\n\(.*\)|IP_$* = \2/\1|p}' > $@ || \
+	 { rm $@; exit 1; }
+
+cache/rsnap.links.%: 
+	@$(SSH) $(HOST_$*) $(SUDO) ovs-vsctl list-ifaces $(BRIDGE) | \
+	 sed -n 's/^L/LINKS += /p' > $@ || \
+	 { rm $@; exit 1; }
+
 .SECONDEXPANSION:
 
 del-iface.%: cache/db.$$(call get,%)
@@ -230,10 +289,11 @@ graph.dot:
 graph.ps: graph.dot
 	dot -Tps < $^ > $@	
 
+
 ####################
 # 'virtual' targets in that there's no real file attached
 define node_shortcuts
-sshcheck.$(1): cache/sshcheck.$(1) FORCE
+sshcheck.$(1): sshcheck-$(1) FORCE
 db.$(1): cache/db.$(1) FORCE
 switch.$(1): cache/switch.$(1) FORCE
 start.$(1): cache/start.$(1) FORCE
@@ -254,6 +314,9 @@ endef
 
 $(foreach id,$(ALL_LINK_IDS), $(eval $(call link_shortcuts,$(id))))
 
+help:
+	@cat Makefile.help
+
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)
 # make ++foo : idem but verbose, i.e. foo=$(foo)