add solve_ip function

[sliver-openvswitch.git] / planetlab / exp-tool / Makefile

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index 54946d4..74a0d3a 100644 (file)
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -23,6 +23,7 @@ opp=$(call proj1,$(1))@$(call flip,$(call proj2,$(1)))
 rget=$(call get,$(call opp,$(1)))
 
 solve=$(HOST_$(1))
+solve_ip=$(IP_$(1))
 # can be redefined in conf.mk if that's not the expected behaviour
 display?=host $(1) aka $(call solve,$(1))
 
@@ -53,9 +54,12 @@ FORCE:
 all: $(addprefix L/,$(shell cat links))
 .PHONY: all
 
-nodes:
+# could also do make ++SLICE
+showslice: ++SLICE FORCE
+
+shownodes:
        @$(foreach id,$(ALL_NODE_IDS),echo $(id)=$(call display,$(id));)
-.PHONY: nodes
+.PHONY: shownodes
 
 sshchecks: $(foreach id,$(ALL_NODE_IDS),cache/sshcheck.$(id))
 .PHONY: sshchecks
@@ -72,19 +76,18 @@ cache/host.%:
        @host $(HOST_$*) | sed -n 's/^.*has address *//p' > $@
 
 cache/db.%:
-<<<<<<< HEAD
        @echo "Starting db server on $(call display,$*)"
-       @$(SSH) $(HOST_$*) sudo start_ovsdb-server > $@ \
+       @$(SSH) $(HOST_$*) sudo sliver-ovs start-db > $@ \
         || { rm $@; exit 1; }
 
 cache/switchd.%: cache/db.%
        @echo "Starting vswitchd on $(call display,$*)"
-       @$(SSH) $(HOST_$*) sudo start_vswitchd > $@ \
+       @$(SSH) $(HOST_$*) sudo sliver-ovs start-switch > $@ \
         || { rm $@; exit 1; }
 
 cache/bridge.%: cache/switchd.%
        @echo "Creating bridge on $(call display,$*)"
-       @$(SSH) $(HOST_$*) sudo create_bridge $(IP_$*) > $@ \
+       @$(SSH) $(HOST_$*) sudo sliver-ovs create-bridge $(IP_$*) > $@ \
         || { rm $@; exit 1; }
 
 cache/sshcheck.%: FORCE
@@ -103,7 +106,7 @@ U/%: del-iface.%@1 del-iface.%@2
 del-bridge.%: cache/db.%
        @echo "Deleting bridge on $(call display,$*)"
        @if [ -f cache/bridge.$* ]; then \
-               $(SSH) $(HOST_$*) sudo del_bridge $$(cat cache/bridge.$*);\
+               $(SSH) $(HOST_$*) sudo sliver-ovs del-bridge $$(cat cache/bridge.$*);\
         fi
        @rm -f cache/bridge.$* \
              cache/iface.$*-*@1 cache/iface.*-$*@2 \
@@ -152,7 +155,7 @@ distclean:
 del-iface.%: cache/db.$$(call get,%)
        @echo "Removing interface for link $(call proj1,$*) from $(call get,$*)"
        @$(SSH) $(HOST_$(call get,$*)) \
-               sudo del_port L$(call proj1,$*)
+               sudo sliver-ovs del-port L$(call proj1,$*)
        @rm -f cache/iface.$* cache/link.$* cache/link.$(call opp,$*)
 
 
@@ -160,7 +163,7 @@ del-iface.%: cache/db.$$(call get,%)
 cache/iface.%: cache/bridge.$$(call get,%)
        @echo "Creating interface for link $(call proj1,$*) on $(call get,$*)"
        @$(SSH) $(HOST_$(call get,$*)) \
-               sudo create_port $$(cat $^) L$(call proj1,$*) > $@ \
+               sudo sliver-ovs create-port $$(cat $^) L$(call proj1,$*) > $@ \
         || { rm $@; exit 1; }
 
 cache/link.%: cache/host.$$(call rget,$$*) cache/iface.% cache/iface.$$(call opp,$$*)