From 2f9e86743be0a931f9e114f266677c5fa9d55869 Mon Sep 17 00:00:00 2001
From: Gustavo Sanchez <gustavo.sanchez@canonical.com>
Date: Wed, 24 Nov 2021 19:08:05 -0400
Subject: [PATCH] Functional test - Upgrades bundle to focal-ussuri - Adds
 local overlay with CI envs

---
 tests/bundles/bionic-queens.yaml              | 50 ------------
 tests/bundles/focal-ussuri.yaml               | 76 +++++++++++++++++++
 .../overlays/local-charm-overlay.yaml.j2      |  6 ++
 3 files changed, 82 insertions(+), 50 deletions(-)
 delete mode 100644 tests/bundles/bionic-queens.yaml
 create mode 100644 tests/bundles/focal-ussuri.yaml
 create mode 100644 tests/bundles/overlays/local-charm-overlay.yaml.j2

diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml
deleted file mode 100644
index 163a10b..0000000
--- a/tests/bundles/bionic-queens.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-series: bionic
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-local_overlay_enabled: false
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - cinder:shared-db
-  - mysql:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:storage-backend
-  - cinder-solidfire:storage-backend
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-queens
-    to:
-    - '1'
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-queens
-    to:
-    - '2'
-  cinder-solidfire:
-    charm: ../../cinder-solidfire.charm
-    options:
-# Add config options here
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
new file mode 100644
index 0000000..95ae91b
--- /dev/null
+++ b/tests/bundles/focal-ussuri.yaml
@@ -0,0 +1,76 @@
+series: focal
+variables:
+  openstack-origin: &openstack-origin distro
+comment:
+  - machines section to decide order of deployment. database sooner = faster
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+    constraints: mem=4G root-disk=16G
+
+applications:
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '3'
+  keystone:
+    charm: cs:~openstack-charmers/keystone
+    options:
+      openstack-origin: *openstack-origin
+    num_units: 1
+    to:
+      - '4'
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    storage:
+      block-devices: '40G'
+    options:
+      openstack-origin: *openstack-origin
+      block-device: None
+      overwrite: "true"
+    to:
+      - '5'
+  
+  # SUBORDINATES 
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  
+  # src charm
+  cinder-solidfire:
+    charm: cs:~gustavosr98/cinder-solidfire
+    options:
+      san-ip: 10.0.0.5
+      san-login: username 
+      san-password: password
+
+relations:
+  - [ keystone:shared-db, keystone-mysql-router:shared-db ]
+  - [ keystone-mysql-router:db-router, mysql-innodb-cluster:db-router ]
+  - [ cinder:shared-db, cinder-mysql-router:shared-db ]
+  - [ cinder-mysql-router:db-router, mysql-innodb-cluster:db-router ]
+  - [ cinder:identity-service, keystone:identity-service ]
+  - [ cinder:amqp, rabbitmq-server:amqp ]
+  - [ cinder:storage-backend, cinder-solidfire:storage-backend ]
diff --git a/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/bundles/overlays/local-charm-overlay.yaml.j2
new file mode 100644
index 0000000..5cbeb12
--- /dev/null
+++ b/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -0,0 +1,6 @@
+applications:
+  cinder-solidfire:
+    options:
+      san-ip: {{ TEST_SOLIDFIRE_SAN_IP }}
+      san-login: {{ TEST_SOLIDFIRE_SAN_USERNAME }}
+      san-password: {{ TEST_SOLIDFIRE_SAN_PASSWORD }}