X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=d1c9062d760e2d64c690de2ef5e57f5238fdfd1b;hb=7a97619ae4484604c15b846ce7268094e048729a;hp=4eaf8387db67a88d9e15eed0ed5b4f6ea698c309;hpb=9339f53ac84c4e8734e878e522e4cd174aca3453;p=sliver-openvswitch.git diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile index 4eaf8387d..d1c9062d7 100644 --- a/planetlab/exp-tool/Makefile +++ b/planetlab/exp-tool/Makefile @@ -86,6 +86,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: @@ -103,6 +106,10 @@ 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) @@ -145,8 +152,15 @@ ssh-%: FORCE @$(SSH) $(HOST_$*) $(SUDO) $(SSH-COMMAND) showdpid-%: FORCE - @echo $(call display,$*) uses dpid=$$( $(SSH) $(HOST_$*) $(SUDO) ovs-vsctl get bridge $(BRIDGE) datapath_id) + @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)\" + +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,$*)" @@ -168,12 +182,12 @@ 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 $@ + && { 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 $@ + && echo "CONTROLLER_$*=$(call default,CONTROLLER,$*)" > $@ # xxx this probably needs a more thorough cleanup in cache/ cache/stop.%: del-bridge.% @@ -202,8 +216,9 @@ U/%: del-iface.%@1 del-iface.%@2 # 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. We invalidate the -# cache accordingly. +# 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,$*)" @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-bridge $(BRIDGE); @@ -211,7 +226,8 @@ del-bridge.%: | cache/db.% 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)$* + L/$*$(SEP)* L/*$(SEP)$* \ + cache/controller.$* # del-switch.: Stops the switch daemon on . # @@ -219,6 +235,7 @@ del-bridge.%: | cache/db.% # 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,$*)" @@ -226,7 +243,8 @@ 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)$* + L/$*$(SEP)* L/*$(SEP)$* \ + cache/controller.$* # del-db.: Stops the db daemon on . # @@ -261,6 +279,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 @@ -270,6 +294,19 @@ 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_$*=/' > $@ \ + || { rm $@; exit 1; } + +cache/rsnap.links.%: FORCE + @$(SSH) $(HOST_$*) $(SUDO) \ + sliver-ovs get-local-links $(BRIDGE) | sed -n 's/^L/LINKS += /p' > $@ \ + || { rm $@; exit 1; } + ### update sliver-ovs update: $(addprefix update-,$(CONF_NODE_IDS)) @true @@ -281,19 +318,6 @@ update-%: FORCE @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.-@: @@ -345,7 +369,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,$@) \ + sliver-ovs get-local-endpoint L$(call linkpart,$(*F)) > $@ 2> $(call log,$@) \ || { rm $@; exit 1; } @@ -398,6 +422,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 @@ -409,6 +480,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