From 03957f784a71096f146bf9df3468e352b7309762 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Thu, 7 May 2020 11:48:45 +0100
Subject: [PATCH] Enable focal and ussuri in the charm testing

Change-Id: Ifadd43b3b96adc93b46abe57200a8fdacb54447d
---
 src/lib/charm/openstack/watcher.py   |  2 +
 src/metadata.yaml                    |  1 +
 src/tests/bundles/bionic-ussuri.yaml | 36 ++++++++++++++++
 src/tests/bundles/focal-ussuri.yaml  | 61 ++++++++++++++++++++++++++++
 src/tests/tests.yaml                 |  4 +-
 5 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 src/tests/bundles/bionic-ussuri.yaml
 create mode 100644 src/tests/bundles/focal-ussuri.yaml

diff --git a/src/lib/charm/openstack/watcher.py b/src/lib/charm/openstack/watcher.py
index e16d46b..5426bd2 100644
--- a/src/lib/charm/openstack/watcher.py
+++ b/src/lib/charm/openstack/watcher.py
@@ -94,6 +94,8 @@ class WatcherCharm(openstack_charm.HAOpenStackCharm):
         'python-apt',  # NOTE: workaround for hacluster subordinate
     ]
 
+    python_version = 3
+
     api_ports = {
         'watcher-api': {
             os_ip.PUBLIC: 9322,
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 11ef1ba..2980c20 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -12,6 +12,7 @@ tags:
 series:
   - bionic
   - eoan
+  - focal
 subordinate: false
 requires:
   shared-db:
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
new file mode 100644
index 0000000..4f84976
--- /dev/null
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -0,0 +1,36 @@
+series: bionic
+relations:
+- - mysql:shared-db
+  - keystone:shared-db
+- - mysql:shared-db
+  - watcher:shared-db
+- - keystone:identity-service
+  - watcher:identity-service
+- - rabbitmq-server:amqp
+  - watcher:amqp
+applications:
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  mysql:
+    constraints: mem=3072M
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+  watcher:
+    series: bionic
+    charm: ../../../watcher
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+      datasources: gnocchi
+      planner: weight
+      planner-config: >
+        {
+            "weights": "change_node_power_state:9,change_nova_service_state:50,migrate:30,nop:70,resize:20,sleep:40,turn_host_to_acpi_s3_state:10,volume_migrate:60",
+            "parallelization": "change_node_power_state:2,change_nova_service_state:1,migrate:2,nop:1,resize:2,sleep:1,turn_host_to_acpi_s3_state:2,volume_migrate:2"
+        }
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
new file mode 100644
index 0000000..3b4d0ea
--- /dev/null
+++ b/src/tests/bundles/focal-ussuri.yaml
@@ -0,0 +1,61 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series focal
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  watcher-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  watcher:
+    series: *series
+    charm: ../../../watcher
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      datasources: gnocchi
+      planner: weight
+      planner-config: >
+        {
+            "weights": "change_node_power_state:9,change_nova_service_state:50,migrate:30,nop:70,resize:20,sleep:40,turn_host_to_acpi_s3_state:10,volume_migrate:60",
+            "parallelization": "change_node_power_state:2,change_nova_service_state:1,migrate:2,nop:1,resize:2,sleep:1,turn_host_to_acpi_s3_state:2,volume_migrate:2"
+        }
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'watcher:shared-db'
+    - 'watcher-mysql-router:shared-db'
+  - - 'watcher-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'keystone:identity-service'
+    - 'watcher:identity-service'
+
+  - - 'rabbitmq-server:amqp'
+    - 'watcher:amqp'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 6cc5204..ea3393e 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,8 +1,10 @@
 charm_name: watcher
 gate_bundles:
 - bionic-train
+- bionic-ussuri
+- focal-ussuri
 smoke_bundles:
-- bionic-train
+- focal-ussuri
 configure:
 - zaza.charm_tests.noop.setup.basic_setup
 tests: