fixed keyids in sql/ip-split-pools-db-restart scenario

diff --git a/testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/ipsec.d/data.sql b/testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/ipsec.d/data.sql
index 9afa1b15d7f52ad2b5722ecd1775e9fa91fc51bc..2d7a2e0809c4fe5d4b4c500796d32d7ac9189337 100644 (file)
--- a/testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/ipsec.d/data.sql
@@ -8,10 +8,15 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
+) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
   11, X'5da7dd700651327ee7b66db3b5e5e060ea2e4def'
  );
 
+INSERT INTO identities (
+  type, data
+) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
+  11, X'ae096b87b44886d3b820978623dabd0eae22ebbc'
+ );
 INSERT INTO identities (
   type, data
 ) VALUES ( /* carol@strongswan.org */
@@ -20,7 +25,7 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=carol@strongswan.org' */
+) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=carol@strongswan.org' */
   11, X'1fa1a988d9648cb5a0a2546439b4f23d745d6e7c'
  );
 
@@ -59,13 +64,19 @@ INSERT INTO certificate_identity (
 INSERT INTO certificate_identity (
   certificate, identity
 ) VALUES (
-  2, 3
+  1, 3
+);
+
+INSERT INTO certificate_identity (
+  certificate, identity
+) VALUES (
+  2, 4 
 );
 
 INSERT INTO certificate_identity (
   certificate, identity
 ) VALUES (
-  2, 4
+  2, 5 
 );
 
 /* Private Keys */
@@ -79,13 +90,13 @@ INSERT INTO private_keys (
 INSERT INTO private_key_identity (
   private_key, identity
 ) VALUES (
-  1, 3
+  1, 4 
 );
 
 INSERT INTO private_key_identity (
   private_key, identity
 ) VALUES (
-  1, 4
+  1, 5 
 );
 
 /* Configurations */
@@ -99,7 +110,7 @@ INSERT INTO ike_configs (
 INSERT INTO peer_configs (
   name, ike_cfg, local_id, remote_id, virtual
 ) VALUES (
-  'home', 1, 3, 5, '0.0.0.0'
+  'home', 1, 4, 6, '0.0.0.0'
 );
 
 INSERT INTO child_configs (

diff --git a/testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/ipsec.d/data.sql b/testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/ipsec.d/data.sql
index 425c180a1d19dd2a59a50a44bb6d8dfeaef56853..acc82b8d19954a712be6c057613875da130edfae 100644 (file)
--- a/testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/ipsec.d/data.sql
@@ -8,10 +8,15 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
+) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
   11, X'5da7dd700651327ee7b66db3b5e5e060ea2e4def'
  );
 
+INSERT INTO identities (
+  type, data
+) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
+  11, X'ae096b87b44886d3b820978623dabd0eae22ebbc'
+ );
 INSERT INTO identities (
   type, data
 ) VALUES ( /* dave@strongswan.org */
@@ -20,7 +25,7 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=dave@strongswan.org' */
+) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=dave@strongswan.org' */
   11, X'ee7f38daeea1b81a41777f78f2674be8439d8e0e'
  );
 
@@ -59,13 +64,19 @@ INSERT INTO certificate_identity (
 INSERT INTO certificate_identity (
   certificate, identity
 ) VALUES (
-  2, 3
+  1, 3
+);
+
+INSERT INTO certificate_identity (
+  certificate, identity
+) VALUES (
+  2, 4 
 );
 
 INSERT INTO certificate_identity (
   certificate, identity
 ) VALUES (
-  2, 4
+  2, 5 
 );
 
 /* Private Keys */
@@ -79,13 +90,13 @@ INSERT INTO private_keys (
 INSERT INTO private_key_identity (
   private_key, identity
 ) VALUES (
-  1, 3
+  1, 4 
 );
 
 INSERT INTO private_key_identity (
   private_key, identity
 ) VALUES (
-  1, 4
+  1, 5 
 );
 
 /* Configurations */
@@ -99,7 +110,7 @@ INSERT INTO ike_configs (
 INSERT INTO peer_configs (
   name, ike_cfg, local_id, remote_id, virtual
 ) VALUES (
-  'home', 1, 3, 5, '0.0.0.0'
+  'home', 1, 4, 6, '0.0.0.0'
 );
 
 INSERT INTO child_configs (

diff --git a/testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/ipsec.d/data.sql
index ac776f39db12e60b16b3a3f2a8f7278a0053db1c..3b0ea67d485a23fda1169685132fc45d291221f6 100644 (file)
--- a/testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/ipsec.d/data.sql
@@ -8,10 +8,16 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
+) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
   11, X'5da7dd700651327ee7b66db3b5e5e060ea2e4def'
  );
 
+INSERT INTO identities (
+  type, data
+) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=strongSwan Root CA' */
+  11, X'ae096b87b44886d3b820978623dabd0eae22ebbc'
+ );
+
 INSERT INTO identities (
   type, data
 ) VALUES ( /* moon.strongswan.org */
@@ -20,7 +26,7 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of 'C=CH, O=Linux strongSwan, CN=moon.strongswan.org' */
+) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=moon.strongswan.org' */
   11, X'6a9c74d1f8897989f65a94e989f1fac3649d292e'
  );
 
@@ -71,13 +77,19 @@ INSERT INTO certificate_identity (
 INSERT INTO certificate_identity (
   certificate, identity
 ) VALUES (
-  2, 3
+  1, 3
+);
+
+INSERT INTO certificate_identity (
+  certificate, identity
+) VALUES (
+  2, 4 
 );
 
 INSERT INTO certificate_identity (
   certificate, identity
 ) VALUES (
-  2, 4
+  2, 5 
 );
 
 /* Private Keys */
@@ -91,13 +103,13 @@ INSERT INTO private_keys (
 INSERT INTO private_key_identity (
   private_key, identity
 ) VALUES (
-  1, 3
+  1, 4 
 );
 
 INSERT INTO private_key_identity (
   private_key, identity
 ) VALUES (
-  1, 4
+  1, 5 
 );
 
 /* Configurations */
@@ -111,7 +123,7 @@ INSERT INTO ike_configs (
 INSERT INTO peer_configs (
   name, ike_cfg, local_id, remote_id, pool
 ) VALUES (
-  'rw', 1, 3, 5, 'pool0,pool1'
+  'rw', 1, 4, 6, 'pool0,pool1'
 );
 
 INSERT INTO child_configs (
@@ -167,7 +179,7 @@ INSERT INTO pools (
 INSERT INTO addresses (
   pool, address, identity, acquired, released
 ) VALUES (
-  1, X'0a030001', 6, 1247817255, 1247817277 
+  1, X'0a030001', 7, 1247817255, 1247817277 
 );
 
 INSERT INTO addresses (
@@ -179,7 +191,7 @@ INSERT INTO addresses (
 INSERT INTO addresses (
   pool, address, identity, acquired, released
 ) VALUES (
-  2, X'0a030101', 7, 1247817257, 1247817278
+  2, X'0a030101', 8, 1247817257, 1247817278
 );
 
 INSERT INTO addresses (
@@ -191,14 +203,11 @@ INSERT INTO addresses (
 INSERT INTO leases (
   address, identity, acquired, released
 ) VALUES (
-  1, 6, 1247817255, 1247817277
+  1, 7, 1247817255, 1247817277
 );
 
 INSERT INTO leases (
   address, identity, acquired, released
 ) VALUES (
-  3, 7, 1247817257, 1247817278
+  3, 8, 1247817257, 1247817278
 );
-
-
-