ovs-sandbox: Use new ovn-sb database name.

[cascardo/ovs.git] / tutorial / ovs-sandbox

diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
index 5c89ef6..c299de0 100755 (executable)
--- a/tutorial/ovs-sandbox
+++ b/tutorial/ovs-sandbox
@@ -35,8 +35,8 @@ rungdb() {
     # Use "DISPLAY" variable to determine out if X is supported
     if $under_gdb && [ "$DISPLAY" ]; then
         args=`echo $@ |sed s/--detach//g | sed s/--vconsole:off//g`
-       xterm_title=$1
-       run_xterm $xterm_title gdb --args $args
+        xterm_title=$1
+        run_xterm $xterm_title gdb --args $args
     else
         run $@
     fi
@@ -44,14 +44,15 @@ rungdb() {
 
 gdb_vswitchd=false
 gdb_ovsdb=false
+gdb_ovn_nbd=false
 builddir=
 srcdir=
 schema=
 installed=false
 built=false
 ovn=false
-ovnschema=
-ovnnbschema=
+ovnsb_schema=
+ovnnb_schema=
 
 for option; do
     # This option-parsing mechanism borrowed from a Autoconf-generated
@@ -92,6 +93,7 @@ These options force ovs-sandbox to use an installed Open vSwitch:
   -i, --installed      use installed Open vSwitch
   -g, --gdb-vswitchd   run ovs-vswitchd under gdb
   -d, --gdb-ovsdb      run ovsdb-server under gdb
+  --gdb-ovn-nbd        run ovn-nbd under gdb
   -S, --schema=FILE    use FILE as vswitch.ovsschema
   -o, --ovn            enable OVN
 
@@ -131,9 +133,12 @@ EOF
         -g|--gdb-v*)
             gdb_vswitchd=true
             ;;
-        -d|--gdb-o*)
+        -d|--gdb-ovsdb)
             gdb_ovsdb=true
             ;;
+        --gdb-ovn-nbd)
+            gdb_ovn_nbd=true
+            ;;
         -o|--ovn)
             ovn=true
             ;;
@@ -188,13 +193,13 @@ if $built; then
         exit 1
     fi
     if $ovn; then
-        ovnschema=$srcdir/ovn/ovn.ovsschema
-        if test ! -e "$ovnschema"; then
+        ovnsb_schema=$srcdir/ovn/ovn-sb.ovsschema
+        if test ! -e "$ovnsb_schema"; then
             echo >&2 'source directory not found, please use --srcdir'
             exit 1
         fi
-        ovnnbschema=$srcdir/ovn/ovn-nb.ovsschema
-        if test ! -e "$ovnnbschema"; then
+        ovnnb_schema=$srcdir/ovn/ovn-nb.ovsschema
+        if test ! -e "$ovnnb_schema"; then
             echo >&2 'source directory not found, please use --srcdir'
             exit 1
         fi
@@ -260,11 +265,11 @@ touch "$sandbox"/.conf.db.~lock~
 run ovsdb-tool create conf.db "$schema"
 ovsdb_server_args=
 if $ovn; then
-    touch "$sandbox"/.ovn.db.~lock~
+    touch "$sandbox"/.ovnsb.db.~lock~
     touch "$sandbox"/.ovnnb.db.~lock~
-    run ovsdb-tool create ovn.db "$ovnschema"
-    run ovsdb-tool create ovnnb.db "$ovnnbschema"
-    ovsdb_server_args="ovn.db ovnnb.db conf.db"
+    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 \
     --remote=punix:"$sandbox"/db.sock $ovsdb_server_args
@@ -273,6 +278,10 @@ rungdb $gdb_ovsdb ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log
 rungdb $gdb_vswitchd ovs-vswitchd --detach --no-chdir --pidfile -vconsole:off --log-file \
     --enable-dummy=override -vvconn -vnetdev_dummy
 
+if $ovn; then
+    rungdb $gdb_ovn_nbd ovn-nbd --detach --no-chdir --pidfile -vconsole:off --log-file
+fi
+
 cat <<EOF