Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index bf66afb..728e260 100644 (file)
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -60,16 +60,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 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:
 
@@ -84,14 +85,19 @@ showslice: ++SLICE FORCE
 
 shownodes:
        @$(foreach id,$(ALL_NODE_IDS),echo $(id)=$(call display,$(id));)
+showhostnames: ++ALL_NODE_HOSTS
 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
 
 DBS=$(foreach id,$(ALL_NODE_IDS),cache/db.$(id))
 dbs: $(DBS)
@@ -123,10 +129,13 @@ del-controllers: $(foreach id,$(ALL_NODE_IDS),del-controller-$(id))
 
 ### 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; 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
+
 # should probably replace sshcheck
 cache/status.%: FORCE
        @echo "=== DB and SWITCH processes on $(call display,$*)"
@@ -284,7 +293,7 @@ graph.ps: graph.dot
 ####################
 # '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
@@ -305,6 +314,9 @@ 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)

diff --git a/planetlab/exp-tool/Makefile.help b/planetlab/exp-tool/Makefile.help
new file mode 100644 (file)
index 0000000..e9be270
--- /dev/null
+++ b/planetlab/exp-tool/Makefile.help
@@ -0,0 +1,39 @@
+make [init+all]
+        shortcut for 'make init all'
+make init
+        create util subdirs needed by this tool
+make all
+        initialize the whole topology on all nodes
+make showslice
+        show SLICE as defined in conf.mk
+make shownodes
+make showhostnames
+make showips
+make showlinks
+        show nodes and links declared in conf.mk in various formats
+make sshchecks
+make ovsversions
+        try out ssh connectivity to slivers in the slice, or show installed ovs version
+make dbs
+        initialize ovs db in all slivers
+make switchs
+        start ovs switch in all slivers
+make start 
+        shortcut for make dbs switchs
+make stop
+        stop all ovs switch in all slivers
+make status
+        list status of db and switch processes in all slivers
+make bridges
+        create a bridge interface linked to tap devce in each sliver
+====================
+make showcontrollers
+       show how OF controllers are configured from conf.mk
+       use CONTROLLER_<nodeid> if set, or CONTROLLER as a default otherwise
+make controllers
+       configure the various switches so they use the configured controllers
+
+====================
+make update (devel)
+       push a new version of sliver-ovs into the slivers
+       use SLIVER_OVS that should point to the local new version

diff --git a/planetlab/scripts/refresh b/planetlab/scripts/refresh
new file mode 100755 (executable)
index 0000000..92b1d5f
--- /dev/null
+++ b/planetlab/scripts/refresh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# this script is not used by the build but can be convenient 
+# in a devel environment to ship an experimental sliver-ovs 
+# into running slices (using e.g. make update)
+DIRNAME=$(dirname $0)
+cd $DIRNAME
+echo Refreshing sliver-ovs from sliver-ovs.in in $(pwd)
+sed -e s,@RUNDIR@,/var/run/openvswitch,g \
+    -e s,@DBDIR@,/etc/openvswitch,g \
+    -e s,@pkgdatadir@,/usr/share/openvswitch,g \
+    -e s,@LOGDIR@,/var/log/openvswitch,g \
+    sliver-ovs.in > sliver-ovs