diff options
author | Ben Pfaff <blp@nicira.com> | 2012-07-27 15:52:21 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2012-08-01 10:55:57 -0700 |
commit | f973f2af2fd4452c8e182caf6a4346cf2a2a394e (patch) | |
tree | eb0a4ac92b8457ef682dfa89447342b209bf0f88 /tests | |
parent | 01ca539f5c89fab1ea9a355d4cb75383dfb25da5 (diff) | |
download | openvswitch-f973f2af2fd4452c8e182caf6a4346cf2a2a394e.tar.gz |
Make the location of the database separately configurable.
The default is unchanged, /etc/openvswitch/conf.db.
This makes it possible to transition each Open vSwitch packaging from
/etc/openvswitch/conf.db to /var/lib/openvswitch/conf.db independently.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ofproto-macros.at | 3 | ||||
-rw-r--r-- | tests/ovs-monitor-ipsec.at | 1 | ||||
-rw-r--r-- | tests/ovs-xapi-sync.at | 1 | ||||
-rw-r--r-- | tests/unixctl-py.at | 2 | ||||
-rw-r--r-- | tests/vlog.at | 4 |
5 files changed, 10 insertions, 1 deletions
diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 658f30e44..dc9bc8646 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -31,13 +31,14 @@ m4_define([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m']) m4_define([OVS_VSWITCHD_START], [OVS_RUNDIR=`pwd`; export OVS_RUNDIR OVS_LOGDIR=`pwd`; export OVS_LOGDIR + OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR trap 'kill `cat ovsdb-server.pid ovs-vswitchd.pid`' 0 dnl Create database. mkdir openvswitch touch openvswitch/.conf.db.~lock~ - AT_CHECK([ovsdb-tool create openvswitch/conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema]) + AT_CHECK([ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema]) dnl Start ovsdb-server. AT_CHECK([ovsdb-server --detach --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock], [0], [], [stderr]) diff --git a/tests/ovs-monitor-ipsec.at b/tests/ovs-monitor-ipsec.at index e9d638929..1a8316129 100644 --- a/tests/ovs-monitor-ipsec.at +++ b/tests/ovs-monitor-ipsec.at @@ -4,6 +4,7 @@ AT_SETUP([ovs-monitor-ipsec]) AT_SKIP_IF([test $HAVE_PYTHON = no]) OVS_RUNDIR=`pwd`; export OVS_RUNDIR +OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_PKGDATADIR=`pwd`; export OVS_PKGDATADIR cp "$top_srcdir/vswitchd/vswitch.ovsschema" . diff --git a/tests/ovs-xapi-sync.at b/tests/ovs-xapi-sync.at index 5fa61ec33..25acc7437 100644 --- a/tests/ovs-xapi-sync.at +++ b/tests/ovs-xapi-sync.at @@ -9,6 +9,7 @@ PYTHONPATH=`pwd`:$PYTHONPATH export PYTHONPATH OVS_RUNDIR=`pwd`; export OVS_RUNDIR +OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_PKGDATADIR=`pwd`; export OVS_PKGDATADIR cp "$top_srcdir/vswitchd/vswitch.ovsschema" . diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at index 037460265..15fd86be8 100644 --- a/tests/unixctl-py.at +++ b/tests/unixctl-py.at @@ -73,6 +73,7 @@ AT_CLEANUP AT_SETUP([unixctl bad target - Python]) OVS_RUNDIR=`pwd`; export OVS_RUNDIR +OVS_DBDIR=`pwd`; export OVS_DBDIR AT_SKIP_IF([test $HAVE_PYTHON = no]) AT_CHECK([PYAPPCTL -t bogus doit], [1], [], [stderr]) @@ -91,6 +92,7 @@ AT_SETUP([unixctl server - Python]) AT_SKIP_IF([test $HAVE_PYTHON = no]) OVS_RUNDIR=`pwd`; export OVS_RUNDIR OVS_LOGDIR=`pwd`; export OVS_LOGDIR +OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR trap 'kill `cat test-unixctl.py.pid`' 0 AT_CAPTURE_FILE([`pwd`/test-unixctl.py.log]) diff --git a/tests/vlog.at b/tests/vlog.at index 2bc7b5ce0..a8a947c1b 100644 --- a/tests/vlog.at +++ b/tests/vlog.at @@ -107,6 +107,7 @@ AT_SETUP([vlog - vlog/reopen - Python]) AT_SKIP_IF([test $HAVE_PYTHON = no]) OVS_RUNDIR=`pwd`; export OVS_RUNDIR OVS_LOGDIR=`pwd`; export OVS_LOGDIR +OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR trap 'kill `cat test-unixctl.py.pid`' 0 @@ -136,6 +137,7 @@ AT_SETUP([vlog - vlog/reopen without log file - Python]) AT_SKIP_IF([test $HAVE_PYTHON = no]) OVS_RUNDIR=`pwd`; export OVS_RUNDIR OVS_LOGDIR=`pwd`; export OVS_LOGDIR +OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR trap 'kill `cat test-unixctl.py.pid`' 0 @@ -158,6 +160,7 @@ AT_SKIP_IF([echo > /dev/full]) OVS_RUNDIR=`pwd`; export OVS_RUNDIR OVS_LOGDIR=`pwd`; export OVS_LOGDIR +OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR trap 'kill `cat test-unixctl.py.pid`' 0 @@ -184,6 +187,7 @@ AT_SETUP([vlog - vlog/set and vlog/list - Python]) AT_SKIP_IF([test $HAVE_PYTHON = no]) OVS_RUNDIR=`pwd`; export OVS_RUNDIR OVS_LOGDIR=`pwd`; export OVS_LOGDIR +OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR trap 'kill `cat test-unixctl.py.pid`' 0 |