summaryrefslogtreecommitdiff
path: root/testing/tests/sql/ip-split-pools-db-restart
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@corsac.net>2017-11-21 10:22:31 +0100
committerYves-Alexis Perez <corsac@corsac.net>2017-11-21 10:22:31 +0100
commit6eb3bec5bee061bbb6a5c10f01d9737fb4597265 (patch)
treec1d58904577a286f7788ab5d2a4f116b07163698 /testing/tests/sql/ip-split-pools-db-restart
parent745cb3e75fbcd8bc70e8b5f55a91ae2c8a274688 (diff)
parente1d78dc2faaa06e7c3f71ef674a71e4de2f0758e (diff)
downloadvyos-strongswan-6eb3bec5bee061bbb6a5c10f01d9737fb4597265.tar.gz
vyos-strongswan-6eb3bec5bee061bbb6a5c10f01d9737fb4597265.zip
Update upstream source from tag 'upstream/5.6.1'
Update to upstream version '5.6.1' with Debian dir 3996fc7d7b19a96b252a7fcbac12c94452d1e7d7
Diffstat (limited to 'testing/tests/sql/ip-split-pools-db-restart')
-rw-r--r--testing/tests/sql/ip-split-pools-db-restart/posttest.dat6
-rw-r--r--testing/tests/sql/ip-split-pools-db-restart/pretest.dat9
2 files changed, 9 insertions, 6 deletions
diff --git a/testing/tests/sql/ip-split-pools-db-restart/posttest.dat b/testing/tests/sql/ip-split-pools-db-restart/posttest.dat
index b257564dc..ea0241af0 100644
--- a/testing/tests/sql/ip-split-pools-db-restart/posttest.dat
+++ b/testing/tests/sql/ip-split-pools-db-restart/posttest.dat
@@ -1,5 +1,5 @@
carol::swanctl --terminate --ike home
dave::swanctl --terminate --ike home
-carol::service charon stop 2> /dev/null
-dave::service charon stop 2> /dev/null
-moon::service charon stop 2> /dev/null
+carol::systemctl stop strongswan-swanctl
+dave::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan-swanctl
diff --git a/testing/tests/sql/ip-split-pools-db-restart/pretest.dat b/testing/tests/sql/ip-split-pools-db-restart/pretest.dat
index d0c7b9c76..084bcd2f4 100644
--- a/testing/tests/sql/ip-split-pools-db-restart/pretest.dat
+++ b/testing/tests/sql/ip-split-pools-db-restart/pretest.dat
@@ -6,9 +6,12 @@ carol::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
dave::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
moon::ipsec pool --status 2> /dev/null
moon::ipsec pool --leases 2> /dev/null
-moon::service charon start 2> /dev/null
-carol::service charon start 2> /dev/null
-dave::service charon start 2> /dev/null
+carol::cd /etc/swanctl; rm -r rsa/* x509/* x509ca/*
+dave::cd /etc/swanctl; rm -r rsa/* x509/* x509ca/*
+moon::cd /etc/swanctl; rm -r rsa/* x509/* x509ca/*
+moon::systemctl start strongswan-swanctl
+carol::systemctl start strongswan-swanctl
+dave::systemctl start strongswan-swanctl
moon::expect-connection rw
dave::expect-connection home
dave::swanctl --initiate --child home 2> /dev/null