CONF_NODE_IDS=$(subst HOST_,,$(filter HOST_%,$(.VARIABLES)))
####################
-init+all: 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: init+all init
+.PHONY: init_all init
FORCE:
.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
DBS=$(foreach id,$(ALL_NODE_IDS),cache/db.$(id))
dbs: $(DBS)
ovsversion-%: FORCE
@OVSVERSION=$$($(SSH) $(HOST_$*) rpm -q sliver-openvswitch); echo $(call display,$*) has $$OVSVERSION
+ssh-%: FORCE
+ @$(SSH) $(HOST_$*) $(SUDO) $(SSH-COMMAND)
+
# 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,$*)"
# 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/<nodeid>-<node_id>
@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop-db
@rm -f cache/db.$*
-del-controller.%:
+del-controller-%:
@echo "Removing controller for $(call display,$*)"
@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-controller $(BRIDGE)
@rm -f cache/controller.$*
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
####################
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
+# <linkid>=<nodeid>=<internal_linkid>=<frequency>
+# 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-report is designed to run in background,
+# and so that a new run will kill any previously running instance
+gmap-probes: $(foreach probe,$(GMAP_PROBES),gprobe-$(probe))
+
+gprobe-%: FORCE
+ $(SSH) -n $(call solve,$(word 2,$(subst @, ,$(*F)))) $(SUDO) \
+ sliver-ovs gmap-report L$(word 1,$(subst @, ,$(*F))) $(GMAP_SERVER) $(word 3,$(subst @, ,$(*F))) $(word 4,$(subst @, ,$(*F)))
####################
# 'virtual' targets in that there's no real file attached