From 20e32cf86c475cb5a80a8ebecaa1d728437289c4 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Tue, 15 Apr 2008 15:14:32 +0000
Subject: [PATCH] updated sql testcases to new table schema

---
 .../sql/net2net-cert/hosts/moon/etc/ipsec.d/ipsec.sql     | 8 ++++++--
 .../sql/net2net-cert/hosts/sun/etc/ipsec.d/ipsec.sql      | 8 ++++++--
 .../sql/net2net-psk/hosts/moon/etc/ipsec.d/ipsec.sql      | 8 ++++++--
 .../tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/ipsec.sql | 8 ++++++--
 .../tests/sql/rw-cert/hosts/carol/etc/ipsec.d/ipsec.sql   | 8 ++++++--
 .../tests/sql/rw-cert/hosts/dave/etc/ipsec.d/ipsec.sql    | 8 ++++++--
 .../tests/sql/rw-cert/hosts/moon/etc/ipsec.d/ipsec.sql    | 8 ++++++--
 .../sql/rw-psk-ipv4/hosts/carol/etc/ipsec.d/ipsec.sql     | 8 ++++++--
 .../sql/rw-psk-ipv4/hosts/dave/etc/ipsec.d/ipsec.sql      | 8 ++++++--
 .../sql/rw-psk-ipv4/hosts/moon/etc/ipsec.d/ipsec.sql      | 8 ++++++--
 .../sql/rw-psk-ipv6/hosts/carol/etc/ipsec.d/ipsec.sql     | 8 ++++++--
 .../sql/rw-psk-ipv6/hosts/dave/etc/ipsec.d/ipsec.sql      | 8 ++++++--
 .../sql/rw-psk-ipv6/hosts/moon/etc/ipsec.d/ipsec.sql      | 8 ++++++--
 .../rw-psk-rsa-split/hosts/carol/etc/ipsec.d/ipsec.sql    | 8 ++++++--
 .../sql/rw-psk-rsa-split/hosts/dave/etc/ipsec.d/ipsec.sql | 8 ++++++--
 .../sql/rw-psk-rsa-split/hosts/moon/etc/ipsec.d/ipsec.sql | 8 ++++++--
 16 files changed, 96 insertions(+), 32 deletions(-)

diff --git a/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/ipsec.sql b/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/ipsec.sql
index c5a94a5cc..2f59fb9af 100644
--- a/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/ipsec.sql b/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/ipsec.sql
index fb0b523b2..5d5ad19c4 100644
--- a/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/ipsec.sql b/testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/ipsec.sql
index b0242f6e6..7cc6e424e 100644
--- a/testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/ipsec.sql b/testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/ipsec.sql
index a66d80ef4..3b06b4520 100644
--- a/testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-cert/hosts/carol/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-cert/hosts/carol/etc/ipsec.d/ipsec.sql
index 2dcf4a473..8c933f9d1 100644
--- a/testing/tests/sql/rw-cert/hosts/carol/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-cert/hosts/carol/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-cert/hosts/dave/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-cert/hosts/dave/etc/ipsec.d/ipsec.sql
index 2a4d1f968..f7e8d6d42 100644
--- a/testing/tests/sql/rw-cert/hosts/dave/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-cert/hosts/dave/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-cert/hosts/moon/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-cert/hosts/moon/etc/ipsec.d/ipsec.sql
index 37122b81f..b4ea7d760 100644
--- a/testing/tests/sql/rw-cert/hosts/moon/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-cert/hosts/moon/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/ipsec.d/ipsec.sql
index 5cdcac3ae..b4bd124d1 100644
--- a/testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/ipsec.d/ipsec.sql
index 3c323c3b0..6cdaaea4d 100644
--- a/testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/ipsec.d/ipsec.sql
index b6f376f00..f7c0989f7 100644
--- a/testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/ipsec.d/ipsec.sql
index 6fa2bcd9a..02b0754d7 100644
--- a/testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/ipsec.d/ipsec.sql
index cae9014a5..f0c800682 100644
--- a/testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/ipsec.d/ipsec.sql
index cfacee8ce..aaa32e845 100644
--- a/testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-psk-rsa-split/hosts/carol/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-psk-rsa-split/hosts/carol/etc/ipsec.d/ipsec.sql
index 42773f64e..ee0746e83 100644
--- a/testing/tests/sql/rw-psk-rsa-split/hosts/carol/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-psk-rsa-split/hosts/carol/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-psk-rsa-split/hosts/dave/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-psk-rsa-split/hosts/dave/etc/ipsec.d/ipsec.sql
index 3bc0f3ae5..428de87c7 100644
--- a/testing/tests/sql/rw-psk-rsa-split/hosts/dave/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-psk-rsa-split/hosts/dave/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'
diff --git a/testing/tests/sql/rw-psk-rsa-split/hosts/moon/etc/ipsec.d/ipsec.sql b/testing/tests/sql/rw-psk-rsa-split/hosts/moon/etc/ipsec.d/ipsec.sql
index f2ff2d7b6..930301eed 100644
--- a/testing/tests/sql/rw-psk-rsa-split/hosts/moon/etc/ipsec.d/ipsec.sql
+++ b/testing/tests/sql/rw-psk-rsa-split/hosts/moon/etc/ipsec.d/ipsec.sql
@@ -15,7 +15,9 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1'
+  mode INTEGER NOT NULL DEFAULT '1',
+  dpd_action INTEGER NOT NULL DEFAULT '0',
+  close_action INTEGER NOT NULL DEFAULT '0'
 );
 DROP INDEX IF EXISTS child_configs_name;
 CREATE INDEX child_configs_name ON child_configs (
@@ -51,6 +53,7 @@ CREATE TABLE peer_configs (
   local_id TEXT NOT NULL,
   remote_id TEXT NOT NULL,
   cert_policy INTEGER NOT NULL DEFAULT '1',
+  uniqueid INTEGER NOT NULL DEFAULT '0',
   auth_method INTEGER NOT NULL DEFAULT '1',
   eap_type INTEGER NOT NULL DEFAULT '0',
   eap_vendor INTEGER NOT NULL DEFAULT '0',
@@ -61,7 +64,8 @@ CREATE TABLE peer_configs (
   overtime INTEGER NOT NULL DEFAULT '300',
   mobike INTEGER NOT NULL DEFAULT '1',
   dpd_delay INTEGER NOT NULL DEFAULT '120',
-  dpd_action INTEGER NOT NULL DEFAULT '1',
+  virtual TEXT DEFAULT NULL,
+  pool TEXT DEFAULT NULL,
   mediation INTEGER NOT NULL DEFAULT '0',
   mediated_by INTEGER NOT NULL DEFAULT '0',
   peer_id INTEGER NOT NULL DEFAULT '0'