X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=0aebdaab57c3c338b08f8431a716fe719f1fd82f;hb=060ea9d5152b5c8cc6646ead1175484e07c583fe;hp=e13374f665131df381e933a3643cf1594ea832d2;hpb=ea4392e3e885dff9e41d89a061cf7f2670e436ad;p=sliver-openvswitch.git

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index e13374f66..0aebdaab5 100644
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -160,7 +160,7 @@ showdpid-%: FORCE
 	@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)\"
+	@echo $*_MAC=\"$$( $(SSH) $(HOST_$*) $(SUDO) sliver-ovs get-mac $(BRIDGE))\"
 
 showports-%: FORCE
 	@$(SSH) $(HOST_$*) $(SUDO) ovs-ofctl show $(BRIDGE) \
@@ -388,7 +388,7 @@ cache/port.%: cache/iface.% cache/switch.$$(call get,%)
 #
 # We need the IP address and the UDP port of the other side and the interace of this side.
 # We need to set the info again if any of these change.
-cache/endpoint.%: cache/host.$$(call rget,%) cache/port.$$(call opp,%) cache/iface.%
+cache/endpoint.%: cache/host.$$(call rget,%) cache/port.$$(call opp,%) cache/iface.% | cache/db.$$(call get,%)
 	@echo "Setting port number of link $(call linkpart,$(*F)) on $(call display,$(call get,$(*F))) - logs in $(call log,$@)"
 	@$(SSH) $(call solve,$(call get,$(*F))) $(SUDO) sliver-ovs set-remote-endpoint L$(call linkpart,$(*F)) \
 			$$(cat cache/host.$(call rget,$(*F))) \
@@ -510,3 +510,79 @@ help:
 +%: varname=$(subst +,,$@)
 +%:
 	@echo "$($(varname))"
+
+# external nodes and links
+#
+ALL_LINKS := $(LINKS) $(patsubst L/%,%,$(filter L/%,$(MAKECMDGOALS)))
+EXTERNAL_LINKS := $(filter $(foreach host,$(EXTERNAL_HOSTS),%-$(host)),$(ALL_LINKS))
+
+$(foreach host,$(EXTERNAL_HOSTS),sshcheck-$(host)): ;
+$(foreach host,$(EXTERNAL_HOSTS),ovsversion-$(host)): ;
+$(foreach host,$(EXTERNAL_HOSTS),showdpid-$(host)): ;
+$(foreach host,$(EXTERNAL_HOSTS),showmac-$(host)): ;
+$(foreach host,$(EXTERNAL_HOSTS),showports-$(host)): ;
+$(foreach host,$(EXTERNAL_HOSTS),update-$(host)): ;
+$(foreach host,$(EXTERNAL_HOSTS),del-controller-$(host)): ;
+$(foreach host,$(EXTERNAL_HOSTS),cache/status.$(host)): ;
+$(foreach host,$(EXTERNAL_HOSTS),cache/controller.$(host)): ;
+
+$(foreach host,$(EXTERNAL_HOSTS),cache/rsnap.ip.$(host)): ;
+	@touch $@
+
+$(foreach host,$(EXTERNAL_HOSTS),cache/rsnap.links.$(host)): ;
+	@touch $@
+
+$(foreach host,$(EXTERNAL_HOSTS),cache/db.$(host)):
+	@touch $@
+
+$(foreach host,$(EXTERNAL_HOSTS),del-db.$(host)): del-db.%:
+	@rm cache/db.$*
+
+$(foreach host,$(EXTERNAL_HOSTS),cache/switch.$(host)): ;
+	@touch $@
+
+$(foreach host,$(EXTERNAL_HOSTS),del-switch.$(host)): 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)$* \
+	       cache/controller.$*
+
+.SECONDEXPANSION:
+
+$(foreach host,$(EXTERNAL_HOSTS),cache/bridge.$(host)): cache/bridge.%: | cache/db.%
+	@echo "Creating fake bridge on external host $(call display,$*)"
+	@touch $@
+
+$(foreach link,$(EXTERNAL_LINKS),cache/iface.$(link)@2): cache/iface.%: cache/bridge.$$(call get,%) | cache/db.$$(call get,%)
+	@echo "Creating fake interface for link $(call linkpart,$*) on external host $(call get,$*)"
+	@touch $@
+
+$(foreach link,$(EXTERNAL_LINKS),cache/port.$(link)@2): cache/port.%: cache/iface.% cache/switch.$$(call get,%)
+	@echo "Getting port number for link $(call linkpart,$(*F)) on external host $(call display,$(call get,$(*F)))"
+	@echo $(call default,EXTERNAL_PORT,$(call rightnode,$*)) > $@
+
+
+$(foreach link,$(EXTERNAL_LINKS),del-iface.$(link)@2): del-iface.%: | cache/db.$$(call get,%)
+	@echo "Removing fake interface for link $(call linkpart,$*) from external host $(call get,$*)"
+	@rm -f cache/iface.$* \
+	       cache/port.$* cache/endpoint.$* cache/endpoint.$(call opp,$*) \
+	       L/$(call linkpart,$*)
+
+$(foreach host,$(EXTERNAL_HOSTS),del-bridge.$(host)): del-bridge.%: | cache/db.%
+	@echo "Deleting fake bridge on external host $(call display,$*)"
+	@rm -f cache/bridge.$* \
+	      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)$* \
+	      cache/controller.$*
+
+# 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,%)
+	@#echo $* [$<] [$^] $(call rightnode,$*)
+	@echo "===>" $(call rightnode,$*): \
+	   ./tunproxy -t $$(cat cache/host.$(call leftnode,$*)):$$(cat cache/port.$*@1) \
+           -p $(call default,EXTERNAL_PORT,$(call rightnode,$*)) -e -d
+