X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=ba4f69a246f0480842ba9df4558f2c38426ca595;hb=21ccf217a1462ccfe1b822d88acf5761a33e0f92;hp=a6b0103e2305b746bd3818727b8343a7087d3287;hpb=1b8dc556ec606a7db8709e4bb4c6dba6a4ad9cef;p=sliver-openvswitch.git diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile index a6b0103e2..ba4f69a24 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 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,16 +120,26 @@ 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,$*)" - @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs status + @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs status ||: cache/host.%: @echo "IP lookup for $(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,$*)" @@ -174,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.*)))) @@ -195,6 +221,17 @@ remote-snapshot-ips: $(addprefix cache/rsnap.ip.,$(CONF_NODE_IDS)) 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.%: @@ -243,7 +280,7 @@ cache/link.%: cache/host.$$(call rget,%) cache/iface.% cache/iface.$$(call opp,% CLEANTARGETS=$(addprefix del-,$(notdir $(filter-out %.log,$(wildcard cache/bridge.*)))) clean: $(CLEANTARGETS) distclean: - rm -rf L U cache + rm -rf L log cache .PHONY: clean distclean #################### @@ -252,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 @@ -276,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)