X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=ad56acc0fc0ee77a51b9185e6c83991fa5285e97;hb=HEAD;hp=ae2700866c9176fe298442eda59ec428d8af3711;hpb=e8d780af73b8571f5998cae8d3fa97069e49c9fe;p=sliver-openvswitch.git diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile index ae2700866..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 @@ -11,6 +16,9 @@ include $(CONF) # if undefined in the conf file, use single dash SEP?=- +# bridge name (XXX the same on all nodes) +BRIDGE?=$(SLICE) + ### helper functions # flip(1) = 2 # flip(2) = 1 @@ -35,11 +43,15 @@ 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 display?=host $(1) aka $(call solve,$(1)) +# log file name +log=$(addprefix log/,$(notdir $(1))) + #################### set variables after conf.mk ifeq "$(SSH_KEY)" "" SSH_KEY_OPTION ?= @@ -53,15 +65,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: @@ -76,14 +90,31 @@ 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: @$(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 +# 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) @@ -106,86 +137,210 @@ 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 2>&1; 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 + +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 + @$(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 $@.log" - @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-db &> $@.log && touch $@ + @echo "Starting db server on $(call display,$*) - logs in $(call log,$@)" + @$(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 $@ -cache/switch.%: cache/db.% - @echo "Starting vswitchd on $(call display,$*) - logs in $@.log" - @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-switch &> $@.log && 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,$*)"; } > $@ -cache/bridge.%: cache/switch.% - @echo "Creating bridge on $(call display,$*) - logs in $@.log" - @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs create-bridge $(IP_$*) > $@ 2> $@.log || { rm $@; exit 1; } - @echo Created bridge $$(cat $@) on $(HOST_$*) +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,$*)" > $@ # xxx this probably needs a more thorough cleanup in cache/ cache/stop.%: del-bridge.% @echo "Stopping switch & db on $(call display,$*)" - @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop && rm cache/switch.% cache/db.% + @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop && rm cache/switch.$* cache/db.$* ### link-oriented targets -# L/- -L/%: cache/link.%@1 cache/link.%@2 +# L/-: +# Establish a link between nodes and +L/%: cache/endpoint.%@1 cache/endpoint.%@2 @touch $@ - @echo "Created link $*" + @echo "Link $* is up" +# U/- +# Tear down the link between nodes and U/%: del-iface.%@1 del-iface.%@2 @rm -f L/$* @echo "Deleted link $*" -del-bridge.%: cache/db.% +# del-bridge.: Delete the bridge on node . +# +# We can do this only if the db on node is running, but +# we don't need to re-delete if the db is restarted (hence the +# order-only dependency). +# +# Deleting a bridge also deletes all interfaces of the bridge +# as a side effect. This in turn invalidates local tunnel +# port numbers and endpoint info on both sides of each affected tunnel. +# The corresponding links obviously go down. +# Controller information is also lost. +# We invalidate the cache accordingly. +del-bridge.%: | cache/db.% @echo "Deleting bridge on $(call display,$*)" - @if [ -f cache/bridge.$* ]; then \ - $(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-bridge $$(cat cache/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)$*@? \ - L/$*$(SEP)* L/*$(SEP)$* - -del-switch.%: del-bridge.% + cache/port.$*$(SEP)*@1 cache/port.*$(SEP)$*@2 \ + cache/endpoint.$*$(SEP)*@? cache/endpoint.*$(SEP)$*@? \ + L/$*$(SEP)* L/*$(SEP)$* \ + cache/controller.$* + +# del-switch.: Stops the switch daemon on . +# +# As a side effect, the local port numbers of the tunnels +# are no longer valid (they will change when the daemon is restarted) +# and, therefore, the endpoint info on the remote side of +# the tunnels must be invalidated. The links also go down. +# Controller information is also lost. +# We invalidate the cache accordingly. +del-switch.%: @echo "Shutting down switch on $(call display,$*)" - @[ -f cache/switch.$* ] && $(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop-switch - @rm -f cache/switch.$* - + @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop-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.$* + +# del-db.: Stops the db daemon on . +# +# This has no additional side effects. del-db.%: @echo "Shutting down db on $(call display,$*)" - @[ -f cache/db.$* ] && $(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop-db + @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop-db @rm -f cache/db.$* -del-links: $(addprefix U/,$(notdir $(filter-out %.log,$(wildcard L/*)))) +# del-controller.: +# Detaches from the controller. +# +# This has no additional side effects. +del-controller-%: | cache/db.% + @echo "Removing controller for $(call display,$*)" + @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-controller $(BRIDGE) + @rm -f cache/controller.$* + +# del-links: Shortcut to delete all currently up links. +del-links: $(addprefix U/,$(notdir $(wildcard L/*))) -del-switchs: $(addprefix del-,$(notdir $(filter-out %.log,$(wildcard cache/switch.*)))) +# del-switchs: Shortcut to stop all currently running switch daemons. +del-switchs: $(addprefix del-,$(notdir $(wildcard cache/switch.*))) -del-dbs: $(addprefix del-,$(notdir $(filter-out %.log,$(wildcard cache/db.*)))) +# del-dbs: Shortcut to stop all currently running db daemona.s +del-dbs: $(addprefix del-,$(notdir $(wildcard cache/db.*))) +# shutdown: Shortcut to stop all currently running daemons. shutdown: del-switchs del-dbs .PHONY: del-links del-switchs del-dbs shutdown + +### 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 + +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 $^ + +.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 + +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 $(SSH_KEY_OPTION) -q $(SLIVER_OVS) $(SLICE)@$(call solve,$*): + @$(SSH) $(call solve,$*) $(SUDO) mv $(notdir $(SLIVER_OVS)) /usr/sbin/sliver-ovs + .SECONDEXPANSION: -del-iface.%: cache/db.$$(call get,%) +# del-iface.-@: +# Deletes the interface of link - on either +# or , according to . +# +# We need a running db daemon to do this, but we do not have to +# 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. 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/link.$* cache/link.$(call opp,$*) + @rm -f cache/iface.$* \ + cache/port.$* cache/endpoint.$* cache/endpoint.$(call opp,$*) \ + L/$(call linkpart,$*) ### '%' here is leftid-rightid@{1,2} @@ -193,29 +348,73 @@ del-iface.%: cache/db.$$(call get,%) #linkid=$(call linkpart,%) #nodeid=$(call get,%) #bridgefile=cache/bridge.$(nodeid) -cache/iface.%: cache/bridge.$$(call get,%) - @echo "Creating interface for link $(call linkpart,$(*F)) on $(call display,$(call get,$(*F))) - logs in $@.log" - @$(SSH) $(call solve,$(call get,$(*F))) $(SUDO) sliver-ovs create-port $$(cat cache/bridge.$(call get,$(*F))) L$(call linkpart,$(*F)) > $@ 2> $@.log || { rm $@; exit 1; } - echo cache/bridge.$(call get,$(*F)) - echo cache/host.$(call get,$(*F)) cache/iface.$(*F) cache/iface.$(call opp,$(*F)) + +# cache/iface.-@: +# Creates the interface for link - on +# >. +# +# The bridge of the local node must already exist, and we need to create +# the interface again if the bridge is re-created. +# We also need a running db daemon, but we do not need to do anything +# if the db daemon is restarted. +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 $@ + +# cache/port.-@: +# Retrieves the local port of link - on +# node >. +# +# The local interface must have been created already and the +# switch daemon must be running. We need to retrieve the port +# number again if the interface is re-created, or the switch +# daemon is restarted. +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,$@) # linkid=$(call linkpart,%) # nodeid=$(call get,%) # iface1=cache/iface.% # iface2=cache/iface.$(call opp,%) -cache/link.%: cache/host.$$(call get,%) cache/iface.% cache/iface.$$(call opp,%) - @echo "Setting port number of link $(call linkpart,$(*F)) on $(call display,$(call get,$(*F))) - logs in $@.log" + +# cache/endpoint.-@: +# Sets the other side (IP address, UDP port) info for link - +# on >. +# +# 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/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/iface.$(call opp,$(*F))) 2> $@.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 $(filter-out %.log,$(wildcard cache/bridge.*)))) +CLEANTARGETS=$(addprefix del-,$(notdir $(wildcard cache/bridge.*))) clean: $(CLEANTARGETS) distclean: - rm -rf L U cache + rm -rf L log cache .PHONY: clean distclean #################### @@ -224,10 +423,75 @@ graph.dot: graph.ps: graph.dot dot -Tps < $^ > $@ +#################### +# googlemap stuff +# Uses: +# GMAP_SERVER, the hostname that runs an ndnmap instance +# GMAP_PROBES, a list of tuples of the form +# === +# e.g. +# SENDER-MUX=SENDER=3=0.5 +# which would mean, the link 'SENDER-MUX' should be monitored at the 'SENDER' node and is coded +# in links.json with id=3, every half second +# sliver-ovs gmap-probe is designed to run in background, +# and so that a new run will kill any previously running instance +gprobes: $(foreach probe,$(GMAP_PROBES),gprobe-$(probe)) + +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 -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 @@ -235,6 +499,7 @@ stop.$(1): cache/stop.$(1) FORCE status.$(1): cache/status.$(1) FORCE bridge.$(1): cache/bridge.$(1) FORCE host.$(1): cache/host.$(1) FORCE +controller.$(1): cache/controller.$(1) FORCE # switch already depends on db, but well cache/start.$(1): cache/db.$(1) cache/switch.$(1) FORCE endef @@ -243,11 +508,14 @@ $(foreach id,$(ALL_NODE_IDS), $(eval $(call node_shortcuts,$(id)))) define link_shortcuts iface.%: cache/iface.% -link.%: cache/link.% +endpoint.%: cache/endpoint.% 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) @@ -257,3 +525,92 @@ $(foreach id,$(ALL_LINK_IDS), $(eval $(call link_shortcuts,$(id)))) +%: 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