From: Justin Pettit <jpettit@nicira.com>
Date: Thu, 7 May 2015 23:52:06 +0000 (-0700)
Subject: Merge "master" into "ovn".
X-Git-Tag: v2.5.0~1075
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=f2d371f7f6e765d8e97a3bd31fffa8197bd45fe2

Merge "master" into "ovn".

This brings in STT.

Conflicts:
	tutorial/ovs-sandbox
---

f2d371f7f6e765d8e97a3bd31fffa8197bd45fe2
diff --cc tutorial/ovs-sandbox
index e8339f264,29f450491..02145de44
--- a/tutorial/ovs-sandbox
+++ b/tutorial/ovs-sandbox
@@@ -44,8 -53,8 +53,10 @@@ rungdb() 
  
  gdb_vswitchd=false
  gdb_ovsdb=false
+ gdb_vswitchd_ex=false
+ gdb_ovsdb_ex=false
 +gdb_ovn_northd=false
 +gdb_ovn_controller=false
  builddir=
  srcdir=
  schema=
@@@ -134,19 -137,20 +145,29 @@@ EO
              ;;
          -g|--gdb-v*)
              gdb_vswitchd=true
+             gdb_vswitchd_ex=false
+             ;;
+         -e|--gdb-ex-v*)
+             gdb_vswitchd=true
+             gdb_vswitchd_ex=true
              ;;
 -        -d|--gdb-o*)
 +        -d|--gdb-ovsdb)
              gdb_ovsdb=true
+             gdb_ovsdb_ex=false
+             ;;
+         -r|--gdb-ex-o*)
+             gdb_ovsdb=true
+             gdb_ovsdb_ex=true
              ;;
 +        --gdb-ovn-northd)
 +            gdb_ovn_northd=true
 +            ;;
 +        --gdb-ovn-controller)
 +            gdb_ovn_controller=true
 +            ;;
 +        -o|--ovn)
 +            ovn=true
 +            ;;
          -*)
              echo "unrecognized option $option (use --help for help)" >&2
              exit 1
@@@ -268,36 -253,28 +289,48 @@@ trap 'kill `cat "$sandbox"/*.pid`' 0 1 
  # Create database and start ovsdb-server.
  touch "$sandbox"/.conf.db.~lock~
  run ovsdb-tool create conf.db "$schema"
 +ovsdb_server_args=
 +if $ovn; then
 +    touch "$sandbox"/.ovnsb.db.~lock~
 +    touch "$sandbox"/.ovnnb.db.~lock~
 +    run ovsdb-tool create ovnsb.db "$ovnsb_schema"
 +    run ovsdb-tool create ovnnb.db "$ovnnb_schema"
 +    ovsdb_server_args="ovnsb.db ovnnb.db conf.db"
 +fi
- rungdb $gdb_ovsdb ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \
+ rungdb $gdb_ovsdb $gdb_ovsdb_ex ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \
 -    --remote=punix:"$sandbox"/db.sock
 +    --remote=punix:"$sandbox"/db.sock $ovsdb_server_args
  
+ #Add a small delay to allow ovsdb-server to launch.
+ sleep 0.1
+ 
+ #Wait for ovsdb-server to finish launching.
+ if test ! -e "$sandbox"/db.sock; then
+     echo -n "Waiting for ovsdb-server to start..."
+     while test ! -e "$sandbox"/db.sock; do
+         sleep 1;
+     done
+     echo "  Done"
+ fi
+ 
  # Initialize database.
  run ovs-vsctl --no-wait -- init
  
  # Start ovs-vswitchd.
- rungdb $gdb_vswitchd ovs-vswitchd --detach --no-chdir --pidfile -vconsole:off --log-file \
+ rungdb $gdb_vswitchd $gdb_vswitchd_ex ovs-vswitchd --detach --no-chdir --pidfile -vconsole:off --log-file \
      --enable-dummy=override -vvconn -vnetdev_dummy
  
 +if $ovn; then
 +    ovs-vsctl set open . external-ids:system-id=56b18105-5706-46ef-80c4-ff20979ab068
 +    ovs-vsctl set open . external-ids:ovn-remote=unix:"$sandbox"/db.sock
 +    ovs-vsctl set open . external-ids:ovn-encap-type=geneve
 +    ovs-vsctl set open . external-ids:ovn-encap-ip=127.0.0.1
 +    ovs-vsctl add-br br-int \
 +        -- set bridge br-int fail-mode=secure other-config:disable-in-band=true
 +
 +    rungdb $gdb_ovn_northd ovn-northd --detach --no-chdir --pidfile -vconsole:off --log-file
 +    rungdb $gdb_ovn_controller ovn-controller --detach --no-chdir --pidfile -vconsole:off --log-file
 +fi
 +
  cat <<EOF