X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=ad56acc0fc0ee77a51b9185e6c83991fa5285e97;hp=2ec1bc183badeb5c9975f84e14c96a5de51cb172;hb=HEAD;hpb=c9409e7744fbdbb8d8f0a7a04214b680a0360c89 diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile index 2ec1bc183..ad56acc0f 100644 --- a/planetlab/exp-tool/Makefile +++ b/planetlab/exp-tool/Makefile @@ -6,6 +6,8 @@ # should work with any shell, but we have only tested bash SHELL=/bin/bash +.DELETE_ON_ERROR: + # run make CONF=anotherconfig.mk if you need several configs CONF ?= conf.mk @@ -158,7 +160,7 @@ showdpid-%: FORCE @echo $*_DPID=0x$$( $(SSH) $(HOST_$*) $(SUDO) ovs-vsctl get bridge $(BRIDGE) datapath_id | sed -e 's,",,g') showmac-%: FORCE - @echo $*_MAC=\"$$( $(SSH) $(HOST_$*) $(SUDO) sliver-ovs show-mac)\" + @echo $*_MAC=\"$$( $(SSH) $(HOST_$*) $(SUDO) sliver-ovs get-mac $(BRIDGE))\" showports-%: FORCE @$(SSH) $(HOST_$*) $(SUDO) ovs-ofctl show $(BRIDGE) \ @@ -170,27 +172,29 @@ cache/status.%: FORCE @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs status ||: cache/host.%: - @echo "IP lookup for $(call display,$*)" - @host $(HOST_$*) | sed -n 's/^.*has address *//p' > $@ + @echo "IP lookup for $(call display,$*) - logs in $(call log,$@)" + @host $(HOST_$*) | sed -n 's/^.*has address *//p' > $@ 2> $(call log,$@) cache/db.%: @echo "Starting db server on $(call display,$*) - logs in $(call log,$@)" - @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-db > $(call log,$@) 2>&1 && touch $@ + @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-db > $(call log,$@) 2>&1 + @touch $@ cache/switch.%: | cache/db.% @echo "Starting vswitchd on $(call display,$*) - logs in $(call log,$@)" - @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-switch > $(call log,$@) 2>&1 && touch $@ + @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-switch > $(call log,$@) 2>&1 + @touch $@ cache/bridge.%: | cache/db.% @echo "Creating bridge on $(call display,$*) - logs in $(call log,$@)" @$(SSH) $(HOST_$*) $(SUDO) \ - sliver-ovs create-bridge $(BRIDGE) $(IP_$*) $(call default,BROPTIONS,$*) > $(call log,$@) 2>&1 \ - && { echo "IP_$*=$(IP_$*)"; echo "BROPTIONS_$*=$(call default,BROPTIONS,$*)"; } > $@ + sliver-ovs create-bridge $(BRIDGE) $(IP_$*) $(call default,BROPTIONS,$*) > $(call log,$@) 2>&1 + @{ echo "IP_$*=$(IP_$*)"; echo "BROPTIONS_$*=$(call default,BROPTIONS,$*)"; } > $@ 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,$@) 2>&1 \ - && echo "CONTROLLER_$*=$(call default,CONTROLLER,$*)" > $@ + @$(SSH) $(HOST_$*) $(SUDO) ovs-vsctl set-controller $(BRIDGE) $(call default,CONTROLLER,$*) > $(call log,$@) 2>&1 + @echo "CONTROLLER_$*=$(call default,CONTROLLER,$*)" > $@ # xxx this probably needs a more thorough cleanup in cache/ cache/stop.%: del-bridge.% @@ -224,7 +228,7 @@ U/%: del-iface.%@1 del-iface.%@2 # We invalidate the cache accordingly. del-bridge.%: | cache/db.% @echo "Deleting bridge on $(call display,$*)" - @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-bridge $(BRIDGE); + @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-bridge $(BRIDGE) @rm -f cache/bridge.$* \ cache/iface.$*$(SEP)*@1 cache/iface.*$(SEP)$*@2 \ cache/port.$*$(SEP)*@1 cache/port.*$(SEP)$*@2 \ @@ -302,13 +306,11 @@ remote-snapshot-links: $(addprefix cache/rsnap.links.,$(CONF_NODE_IDS)) cache/rsnap.ip.%: FORCE @$(SSH) $(HOST_$*) $(SUDO) \ - sliver-ovs get-local-ip $(BRIDGE) | sed 's/^/IP_$*=/' > $@ \ - || { rm $@; exit 1; } + sliver-ovs get-local-ip $(BRIDGE) | sed 's/^/IP_$*=/' > $@ cache/rsnap.links.%: FORCE @$(SSH) $(HOST_$*) $(SUDO) \ - sliver-ovs get-local-links $(BRIDGE) | sed -n 's/^L/LINKS += /p' > $@ \ - || { rm $@; exit 1; } + sliver-ovs get-local-links $(BRIDGE) | sed -n 's/^L/LINKS += /p' > $@ ### update sliver-ovs update: $(addprefix update-,$(CONF_NODE_IDS)) @@ -358,8 +360,8 @@ del-iface.%: | cache/db.$$(call get,%) cache/iface.%: cache/bridge.$$(call get,%) | cache/db.$$(call get,%) @echo "Creating interface for link $(call linkpart,$(*F)) on $(call display,$(call get,$(*F))) - logs in $(call log,$@)" @$(SSH) $(call solve,$(call get,$(*F))) $(SUDO) sliver-ovs create-port $(BRIDGE) \ - L$(call linkpart,$(*F)) > $(call log,$@) 2>&1 \ - && touch $@ + L$(call linkpart,$(*F)) > $(call log,$@) 2>&1 + @touch $@ # cache/port.-@: # Retrieves the local port of link - on @@ -372,8 +374,7 @@ cache/iface.%: cache/bridge.$$(call get,%) | cache/db.$$(call get,%) cache/port.%: cache/iface.% cache/switch.$$(call get,%) @echo "Getting port number for link $(call linkpart,$(*F)) on $(call display,$(call get,$(*F))) - logs in $(call log,$@)" @$(SSH) $(call solve,$(call get,$(*F))) $(SUDO) \ - sliver-ovs get-local-endpoint L$(call linkpart,$(*F)) > $@ 2> $(call log,$@) \ - || { rm $@; exit 1; } + sliver-ovs get-local-endpoint L$(call linkpart,$(*F)) > $@ 2> $(call log,$@) # linkid=$(call linkpart,%) @@ -387,12 +388,27 @@ cache/port.%: cache/iface.% cache/switch.$$(call get,%) # # We need the IP address and the UDP port of the other side and the interace of this side. # We need to set the info again if any of these change. -cache/endpoint.%: cache/host.$$(call rget,%) cache/port.$$(call opp,%) cache/iface.% +cache/endpoint.%: cache/host.$$(call rget,%) cache/port.$$(call opp,%) cache/iface.% | cache/db.$$(call get,%) @echo "Setting port number of link $(call linkpart,$(*F)) on $(call display,$(call get,$(*F))) - logs in $(call log,$@)" @$(SSH) $(call solve,$(call get,$(*F))) $(SUDO) sliver-ovs set-remote-endpoint L$(call linkpart,$(*F)) \ $$(cat cache/host.$(call rget,$(*F))) \ - $$(cat cache/port.$(call opp,$(*F))) 2> $(call log,$@) \ - && touch $@ + $$(cat cache/port.$(call opp,$(*F))) 2> $(call log,$@) + @touch $@ + + +###################### +# testing +###################### + +test: $(foreach l,$(LINKS),test-$(l)) + +test-%: ping-% ping-$$(call get,$$*@2)$(SEP)$$(call get,$$*@1) + @true + +ping-%: FORCE + @echo "Testing connectivity $(call get,$*@1) ===> $(call get,$*@2) - logs in $(call log,$@)" + @$(SSH) $(call solve,$(call get,$*@1)) ping -c 1 $(call solve_ip_addr,$(call get,$*@2)) > $(call log,$@) 2>&1 + @echo "Connectivity $(call get,$*@1) ===> $(call get,$*@2) OK" #################### CLEANTARGETS=$(addprefix del-,$(notdir $(wildcard cache/bridge.*))) @@ -470,7 +486,7 @@ cache/geocode.%: cache/loc.% $(CONF) cache/loc.%: $(CONF) @wget -O - 'http://freegeoip.net/csv/$(HOST_$*)' | \ - awk -F, '{ printf "%s, %s\n", $$8, $$9 }' > $@ + awk -F'", *"' '{ printf "\"%s\", \"%s\"\n", $$8, $$9 }' > $@ #################### # 'virtual' targets in that there's no real file attached @@ -509,3 +525,92 @@ help: +%: varname=$(subst +,,$@) +%: @echo "$($(varname))" + +# external nodes and links +# +ALL_LINKS := $(LINKS) $(patsubst L/%,%,$(filter L/%,$(MAKECMDGOALS))) +EXTERNAL_LINKS := $(filter $(foreach host,$(EXTERNAL_HOSTS),%-$(host)),$(ALL_LINKS)) + +$(foreach host,$(EXTERNAL_HOSTS),sshcheck-$(host)): ; +$(foreach host,$(EXTERNAL_HOSTS),ovsversion-$(host)): ; +$(foreach host,$(EXTERNAL_HOSTS),showdpid-$(host)): ; +$(foreach host,$(EXTERNAL_HOSTS),showmac-$(host)): ; +$(foreach host,$(EXTERNAL_HOSTS),showports-$(host)): ; +$(foreach host,$(EXTERNAL_HOSTS),update-$(host)): ; +$(foreach host,$(EXTERNAL_HOSTS),del-controller-$(host)): ; +$(foreach host,$(EXTERNAL_HOSTS),cache/status.$(host)): ; +$(foreach host,$(EXTERNAL_HOSTS),cache/controller.$(host)): ; + +$(foreach host,$(EXTERNAL_HOSTS),cache/rsnap.ip.$(host)): ; + @touch $@ + +$(foreach host,$(EXTERNAL_HOSTS),cache/rsnap.links.$(host)): ; + @touch $@ + +$(foreach host,$(EXTERNAL_HOSTS),cache/db.$(host)): + @touch $@ + +$(foreach host,$(EXTERNAL_HOSTS),del-db.$(host)): del-db.%: + @rm cache/db.$* + +$(foreach host,$(EXTERNAL_HOSTS),cache/switch.$(host)): ; + @touch $@ + +$(foreach host,$(EXTERNAL_HOSTS),del-switch.$(host)): 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)$* \ + cache/controller.$* + +.SECONDEXPANSION: + +$(foreach host,$(EXTERNAL_HOSTS),cache/bridge.$(host)): cache/bridge.%: | cache/db.% + @echo "Creating fake bridge on external host $(call display,$*)" + @touch $@ + +$(foreach link,$(EXTERNAL_LINKS),cache/iface.$(link)@2): cache/iface.%: cache/bridge.$$(call get,%) | cache/db.$$(call get,%) + @echo "Creating fake interface for link $(call linkpart,$*) on external host $(call get,$*)" + @touch $@ + +$(foreach link,$(EXTERNAL_LINKS),cache/port.$(link)@2): cache/port.%: cache/iface.% cache/switch.$$(call get,%) + @echo "Getting port number for link $(call linkpart,$(*F)) on external host $(call display,$(call get,$(*F)))" + @echo $(call default,EXTERNAL_PORT,$(call rightnode,$*)) > $@ + + +$(foreach link,$(EXTERNAL_LINKS),del-iface.$(link)@2): del-iface.%: | cache/db.$$(call get,%) + @echo "Removing fake interface for link $(call linkpart,$*) from external host $(call get,$*)" + @rm -f cache/iface.$* \ + cache/port.$* cache/endpoint.$* cache/endpoint.$(call opp,$*) \ + L/$(call linkpart,$*) + +$(foreach host,$(EXTERNAL_HOSTS),del-bridge.$(host)): del-bridge.%: | cache/db.% + @echo "Deleting fake bridge on external host $(call display,$*)" + @rm -f cache/bridge.$* \ + 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)$* \ + cache/controller.$* + +$(foreach link,$(EXTERNAL_LINKS),ping-$(call get,$(link)@2)$(SEP)$(call get,$(link)@1)): ping-%: FORCE + @echo "Test from external host $(call get,$*@1) to $(call get,$*@2) skipped" + +# we assume that a program called tunproxy is available on the +# external nodes. +$(foreach link,$(EXTERNAL_LINKS),cache/endpoint.$(link)@2): cache/endpoint.%@2: cache/port.%@1 cache/host.$$(call leftnode,%) + @#echo $* [$<] [$^] $(call rightnode,$*) + @echo "===>" $(call rightnode,$*): \ + ./tunproxy -t $$(cat cache/host.$(call leftnode,$*)):$$(cat cache/port.$*@1) \ + -p $(call default,EXTERNAL_PORT,$(call rightnode,$*)) -e -d + +# reporting +.PHONY: report +report: + @echo SHELL=$(SHELL) + @echo "===> Configuration ($(CONF)):" + @cat $(CONF) + @for f in log/*; do \ + echo "===> Log file $$(basename $$f):"; \ + cat $$f; \ + done