move get-port to sliver-ovs

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index c2b0d77..eac14e2 100644 (file)
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -349,7 +349,7 @@ cache/iface.%: cache/bridge.$$(call get,%) | cache/db.$$(call get,%)
 cache/port.%: cache/iface.% cache/switch.$$(call get,%)
        @echo "Getting port number for link $(call linkpart,$(*F)) on $(call display,$(call get,$(*F))) - logs in $(call log,$@)"
        @$(SSH) $(call solve,$(call get,$(*F))) $(SUDO) \
 cache/port.%: cache/iface.% cache/switch.$$(call get,%)
        @echo "Getting port number for link $(call linkpart,$(*F)) on $(call display,$(call get,$(*F))) - logs in $(call log,$@)"
        @$(SSH) $(call solve,$(call get,$(*F))) $(SUDO) \

-               ovs-appctl netdev-tunnel/get-port L$(call linkpart,$(*F)) > $@ 2> $(call log,$@) \
+               sliver-ovs get-local-endpoint L$(call linkpart,$(*F)) > $@ 2> $(call log,$@) \

         || { rm $@; exit 1; }
 
 
         || { rm $@; exit 1; }
 
 

diff --git a/planetlab/scripts/sliver-ovs.in b/planetlab/scripts/sliver-ovs.in
index 3e060d1..2c9b062 100755 (executable)
--- a/planetlab/scripts/sliver-ovs.in
+++ b/planetlab/scripts/sliver-ovs.in
@@ -196,6 +196,16 @@ function create_port () {
         -- set interface "$port" type=tunnel
 }
 
         -- set interface "$port" type=tunnel
 }
 

+function get_local_endpoint () {
+
+    get_params "local_port" "$@"
+
+    is_switch_running || { echo "ovs-vswitchd not running" >&2; exit 1; }
+
+    set -e
+    ovs-appctl --target=ovs-vswitchd netdev-tunnel/get-port "$local_port"
+}
+

 function set_remote_endpoint () {
 
     get_params "local_port remote_ip remote_UDP_port" "$@"
 function set_remote_endpoint () {
 
     get_params "local_port remote_ip remote_UDP_port" "$@"


@@ -327,7 +337,8 @@ function gmap_probe () {
 SUPPORTED_SUBCOMMANDS="start stop status 
 start_db stop_db start_switch stop_switch
 create_bridge create_port del_bridge del_port
 SUPPORTED_SUBCOMMANDS="start stop status 
 start_db stop_db start_switch stop_switch
 create_bridge create_port del_bridge del_port

-show set_remote_endpoint set_controller del_controller gmap_probe"
+show get_local_endpoint set_remote_endpoint
+set_controller del_controller gmap_probe"

 
 function main () {
        message="Usage: $COMMAND <subcommand> ...
 
 function main () {
        message="Usage: $COMMAND <subcommand> ...