Merge branch 'master' of git://openvswitch.org/openvswitch

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

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index 5986216..ae27008 100644 (file)
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -161,25 +161,21 @@ del-bridge.%: cache/db.%
 
 del-switch.%: del-bridge.%
        @echo "Shutting down switch on $(call display,$*)"
-       @if [ -f cache/switch.$* ]; then \
-               $(SSH) $(HOST_$*) $(SUDO) ovs-appctl exit;\
-        fi
+       @[ -f cache/switch.$* ] && $(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop-switch
        @rm -f cache/switch.$*
 
 del-db.%:
        @echo "Shutting down db on $(call display,$*)"
-       @if [ -f cache/db.$* ]; then \
-               $(SSH) $(HOST_$*) $(SUDO) ovs-appctl --target=$(VARRUN)/ovsdb-server.$$(cat cache/db.$*).ctl exit;\
-        fi
+       @[ -f cache/db.$* ] && $(SSH) $(HOST_$*) $(SUDO) sliver-ovs stop-db
        @rm -f cache/db.$*
 
-del-links: $(addprefix U/,$(notdir $(wildcard L/*)))
+del-links: $(addprefix U/,$(notdir $(filter-out %.log,$(wildcard L/*))))
 
-del-switchs: $(addprefix del-,$(notdir $(wildcard cache/switch.*)))
+del-switchs: $(addprefix del-,$(notdir $(filter-out %.log,$(wildcard cache/switch.*))))
 
-del-dbs: $(addprefix del-,$(notdir $(wildcard cache/db.*)))
+del-dbs: $(addprefix del-,$(notdir $(filter-out %.log,$(wildcard cache/db.*))))
 
-shutdown: del-switches del-dbs
+shutdown: del-switchs del-dbs
 
 .PHONY: del-links del-switchs del-dbs shutdown
 
@@ -210,13 +206,13 @@ cache/iface.%: cache/bridge.$$(call get,%)
 # iface2=cache/iface.$(call opp,%)
 cache/link.%: cache/host.$$(call get,%) cache/iface.% cache/iface.$$(call opp,%)
        @echo "Setting port number of link $(call linkpart,$(*F)) on $(call display,$(call get,$(*F))) - logs in $@.log"
-       @$(SSH) $(call solve,$(call get,$(*F))) $(SUDO) ovs-vsctl set interface L$(call linkpart,$(*F)) \
-                       options:remote_ip=$$(cat cache/host.$(call get,$(*F))) \
-                       options:remote_port=$$(cat cache/iface.$(call opp,$(*F))) 2> $@.log \
+       @$(SSH) $(call solve,$(call get,$(*F))) $(SUDO) sliver-ovs set-remote-endpoint L$(call linkpart,$(*F)) \
+                       $$(cat cache/host.$(call rget,$(*F))) \
+                       $$(cat cache/iface.$(call opp,$(*F))) 2> $@.log \
         && touch $@
 
 ####################
-CLEANTARGETS=$(addprefix del-,$(notdir $(wildcard cache/bridge.*)))
+CLEANTARGETS=$(addprefix del-,$(notdir $(filter-out %.log,$(wildcard cache/bridge.*))))
 clean: $(CLEANTARGETS)
 distclean:
        rm -rf L U cache