configured various DPD modes in sql scenarios

diff --git a/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql
index 54086643f6ecf47f49d90ed22bf9c3f4266218f0..ef6849c114e467c5513178407c7a2378eec0c46c 100644 (file)
--- a/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/data.sql
@@ -109,9 +109,9 @@ INSERT INTO ike_configs (
 );
 
 INSERT INTO peer_configs (
-  name, ike_cfg, local_id, remote_id, mobike
+  name, ike_cfg, local_id, remote_id, mobike, dpd_delay
 ) VALUES (
-  'net-net', 1, 4, 5, 0
+  'net-net', 1, 4, 5, 0, 0
 );
 
 INSERT INTO child_configs (

diff --git a/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql
index 2bc8b34c83cae778dcaaffa09d956e0f399d5f85..79a35ef68fb755cd47b3f863dac5e5744cb2fbff 100644 (file)
--- a/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/data.sql
@@ -109,9 +109,9 @@ INSERT INTO ike_configs (
 );
 
 INSERT INTO peer_configs (
-  name, ike_cfg, local_id, remote_id, mobike
+  name, ike_cfg, local_id, remote_id, mobike, dpd_delay
 ) VALUES (
-  'net-net', 1, 5, 4, 0
+  'net-net', 1, 5, 4, 0, 0
 );
 
 INSERT INTO child_configs (

diff --git a/testing/tests/sql/net2net-route-pem/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-route-pem/hosts/moon/etc/ipsec.d/data.sql
index 470a18ee21ad978ccd7c3fbb50506585dd4d844a..8d85497e238e154ffe18f50157948e5632bf07eb 100644 (file)
--- a/testing/tests/sql/net2net-route-pem/hosts/moon/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/net2net-route-pem/hosts/moon/etc/ipsec.d/data.sql
@@ -109,27 +109,27 @@ INSERT INTO ike_configs (
 );
 
 INSERT INTO peer_configs (
-  name, ike_cfg, local_id, remote_id, mobike
+  name, ike_cfg, local_id, remote_id, mobike, dpd_delay
 ) VALUES (
-  'net-net', 1, 4, 5, 0
+  'net-net', 1, 4, 5, 0, 30
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-1', 'ipsec _updown iptables', 1
+  'net-1', 'ipsec _updown iptables', 1, 1
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-2', 'ipsec _updown iptables', 1
+  'net-2', 'ipsec _updown iptables', 1, 1
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-3', 'ipsec _updown iptables', 0
+  'net-3', 'ipsec _updown iptables', 0, 0
 );
 
 INSERT INTO peer_config_child_config (

diff --git a/testing/tests/sql/net2net-route-pem/hosts/sun/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-route-pem/hosts/sun/etc/ipsec.d/data.sql
index 677c99957b9ad62a1f8e67b10a053ad1c8f3b338..aeacf493fc3000a09c4c781f8f3c39ab6df463e3 100644 (file)
--- a/testing/tests/sql/net2net-route-pem/hosts/sun/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/net2net-route-pem/hosts/sun/etc/ipsec.d/data.sql
@@ -109,27 +109,27 @@ INSERT INTO ike_configs (
 );
 
 INSERT INTO peer_configs (
-  name, ike_cfg, local_id, remote_id, mobike
+  name, ike_cfg, local_id, remote_id, mobike, dpd_delay
 ) VALUES (
-  'net-net', 1, 5, 4, 0
+  'net-net', 1, 5, 4, 0, 30
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-1', 'ipsec _updown iptables', 1
+  'net-1', 'ipsec _updown iptables', 1, 1
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-2', 'ipsec _updown iptables', 1
+  'net-2', 'ipsec _updown iptables', 1, 1
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-3', 'ipsec _updown iptables', 0
+  'net-3', 'ipsec _updown iptables', 0, 0
 );
 
 INSERT INTO peer_config_child_config (

diff --git a/testing/tests/sql/net2net-start-pem/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-start-pem/hosts/moon/etc/ipsec.d/data.sql
index 2a333ab9ae5209db97814d7c232e0694b8f1efda..542bdeae24e011ea7a5fb9013fd5987eb179a89d 100644 (file)
--- a/testing/tests/sql/net2net-start-pem/hosts/moon/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/net2net-start-pem/hosts/moon/etc/ipsec.d/data.sql
@@ -109,27 +109,27 @@ INSERT INTO ike_configs (
 );
 
 INSERT INTO peer_configs (
-  name, ike_cfg, local_id, remote_id, mobike
+  name, ike_cfg, local_id, remote_id, mobike, dpd_delay
 ) VALUES (
-  'net-net', 1, 4, 5, 0
+  'net-net', 1, 4, 5, 0, 30
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-1', 'ipsec _updown iptables', 2
+  'net-1', 'ipsec _updown iptables', 2, 2
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-2', 'ipsec _updown iptables', 2
+  'net-2', 'ipsec _updown iptables', 2, 2
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-3', 'ipsec _updown iptables', 2
+  'net-3', 'ipsec _updown iptables', 2, 2
 );
 
 INSERT INTO peer_config_child_config (

diff --git a/testing/tests/sql/net2net-start-pem/hosts/sun/etc/ipsec.d/data.sql b/testing/tests/sql/net2net-start-pem/hosts/sun/etc/ipsec.d/data.sql
index 6e7760a41e53f7dc1fd56bb1698cc9f06282bfb4..3bcefd3d20c39921cd0c80c3516e5e7ca720a2b2 100644 (file)
--- a/testing/tests/sql/net2net-start-pem/hosts/sun/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/net2net-start-pem/hosts/sun/etc/ipsec.d/data.sql
@@ -109,27 +109,27 @@ INSERT INTO ike_configs (
 );
 
 INSERT INTO peer_configs (
-  name, ike_cfg, local_id, remote_id, mobike
+  name, ike_cfg, local_id, remote_id, mobike, dpd_delay
 ) VALUES (
-  'net-net', 1, 5, 4, 0
+  'net-net', 1, 5, 4, 0, 30
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-1', 'ipsec _updown iptables', 0
+  'net-1', 'ipsec _updown iptables', 0, 0
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-2', 'ipsec _updown iptables', 0
+  'net-2', 'ipsec _updown iptables', 0, 0
 );
 
 INSERT INTO child_configs (
-  name, updown, start_action
+  name, updown, start_action, dpd_action
 ) VALUES (
-  'net-3', 'ipsec _updown iptables', 0
+  'net-3', 'ipsec _updown iptables', 0, 0
 );
 
 INSERT INTO peer_config_child_config (