testing: Move collector.db in tnc/tnccs-20-ev-pt-tls scenario to /etc/db.d

Also move initialization to the pretest script (it's way faster in the in-memory database).
2017-08-07 16:55:45 +02:00
parent 6fadc6a859
commit f058804df8
14 changed files with 5 additions and 47 deletions
@@ -7,7 +7,7 @@ libtls {
 libimcv {
  plugins {
    imc-swima {
-      swid_database = sqlite:///etc/pts/collector.db
+      swid_database = sqlite:///etc/db.d/collector.db
    }
  }
 }
@@ -20,6 +20,7 @@ winnetou::ip route add 10.1.0.0/16 via 192.168.0.1
 dave::ip route add 10.1.0.0/16 via 192.168.0.1
 dave::cat /etc/pts/options
 dave::/usr/local/bin/pt-tls-client --optionsfrom /etc/pts/options
+carol::/usr/local/bin/init_collector
 carol::ip route add 10.1.0.0/16 via 192.168.0.1
 carol::cat /etc/pts/options
 carol::/usr/local/bin/pt-tls-client --optionsfrom /etc/pts/options
@@ -22,7 +22,7 @@ IPSECHOSTS="carol moon dave alice"

 # Guest instances on which databases are used
 #
-DBHOSTS="alice"
+DBHOSTS="alice carol"

 # charon controlled by swanctl
 #