X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=ad56acc0fc0ee77a51b9185e6c83991fa5285e97;hp=2590fb6aa9cc05810abe34b005e67691d8c148a3;hb=HEAD;hpb=7c5db2517abd756d01001f208a5ed2d45165de6b diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile index 2590fb6aa..ad56acc0f 100644 --- a/planetlab/exp-tool/Makefile +++ b/planetlab/exp-tool/Makefile @@ -3,6 +3,11 @@ # HOST_ and IP_ for all nodes involved, as well as # LINKS as a list of - elements +# 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 @@ -86,6 +91,9 @@ showslice: ++SLICE FORCE shownodes: @$(foreach id,$(ALL_NODE_IDS),echo $(id)=$(call display,$(id));) showhostnames: ++ALL_NODE_HOSTS +# xxx missing: something that outputs raw python stuff like +# SEND_IP="10.0.16.1" +# that would belong in the export to OF showips: @$(foreach id,$(ALL_NODE_IDS),echo $(id)=$(call display,$(id)) has ip/network set to $(IP_$(id));) showlinks: @@ -101,6 +109,12 @@ 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 +showmacs: $(foreach id,$(ALL_NODE_IDS),showmac-$(id)) +.PHONY: showmacs +showports: $(foreach id,$(ALL_NODE_IDS),showports-$(id)) +.PHONY: showports DBS=$(foreach id,$(ALL_NODE_IDS),cache/db.$(id)) dbs: $(DBS) @@ -133,7 +147,7 @@ del-controllers: $(foreach id,$(ALL_NODE_IDS),del-controller-$(id)) ### node-oriented targets # check ssh connectivity sshcheck-%: FORCE - @if $(SSH) $(HOST_$*) hostname &> /dev/null; then echo "ssh on" $(call display,$*) "OK" ; \ + @if $(SSH) $(HOST_$*) hostname > /dev/null 2>&1; then echo "ssh on" $(call display,$*) "OK" ; \ else echo "ssh on" $(call display,$*) "KO !!!"; fi ovsversion-%: FORCE @@ -142,33 +156,45 @@ ovsversion-%: FORCE ssh-%: FORCE @$(SSH) $(HOST_$*) $(SUDO) $(SSH-COMMAND) +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 get-mac $(BRIDGE))\" + +showports-%: FORCE + @$(SSH) $(HOST_$*) $(SUDO) ovs-ofctl show $(BRIDGE) \ + | perl -nle '/(\d+)\(L(.*?)\Q$(SEP)\E(.*?)\):/ && \ + print "PORT_".("$$2" eq "$*" ? "$$2_$$3" : "$$3_$$2")."=$$1"' # should probably replace sshcheck cache/status.%: FORCE @echo "=== DB and SWITCH processes on $(call display,$*)" @$(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,$@) && 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,$@) && 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,$@) \ - && touch $@ + 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,$@) \ - && touch $@ + @$(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.% @@ -202,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 \ @@ -260,6 +286,12 @@ shutdown: del-switchs del-dbs ### snapshots +snapshot: + @echo BRIDGE=$(BRIDGE) + @cat cache/bridge.* 2>/dev/null || : + @cat cache/controller.* 2>/dev/null || : + @ls L | sed 's/^/LINKS += /' + remote-snapshot: remote-snapshot-ips remote-snapshot-links @true @@ -269,6 +301,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 $^ +.PHONY: remote-snapshot remote-snapshot-ips remote-snapshot-links + + +cache/rsnap.ip.%: FORCE + @$(SSH) $(HOST_$*) $(SUDO) \ + 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' > $@ + ### update sliver-ovs update: $(addprefix update-,$(CONF_NODE_IDS)) @true @@ -277,22 +320,9 @@ 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,$*): + @scp $(SSH_KEY_OPTION) -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.-@: @@ -330,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,$@) \ - && touch $@ + L$(call linkpart,$(*F)) > $(call log,$@) 2>&1 + @touch $@ # cache/port.-@: # Retrieves the local port of link - on @@ -344,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) \ - ovs-appctl netdev-tunnel/get-port 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,%) @@ -359,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.*))) @@ -397,6 +441,53 @@ gprobe-%: FORCE $(SSH) -n $(call solve,$(word 2,$(subst @, ,$(*F)))) $(SUDO) \ sliver-ovs gmap-probe L$(word 1,$(subst @, ,$(*F))) $(GMAP_SERVER) $(word 3,$(subst @, ,$(*F))) $(word 4,$(subst @, ,$(*F))) +jsons: routers.json links.json geocode.json +.PHONE: jsons + +routers.json: $(CONF) + @{ echo "["; \ + sep=" "; \ + for n in $(CONF_NODE_IDS); do \ + echo " $$sep\"$$n\""; \ + sep=", "; \ + done; \ + echo "]"; \ + } > $@ + +links.json: $(foreach l,$(LINKS),cache/json.$(l)) + @{ echo "["; \ + cat $^ | sed '2,$$s/^/, /'; \ + echo "]"; \ + } > $@ + +cache/json.%: $(CONF) + @echo "{\"id\": $($*_linkid), \"start\": \"$(call get,$*@1)\", \"end\": \"$(call get,$*@2)\"}" > $@ + +geocode.json: $(foreach n,$(CONF_NODE_IDS),cache/geocode.$(n)) + @{ echo "{"; \ + sep=" "; \ + for f in $^; do \ + echo -n "$$sep"; \ + cat $$f; \ + sep=", "; \ + done; \ + echo "}"; \ + } > $@ + +cache/geocode.%: cache/loc.% $(CONF) + @{ echo "\"$*\": {"; \ + echo " \"name\": \"$(HOST_$*)\","; \ + echo " \"shortname\": \"$*\","; \ + echo " \"site\": \"\","; \ + echo " \"backbone\": false,"; \ + echo " \"position\": [ $(shell cat cache/loc.$*) ]"; \ + echo " }"; \ + } > $@ + +cache/loc.%: $(CONF) + @wget -O - 'http://freegeoip.net/csv/$(HOST_$*)' | \ + awk -F'", *"' '{ printf "\"%s\", \"%s\"\n", $$8, $$9 }' > $@ + #################### # 'virtual' targets in that there's no real file attached define node_shortcuts @@ -434,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