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

diff --combined planetlab/exp-tool/Makefile
index bf66afb,606d54d..728e260
--- 1/planetlab/exp-tool/Makefile
--- 2/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@@ -60,16 -60,17 +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 +85,19 @@@ showslice: ++SLICE FORC
  
  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)
@@@ -118,15 -124,15 +124,18 @@@ CONTROLLERS=$(foreach id,$(ALL_NODE_IDS
  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; 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,$*)"
@@@ -186,11 -192,6 +195,11 @@@ del-db.%
        @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop-db
        @rm -f cache/db.$*
  
 +del-controller.%:
 +      @echo "Removing controller for $(call display,$*)"
 +      @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs del-controller $(BRIDGE)
 +      @rm -f cache/controller.$*
 +
  del-links: $(addprefix U/,$(notdir $(filter-out %.log,$(wildcard L/*))))
  
  del-switchs: $(addprefix del-,$(notdir $(filter-out %.log,$(wildcard cache/switch.*))))
@@@ -284,7 -285,7 +293,7 @@@ graph.ps: graph.do
  ####################
  # '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 -306,9 +314,9 @@@ ende
  
  $(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)