From ab04193de0e8e937ab3cac05cc628586b315cbb8 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Fri, 9 Nov 2018 09:03:52 +0100
Subject: [PATCH] Update functional test bundles and definitions

Do proper initialization of Vault.
---
 ...ke-bionic-rocky.yaml => bionic-rocky.yaml} | 34 +++++++++----------
 src/tests/tests.yaml                          | 14 ++++++++
 2 files changed, 30 insertions(+), 18 deletions(-)
 rename src/tests/bundles/{smoke-bionic-rocky.yaml => bionic-rocky.yaml} (58%)
 create mode 100644 src/tests/tests.yaml

diff --git a/src/tests/bundles/smoke-bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
similarity index 58%
rename from src/tests/bundles/smoke-bionic-rocky.yaml
rename to src/tests/bundles/bionic-rocky.yaml
index 0eeaaba..3e013cd 100644
--- a/src/tests/bundles/smoke-bionic-rocky.yaml
+++ b/src/tests/bundles/bionic-rocky.yaml
@@ -1,19 +1,19 @@
 series: bionic
 relations:
-- - keystone
-  - mysql
-- - vault
-  - mysql
-- - barbican
-  - mysql
-- - barbican
-  - keystone
-- - barbican
-  - rabbitmq-server
-- - barbican
-  - barbican-vault
-- - barbican-vault
-  - vault
+- - mysql:shared-db
+  - keystone:shared-db
+- - mysql:shared-db
+  - vault:shared-db
+- - mysql:shared-db
+  - barbican:shared-db
+- - keystone:identity-service
+  - barbican:identity-service
+- - rabbitmq-server:amqp
+  - barbican:amqp
+- - barbican-vault:secrets
+  - barbican:secrets
+- - vault:secrets
+  - barbican-vault:secrets-storage
 applications:
   mysql:
     charm: cs:~openstack-charmers-next/percona-cluster
@@ -28,10 +28,10 @@ applications:
     charm: cs:~openstack-charmers-next/barbican
     num_units: 1
     options:
-      openstack-origin: cloud:bionic-rocky/proposed
+      openstack-origin: cloud:bionic-rocky
   barbican-vault:
     series: bionic
-    charm: barbican-vault
+    charm: ../../../barbican-vault
     num_units: 0
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
@@ -39,5 +39,3 @@ applications:
   vault:
     charm: cs:~openstack-charmers-next/vault
     num_units: 1
-    options:
-      totally-unsecure-auto-unlock: True
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
new file mode 100644
index 0000000..acd9e1c
--- /dev/null
+++ b/src/tests/tests.yaml
@@ -0,0 +1,14 @@
+charm_name: barbican-vault
+smoke_bundles:
+- bionic-rocky
+target_deploy_status:
+  barbican-vault:
+    workload-status: waiting
+    workload-status-message: "'secrets-storage' incomplete"
+  vault:
+    workload-status: blocked
+    workload-status-message: Vault needs to be initialized
+configure:
+- zaza.charm_tests.vault.setup.basic_setup
+tests:
+- zaza.charm_tests.barbican_vault.tests.BarbicanVaultUnsealVault