Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
162742b4
Commit
162742b4
authored
Jun 23, 2016
by
Tomek Mrugalski
🛰
Browse files
renamed dscsql to cql
parent
11aedc9c
Changes
37
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
162742b4
...
...
@@ -995,57 +995,57 @@ fi
# ... and at the shell level, so Makefile.am can take action depending on this.
AM_CONDITIONAL(HAVE_PGSQL, test "$PG_CONFIG" != "")
dsc
_config="no"
AC_ARG_WITH([
dhcp-dscs
ql],
AC_HELP_STRING([--with-
dhcp-dscs
ql=PATH],
[path to the
DataStax
Cassandra
S
QL '
dsc
_config' script]),
[
dsc
_config="$withval"])
if test "${
dsc
_config}" = "yes" ; then
DSC_CONFIG
="/usr/bin/
dsc
_config"
elif test "${
dsc
_config}" != "no" ; then
DSC
_CONFIG="${withval}"
cql
_config="no"
AC_ARG_WITH([
c
ql],
AC_HELP_STRING([--with-
c
ql=PATH],
[path to the Cassandra
C
QL '
cql
_config' script]),
[
cql
_config="$withval"])
if test "${
cql
_config}" = "yes" ; then
cql_config
="/usr/bin/
cql
_config"
elif test "${
cql
_config}" != "no" ; then
CQL
_CONFIG="${withval}"
fi
if test "$
DSC
_CONFIG" != "" ; then
if test -d "$
DSC
_CONFIG" -o ! -x "$
DSC
_CONFIG" ; then
AC_MSG_ERROR([--with-
dhcp-dscs
ql should point to a
dsc
_config program])
if test "$
CQL
_CONFIG" != "" ; then
if test -d "$
CQL
_CONFIG" -o ! -x "$
CQL
_CONFIG" ; then
AC_MSG_ERROR([--with-
c
ql should point to a
cql
_config program])
fi
DSCS
QL_CPPFLAGS=`$
DSC
_CONFIG --cppflags`
DSCS
QL_INCLUDEDIR=`$
DSC
_CONFIG --includedir`
DSCS
QL_CPPFLAGS="$
DSCS
QL_CPPFLAGS -I$
DSCS
QL_INCLUDEDIR"
DSCS
QL_LIBS=`$
DSC
_CONFIG --libdir`
DSCS
QL_LIBS="-L$
DSCS
QL_LIBS -lcassandra_static -luv"
DSCS
QL_VERSION=`$
DSC
_CONFIG --version`
C
QL_CPPFLAGS=`$
CQL
_CONFIG --cppflags`
C
QL_INCLUDEDIR=`$
CQL
_CONFIG --includedir`
C
QL_CPPFLAGS="$
C
QL_CPPFLAGS -I$
C
QL_INCLUDEDIR"
C
QL_LIBS=`$
CQL
_CONFIG --libdir`
C
QL_LIBS="-L$
C
QL_LIBS -lcassandra_static -luv"
C
QL_VERSION=`$
CQL
_CONFIG --version`
AC_SUBST(
DSCS
QL_CPPFLAGS)
AC_SUBST(
DSCS
QL_LIBS)
AC_SUBST(
C
QL_CPPFLAGS)
AC_SUBST(
C
QL_LIBS)
# Check that a simple program using
DSCS
QL functions can compile and link.
# Check that a simple program using
C
QL functions can compile and link.
CPPFLAGS_SAVED="$CPPFLAGS"
LIBS_SAVED="$LIBS"
CPPFLAGS="$
DSCS
QL_CPPFLAGS $CPPFLAGS"
LIBS="$
DSCS
QL_LIBS $LIBS"
CPPFLAGS="$
C
QL_CPPFLAGS $CPPFLAGS"
LIBS="$
C
QL_LIBS $LIBS"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <cassandra.h>],
[CassCluster* cluster = cass_cluster_new();
cass_cluster_free(cluster);])],
[AC_MSG_RESULT([checking for
DataStax
Cassandra
S
QL headers and library... yes])],
[AC_MSG_RESULT([checking for
DataStax
Cassandra
S
QL headers and library... no])
AC_MSG_ERROR([Needs
DataStax
Cassandra
S
QL library])]
[AC_MSG_RESULT([checking for Cassandra
C
QL headers and library... yes])],
[AC_MSG_RESULT([checking for Cassandra
C
QL headers and library... no])
AC_MSG_ERROR([Needs Cassandra
C
QL library])]
)
CPPFLAGS=$CPPFLAGS_SAVED
LIBS=$LIBS_SAVED
# Note that
DSCS
QL is present in the config.h file
AC_DEFINE([HAVE_
DSCS
QL], [1], [
DSCS
QL is present])
# Note that
C
QL is present in the config.h file
AC_DEFINE([HAVE_
C
QL], [1], [
C
QL is present])
fi
# ... and at the shell level, so Makefile.am can take action depending on this.
AM_CONDITIONAL(HAVE_
DSCS
QL, test "$
DSC
_CONFIG" != "")
AM_CONDITIONAL(HAVE_
C
QL, test "$
CQL
_CONFIG" != "")
# Check for log4cplus
log4cplus_path="yes"
...
...
@@ -1461,7 +1461,7 @@ AC_CONFIG_FILES([compatcheck/Makefile
src/bin/admin/tests/memfile_tests.sh
src/bin/admin/tests/mysql_tests.sh
src/bin/admin/tests/pgsql_tests.sh
src/bin/admin/tests/
dscs
ql_tests.sh
src/bin/admin/tests/
c
ql_tests.sh
src/hooks/Makefile
src/hooks/dhcp/Makefile
src/hooks/dhcp/user_chk/Makefile
...
...
@@ -1539,7 +1539,7 @@ AC_CONFIG_FILES([compatcheck/Makefile
src/share/database/scripts/pgsql/Makefile
src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh
src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh
src/share/database/scripts/
dscs
ql/Makefile
src/share/database/scripts/
c
ql/Makefile
tools/Makefile
tools/path_replacer.sh
])
...
...
@@ -1673,18 +1673,18 @@ PostgreSQL:
END
fi
if test "$
DSCS
QL_CPPFLAGS" != "" ; then
if test "$
C
QL_CPPFLAGS" != "" ; then
cat >> config.report << END
DataStax
Cassandra
S
QL:
DSCS
QL_VERSION: ${
DSCS
QL_VERSION}
DSCS
QL_CPPFLAGS: ${
DSCS
QL_CPPFLAGS}
DSCS
QL_LIBS: ${
DSCS
QL_LIBS}
Cassandra
C
QL:
C
QL_VERSION: ${
C
QL_VERSION}
C
QL_CPPFLAGS: ${
C
QL_CPPFLAGS}
C
QL_LIBS: ${
C
QL_LIBS}
END
else
cat >> config.report << END
DataStax
Cassandra
S
QL:
Cassandra
C
QL:
no
END
fi
...
...
src/bin/admin/admin-utils.sh
View file @
162742b4
...
...
@@ -87,7 +87,7 @@ pgsql_version() {
return
$?
}
dscs
ql_execute
()
{
c
ql_execute
()
{
QUERY
=
$1
shift
if
[
$#
-gt
1
]
;
then
...
...
@@ -101,8 +101,8 @@ dscsql_execute() {
return
$retcode
}
dscs
ql_version
()
{
version
=
`
dscs
ql_execute
"SELECT version, minor FROM schema_version"
"
$@
"
`
c
ql_version
()
{
version
=
`
c
ql_execute
"SELECT version, minor FROM schema_version"
"
$@
"
`
version
=
`
echo
"
$version
"
|
grep
-A
1
"+"
|
grep
-v
"+"
|
tr
-d
' '
|
cut
-d
"|"
-f
1-2
--output-delimiter
=
"."
`
echo
$version
return
$?
...
...
src/bin/admin/kea-admin.in
View file @
162742b4
...
...
@@ -55,7 +55,7 @@ usage() {
printf
" - lease-upgrade: Upgrades your lease database scheme
\n
"
printf
" - lease-dump: Dump current leases to a CSV file
\n
"
printf
"
\n
"
printf
"BACKEND - one of the supported backends: memfile|mysql|pgsql|
dscs
ql
\n
"
printf
"BACKEND - one of the supported backends: memfile|mysql|pgsql|
c
ql
\n
"
printf
"
\n
"
printf
"PARAMETERS: Parameters are optional in general, but may be required
\n
"
printf
" for specific operation.
\n
"
...
...
@@ -200,12 +200,12 @@ pgsql_init() {
exit
0
}
dscs
ql_init
()
{
c
ql_init
()
{
printf
"Checking if there is a database initialized already. Please ignore errors.
\n
"
# Let's try to count the number of tables. Anything above 0 means that there
# is some database in place. If there is anything, we abort. Note that
#
dsc s
ql may spit out connection or access errors to stderr, we ignore those.
#
c
ql may spit out connection or access errors to stderr, we ignore those.
# We should not hide them as they may give hints to user what is wrong with
# his setup.
#
...
...
@@ -213,7 +213,7 @@ dscsql_init() {
ERRCODE
=
$?
if
[
$ERRCODE
-ne
0
]
then
log_error
"
dscs
ql_init table query failed, cqlsh status =
$ERRCODE
"
log_error
"
c
ql_init table query failed, cqlsh status =
$ERRCODE
"
exit
1
fi
...
...
@@ -225,16 +225,16 @@ dscsql_init() {
exit
1
fi
printf
"Initializing database using script %s
\n
"
$scripts_dir
/
dscs
ql/dhcpdb_create.cql
printf
"Initializing database using script %s
\n
"
$scripts_dir
/
c
ql/dhcpdb_create.cql
cqlsh
-u
$db_user
-p
$db_password
-e
"CREATE KEYSPACE
$db_name
WITH replication = {'class' : 'SimpleStrategy','replication_factor' : 1};"
cqlsh
-u
$db_user
-p
$db_password
-k
$db_name
-f
$scripts_dir
/
dscs
ql/dhcpdb_create.cql
cqlsh
-u
$db_user
-p
$db_password
-k
$db_name
-f
$scripts_dir
/
c
ql/dhcpdb_create.cql
ERRCODE
=
$?
printf
"cqlsh returned status code
$ERRCODE
\n
"
if
[
"
$ERRCODE
"
-eq
0
]
;
then
printf
"Lease DB version reported after initialization: "
dscs
ql_version
c
ql_version
printf
"
\n
"
fi
...
...
@@ -323,30 +323,30 @@ pgsql_upgrade() {
exit
0
}
dscs
ql_upgrade
()
{
version
=
`
dscs
ql_version
`
c
ql_upgrade
()
{
version
=
`
c
ql_version
`
printf
"Lease DB version reported before upgrade:
$version
\n
"
# Check if the scripts directory exists at all.
if
[
!
-d
${
scripts_dir
}
/
dscs
ql
]
;
then
log_error
"Invalid scripts directory:
${
scripts_dir
}
/
dscs
ql"
if
[
!
-d
${
scripts_dir
}
/
c
ql
]
;
then
log_error
"Invalid scripts directory:
${
scripts_dir
}
/
c
ql"
exit
1
fi
# Check if there are any files in it
num_files
=
$(
find
${
scripts_dir
}
/
dscs
ql/upgrade
*
.sh
-type
f |
wc
-l
)
num_files
=
$(
find
${
scripts_dir
}
/
c
ql/upgrade
*
.sh
-type
f |
wc
-l
)
if
[
$num_files
-eq
0
]
;
then
log_error
"No scripts in
${
scripts_dir
}
/
dscs
ql or the directory is not readable or does not have any upgrade* scripts."
log_error
"No scripts in
${
scripts_dir
}
/
c
ql or the directory is not readable or does not have any upgrade* scripts."
exit
1
fi
for
script
in
${
scripts_dir
}
/
dscs
ql/upgrade
*
.sh
for
script
in
${
scripts_dir
}
/
c
ql/upgrade
*
.sh
do
echo
"Processing
$script
file..."
sh
${
script
}
-u
${
db_user
}
-p
${
db_password
}
-k
${
db_name
}
done
version
=
`
dscs
ql_version
`
version
=
`
c
ql_version
`
printf
"Lease DB version reported after upgrade:
$version
\n
"
exit
0
}
...
...
@@ -384,7 +384,7 @@ get_dump_query() {
pgsql
)
invoke
=
"select * from"
;;
dscs
ql
)
c
ql
)
invoke
=
"select * from"
;;
*
)
...
...
@@ -491,14 +491,14 @@ pgsql_dump() {
exit
0
}
dscs
ql_dump
()
{
c
ql_dump
()
{
# get the correct dump query
version
=
`
dscs
ql_version
`
version
=
`
c
ql_version
`
retcode
=
$?
if
[
$retcode
-ne
0
]
then
log_error
"lease-dump:
dscs
ql_version failed, exit code
$retcode
"
log_error
"lease-dump:
c
ql_version failed, exit code
$retcode
"
exit
1
;
fi
...
...
@@ -526,10 +526,10 @@ dscsql_dump() {
# 'tr' to translate tabs to commas. We do not use MySQL's output
# to file as that requires linux superuser privileges to execute
# the select.
dscs
ql_execute
"
${
dump_qry
}
"
>
$tmp_file
c
ql_execute
"
${
dump_qry
}
"
>
$tmp_file
retcode
=
$?
if
[
$retcode
-ne
0
]
;
then
log_error
"lease-dump:
dscs
ql_execute failed, exit code
$retcode
"
;
log_error
"lease-dump:
c
ql_execute failed, exit code
$retcode
"
;
exit
1
fi
...
...
@@ -569,7 +569,7 @@ if [ -z ${backend} ]; then
usage
exit
1
fi
is_in_list
"
${
backend
}
"
"memfile mysql pgsql
dscs
ql"
is_in_list
"
${
backend
}
"
"memfile mysql pgsql
c
ql"
if
[
${
_inlist
}
-eq
0
]
;
then
log_error
"invalid backend:
${
backend
}
"
exit
1
...
...
@@ -669,8 +669,8 @@ case ${command} in
pgsql
)
pgsql_init
;;
dscs
ql
)
dscs
ql_init
c
ql
)
c
ql_init
;;
esac
;;
...
...
@@ -686,8 +686,8 @@ case ${command} in
pgsql
)
pgsql_version
;;
dscs
ql
)
dscs
ql_version
c
ql
)
c
ql_version
;;
esac
;;
...
...
@@ -702,8 +702,8 @@ case ${command} in
pgsql
)
pgsql_upgrade
;;
dscs
ql
)
dscs
ql_upgrade
c
ql
)
c
ql_upgrade
;;
esac
;;
...
...
@@ -718,8 +718,8 @@ case ${command} in
pgsql
)
pgsql_dump
;;
dscs
ql
)
dscs
ql_dump
c
ql
)
c
ql_dump
;;
esac
;;
...
...
src/bin/admin/tests/Makefile.am
View file @
162742b4
...
...
@@ -10,8 +10,8 @@ if HAVE_PGSQL
SHTESTS
+=
pgsql_tests.sh
endif
if
HAVE_
DSCS
QL
SHTESTS
+=
dscs
ql_tests.sh
if
HAVE_
C
QL
SHTESTS
+=
c
ql_tests.sh
endif
noinst_SCRIPTS
=
$(SHTESTS)
...
...
@@ -20,7 +20,7 @@ EXTRA_DIST += dhcpdb_create_1.0.pgsql
EXTRA_DIST
+=
dhcpdb_create_1.0.cql
CLEANFILES
=
*
.log
DISTCLEANFILES
=
memfile_tests.sh mysql_tests.sh pgsql_tests.sh
dscs
ql_tests.sh
DISTCLEANFILES
=
memfile_tests.sh mysql_tests.sh pgsql_tests.sh
c
ql_tests.sh
# Execute all test scripts.
check-local
:
...
...
src/bin/admin/tests/cql_tests.sh
0 → 100644
View file @
162742b4
#!/bin/sh
# Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Include common test library.
.
/home/andrei/work/git/isc-kea-integration/kea/src/lib/testutils/dhcp_test_lib.sh
cql_init_test
()
{
test_start
"cql.init"
# @todo: Implement this
test_finish 0
}
cql_version_test
()
{
test_start
"cql.version"
# @todo: Implement this
test_finish 0
}
cql_upgrade_test
()
{
test_start
"cql.upgrade"
# @todo: Implement this
test_finish 0
}
cql_init_test
cql_version_test
cql_upgrade_test
src/bin/admin/tests/
dscs
ql_tests.sh.in
→
src/bin/admin/tests/
c
ql_tests.sh.in
View file @
162742b4
...
...
@@ -9,30 +9,30 @@
# Include common test library.
.
@abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh
dscs
ql_init_test
()
{
test_start
"
dscs
ql.init"
c
ql_init_test
()
{
test_start
"
c
ql.init"
# @todo: Implement this
test_finish 0
}
dscs
ql_version_test
()
{
test_start
"
dscs
ql.version"
c
ql_version_test
()
{
test_start
"
c
ql.version"
# @todo: Implement this
test_finish 0
}
dscs
ql_upgrade_test
()
{
test_start
"
dscs
ql.upgrade"
c
ql_upgrade_test
()
{
test_start
"
c
ql.upgrade"
# @todo: Implement this
test_finish 0
}
dscs
ql_init_test
dscs
ql_version_test
dscs
ql_upgrade_test
c
ql_init_test
c
ql_version_test
c
ql_upgrade_test
src/bin/admin/tests/data/Makefile.am
View file @
162742b4
...
...
@@ -2,5 +2,5 @@ EXTRA_DIST = mysql.lease4_dump_test.reference.csv \
mysql.lease6_dump_test.reference.csv
\
pgsql.lease4_dump_test.reference.csv
\
pgsql.lease6_dump_test.reference.csv
\
dscs
ql.lease4_dump_test.reference.csv
\
dscs
ql.lease6_dump_test.reference.csv
c
ql.lease4_dump_test.reference.csv
\
c
ql.lease6_dump_test.reference.csv
src/bin/admin/tests/data/
dscs
ql.lease4_dump_test.reference.csv
→
src/bin/admin/tests/data/
c
ql.lease4_dump_test.reference.csv
View file @
162742b4
File moved
src/bin/admin/tests/data/
dscs
ql.lease6_dump_test.reference.csv
→
src/bin/admin/tests/data/
c
ql.lease6_dump_test.reference.csv
View file @
162742b4
File moved
src/bin/admin/tests/dhcpdb_create_1.0.cql
View file @
162742b4
...
...
@@ -14,24 +14,24 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
-- This is the Kea schema 1.0 specification for
DataStax
Cassandra
S
QL.
-- This is the Kea schema 1.0 specification for Cassandra
C
QL.
-- Note: this is outdated version on purpose and it used to test upgrade
-- process. Do not update this file to 2.0 or any later.
-- The schema is reasonably portable (with the exception of the engine
-- specification, which is
Datastax
Cassandra
S
QL-specific). Minor changes might be needed for
-- specification, which is Cassandra
C
QL-specific). Minor changes might be needed for
-- other databases.
-- To create the schema, either type the command:
-- cqlsh -u <user> -p <password> -k <database> -f dhcpdb_create.cql
-- ... at the command prompt, or log in to the
DSC S
QL database and at the "cqlsh>"
-- ... at the command prompt, or log in to the
C
QL database and at the "cqlsh>"
-- prompt, issue the command:
-- SOURCE dhcpdb_create.cql
-- This script is also called from kea-admin, see kea-admin init
dscs
ql
-- This script is also called from kea-admin, see kea-admin init
c
ql
-- Over time, Kea database schema will evolve. Each version is marked with
-- major.minor version. This file is organized sequentially, i.e. database
...
...
src/bin/d2/Makefile.am
View file @
162742b4
...
...
@@ -9,8 +9,8 @@ endif
if
HAVE_PGSQL
AM_CPPFLAGS
+=
$(PGSQL_CPPFLAGS)
endif
if
HAVE_
DSCS
QL
AM_CPPFLAGS
+=
$(
DSCS
QL_CPPFLAGS)
if
HAVE_
C
QL
AM_CPPFLAGS
+=
$(
C
QL_CPPFLAGS)
endif
AM_CXXFLAGS
=
$(KEA_CXXFLAGS)
...
...
@@ -122,8 +122,8 @@ endif
if
HAVE_PGSQL
kea_dhcp_ddns_LDFLAGS
+=
$(PGSQL_LIBS)
endif
if
HAVE_
DSCS
QL
kea_dhcp_ddns_LDFLAGS
+=
$(
DSCS
QL_LIBS)
if
HAVE_
C
QL
kea_dhcp_ddns_LDFLAGS
+=
$(
C
QL_LIBS)
endif
kea_dhcp_ddnsdir
=
$(pkgdatadir)
...
...
src/bin/d2/d_controller.cc
View file @
162742b4
...
...
@@ -21,8 +21,8 @@
#ifdef HAVE_PGSQL
#include
<dhcpsrv/pgsql_lease_mgr.h>
#endif
#ifdef HAVE_
DSCS
QL
#include
<dhcpsrv/
dscs
ql_lease_mgr.h>
#ifdef HAVE_
C
QL
#include
<dhcpsrv/
c
ql_lease_mgr.h>
#endif
#include
<dhcpsrv/memfile_lease_mgr.h>
...
...
@@ -488,8 +488,8 @@ DControllerBase::getVersion(bool extended) {
#ifdef HAVE_PGSQL
tmp
<<
isc
::
dhcp
::
PgSqlLeaseMgr
::
getDBVersion
()
<<
std
::
endl
;
#endif
#ifdef HAVE_
DSCS
QL
tmp
<<
isc
::
dhcp
::
DSCS
qlLeaseMgr
::
getDBVersion
()
<<
std
::
endl
;
#ifdef HAVE_
C
QL
tmp
<<
isc
::
dhcp
::
C
qlLeaseMgr
::
getDBVersion
()
<<
std
::
endl
;
#endif
tmp
<<
isc
::
dhcp
::
Memfile_LeaseMgr
::
getDBVersion
();
...
...
src/bin/d2/tests/Makefile.am
View file @
162742b4
...
...
@@ -75,8 +75,8 @@ endif
if
HAVE_PGSQL
d2_unittests_LDFLAGS
+=
$(PGSQL_LIBS)
endif
if
HAVE_
DSCS
QL
d2_unittests_LDFLAGS
+=
$(
DSCS
QL_LIBS)
if
HAVE_
C
QL
d2_unittests_LDFLAGS
+=
$(
C
QL_LIBS)
endif
d2_unittests_LDFLAGS
+=
$(GTEST_LDFLAGS)
...
...
src/bin/dhcp4/Makefile.am
View file @
162742b4
...
...
@@ -10,8 +10,8 @@ endif
if
HAVE_PGSQL
AM_CPPFLAGS
+=
$(PGSQL_CPPFLAGS)
endif
if
HAVE_
DSCS
QL
AM_CPPFLAGS
+=
$(
DSCS
QL_CPPFLAGS)
if
HAVE_
C
QL
AM_CPPFLAGS
+=
$(
C
QL_CPPFLAGS)
endif
AM_CXXFLAGS
=
$(KEA_CXXFLAGS)
...
...
@@ -102,8 +102,8 @@ endif
if
HAVE_PGSQL
kea_dhcp4_LDFLAGS
+=
$(PGSQL_LIBS)
endif
if
HAVE_
DSCS
QL
kea_dhcp4_LDFLAGS
+=
$(
DSCS
QL_LIBS)
if
HAVE_
C
QL
kea_dhcp4_LDFLAGS
+=
$(
C
QL_LIBS)
endif
kea_dhcp4dir
=
$(pkgdatadir)
...
...
src/bin/dhcp4/dhcp4_srv.cc
View file @
162742b4
...
...
@@ -49,8 +49,8 @@
#ifdef HAVE_PGSQL
#include
<dhcpsrv/pgsql_lease_mgr.h>
#endif
#ifdef HAVE_
DSCS
QL
#include
<dhcpsrv/
dscs
ql_lease_mgr.h>
#ifdef HAVE_
C
QL
#include
<dhcpsrv/
c
ql_lease_mgr.h>
#endif
#include
<dhcpsrv/memfile_lease_mgr.h>
...
...
@@ -2538,8 +2538,8 @@ Dhcpv4Srv::getVersion(bool extended) {
#ifdef HAVE_PGSQL
tmp
<<
PgSqlLeaseMgr
::
getDBVersion
()
<<
endl
;
#endif
#ifdef HAVE_
DSCS
QL
tmp
<<
DSCS
qlLeaseMgr
::
getDBVersion
()
<<
endl
;
#ifdef HAVE_
C
QL
tmp
<<
C
qlLeaseMgr
::
getDBVersion
()
<<
endl
;
#endif
tmp
<<
Memfile_LeaseMgr
::
getDBVersion
();
...
...
src/bin/dhcp4/tests/Makefile.am
View file @
162742b4
...
...
@@ -106,8 +106,8 @@ endif
if
HAVE_PGSQL
dhcp4_unittests_LDFLAGS
+=
$(PGSQL_LIBS)
endif
if
HAVE_
DSCS
QL
dhcp4_unittests_LDFLAGS
+=
$(
DSCS
QL_LIBS)
if
HAVE_
C
QL
dhcp4_unittests_LDFLAGS
+=
$(
C
QL_LIBS)
endif
dhcp4_unittests_LDFLAGS
+=
$(GTEST_LDFLAGS)
...
...
src/bin/dhcp6/Makefile.am
View file @
162742b4
...
...
@@ -10,8 +10,8 @@ endif
if
HAVE_PGSQL
AM_CPPFLAGS
+=
$(PGSQL_CPPFLAGS)
endif
if
HAVE_
DSCS
QL
AM_CPPFLAGS
+=
$(
DSCS
QL_CPPFLAGS)
if
HAVE_
C
QL
AM_CPPFLAGS
+=
$(
C
QL_CPPFLAGS)
endif
AM_CXXFLAGS
=
$(KEA_CXXFLAGS)
...
...
@@ -103,8 +103,8 @@ endif
if
HAVE_PGSQL
kea_dhcp6_LDFLAGS
+=
$(PGSQL_LIBS)
endif
if
HAVE_
DSCS
QL
kea_dhcp6_LDFLAGS
+=
$(
DSCS
QL_LIBS)
if
HAVE_
C
QL
kea_dhcp6_LDFLAGS
+=
$(
C
QL_LIBS)
endif
kea_dhcp6dir
=
$(pkgdatadir)
...
...
src/bin/dhcp6/dhcp6_srv.cc
View file @
162742b4
...
...
@@ -58,8 +58,8 @@
#ifdef HAVE_PGSQL
#include
<dhcpsrv/pgsql_lease_mgr.h>
#endif
#ifdef HAVE_
DSCS
QL
#include
<dhcpsrv/
dscs
ql_lease_mgr.h>
#ifdef HAVE_
C
QL
#include
<dhcpsrv/
c
ql_lease_mgr.h>
#endif
#include
<dhcpsrv/memfile_lease_mgr.h>
...
...
@@ -2986,8 +2986,8 @@ Dhcpv6Srv::getVersion(bool extended) {
#ifdef HAVE_PGSQL
tmp
<<
PgSqlLeaseMgr
::
getDBVersion
()
<<
endl
;
#endif
#ifdef HAVE_
DSCS
QL
tmp
<<
DSCS
qlLeaseMgr
::
getDBVersion
()
<<
endl
;
#ifdef HAVE_
C
QL
tmp
<<
C
qlLeaseMgr
::
getDBVersion
()
<<
endl
;
#endif
tmp
<<
Memfile_LeaseMgr
::
getDBVersion
();
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
162742b4
...
...
@@ -107,8 +107,8 @@ endif
if
HAVE_PGSQL
dhcp6_unittests_LDFLAGS
+=
$(PGSQL_LIBS)
endif
if
HAVE_
DSCS
QL