X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=9b36471ea6371ed4504c92a14b51eed4069bd7ee;hb=f6af8723d0dd9f4118c7d4c650e8ecb427c5d723;hp=0aebdaab57c3c338b08f8431a716fe719f1fd82f;hpb=994145e0f7c66d4cdada1d15a5fd4699931069fc;p=sliver-openvswitch.git

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index 0aebdaab5..9b36471ea 100644
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -173,7 +173,7 @@ cache/status.%: FORCE
 
 cache/host.%:
 	@echo "IP lookup for $(call display,$*)"
-	@host $(HOST_$*) | sed -n 's/^.*has address *//p' > $@
+	@host $(HOST_$*) | sed -n '/^.*has address */{s///p;q}' > $@
 
 cache/db.%:
 	@echo "Starting db server on $(call display,$*) - logs in $(call log,$@)"
@@ -395,6 +395,21 @@ cache/endpoint.%: cache/host.$$(call rget,%) cache/port.$$(call opp,%) cache/ifa
 			$$(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 $(wildcard cache/bridge.*)))
 clean: $(CLEANTARGETS)
@@ -578,6 +593,9 @@ $(foreach host,$(EXTERNAL_HOSTS),del-bridge.$(host)): del-bridge.%: | cache/db.%
 	      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,%)