X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=utilities%2Fovs-save;h=bcaf27cf6298876f13c9dd9b5edc5ba0064834f3;hb=8b8ef592521e32d0e32581bf39c5d2a5cd445977;hp=2ab9d086a023c0d800aa845ed02bd978055bf077;hpb=0311d4f48ddfeb5f7d25b45d53168c02603bcf62;p=cascardo%2Fovs.git

diff --git a/utilities/ovs-save b/utilities/ovs-save
index 2ab9d086a..bcaf27cf6 100755
--- a/utilities/ovs-save
+++ b/utilities/ovs-save
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (c) 2011 Nicira, Inc.
+# Copyright (c) 2011, 2013 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+case $0 in
+    */*) dir0=`echo "$0" | sed 's,/[^/]*$,,'` ;;
+    *) dir0=./ ;;
+esac
+. "$dir0/ovs-lib" || exit 1
+
 usage() {
     UTIL=$(basename $0)
     cat <<EOF
@@ -26,28 +32,15 @@ Commands:
                         network interfaces, as well as the system iptables
                         configuration.
  save-flows             Outputs a shell script on stdout that will restore
-                        Openflow flows of each Open vSwitch bridge.
+                        OpenFlow flows of each Open vSwitch bridge.
+ save-ofports           Outputs a shell script on stdout that will restore
+                        the ofport value across a force-reload-kmod.
 This script is meant as a helper for the Open vSwitch init script commands.
 EOF
 }
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-missing_program () {
-    save_IFS=$IFS
-    IFS=:
-    for dir in $PATH; do
-        IFS=$save_IFS
-        if test -x $dir/$1; then
-            return 1
-        fi
-    done
-    IFS=$save_IFS
-    return 0
-}
-
 save_interfaces () {
-    if missing_program ip; then
+    if (ip -V) > /dev/null 2>&1; then :; else
         echo "$0: ip not found in $PATH" >&2
         exit 1
     fi
@@ -91,77 +84,25 @@ save_interfaces () {
             echo ip link set dev $dev $linkcmd
         fi
 
-        # IP addresses (including IPv6).
-        echo "ip addr flush dev $dev 2>/dev/null" # Suppresses "Nothing to flush".
-        ip addr show dev $dev | while read addr; do
-            set -- $addr
-
-            # Check and trim family.
-            family=$1
-            shift
-            case $family in
-                inet | inet6) ;;
-                *) continue ;;
-            esac
-
-            # Trim device off the end--"ip" insists on having "dev" precede it.
-            addrcmd=
-            while test $# != 0; do
-                case $1 in
-                    dynamic)
-                        # Omit kernel-maintained route.
-                        continue 2
-                        ;;
-                    scope)
-                        if test "$2" = link; then
-                            # Omit route derived from IP address, e.g.
-                            # 172.16.0.0/16 derived from 172.16.12.34.
-                            continue 2
-                        fi
-                        ;;
-                    "$dev"|"$dev:"*)
-                        # Address label string
-                        addrcmd="$addrcmd label $1"
-                        shift
-                        continue
-                        ;;
-                esac
-                addrcmd="$addrcmd $1"
-                shift
-            done
-            if test "$1" != "$dev"; then
-                addrcmd="$addrcmd $1"
-            fi
-
-            echo ip -f $family addr add $addrcmd dev $dev
-        done
+        move_ip_address $dev $dev
 
-        # Routes.
-        echo "ip route flush dev $dev proto boot 2>/dev/null" # Suppresses "Nothing to flush".
-        ip route show dev $dev | while read route; do
-            # "proto kernel" routes are installed by the kernel automatically.
-            case $route in
-                *" proto kernel "*) continue ;;
-            esac
-
-            echo "ip route add $route dev $dev"
-        done
+        move_ip_routes $dev $dev
 
         echo
     done
 
-    if missing_program iptables-save; then
-        echo "# iptables-save not found in $PATH, not saving iptables state"
-    else
+    if (iptables-save) > /dev/null 2>&1; then
         echo "# global"
         echo "iptables-restore <<'EOF'"
         iptables-save
         echo "EOF"
+    else
+        echo "# iptables-save not found in $PATH, not saving iptables state"
     fi
 }
 
 save_flows () {
-    if missing_program ovs-ofctl; then
+    if (ovs-ofctl --version) > /dev/null 2>&1; then :; else
         echo "$0: ovs-ofctl not found in $PATH" >&2
         exit 1
     fi
@@ -174,6 +115,32 @@ save_flows () {
     done
 }
 
+ovs_vsctl () {
+    ovs-vsctl --no-wait "$@"
+}
+
+save_ofports ()
+{
+    if (ovs-vsctl --version) > /dev/null 2>&1; then :; else
+        echo "$0: ovs-vsctl not found in $PATH" >&2
+        exit 1
+    fi
+
+    for bridge in "$@"; do
+        count=0
+        for iface in `ovs_vsctl list-ifaces ${bridge}`; do
+            ofport=`ovs_vsctl get interface ${iface} ofport`
+            [ "${count}" -eq 0 ] && cmd="ovs-vsctl --no-wait"
+            cmd="${cmd} -- --if-exists set interface "${iface}" \
+                     ofport_request="${ofport}""
+
+            # Run set interface command on 50 ports at a time.
+            count=`expr ${count} + 1`
+            [ "${count}" -eq 50 ] && count=0 && echo "${cmd}" && cmd=""
+        done
+        echo "${cmd}"
+    done
+}
 
 while [ $# -ne 0 ]
 do
@@ -188,6 +155,11 @@ do
             save_interfaces "$@"
             exit 0
             ;;
+        "save-ofports")
+            shift
+            save_ofports "$@"
+            exit 0
+            ;;
         -h | --help)
             usage
             exit 0