Test bundles for focal-wallaby and hirsute-wallaby

These are the test bundles (and any associated changes) for
focal-wallaby and hirsute-wallaby support.

Libraries sync

hisute-wallaby test is disabled (moved to dev) due to [1] as bundle may
reference a reactive charm.

[1] https://github.com/juju-solutions/layer-basic/issues/194

Change-Id: If5d64191925c5b568c0224c59b0c851e3c8f3e50

tests/bundles/focal-wallaby.yaml

@@ -0,0 +1,43 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+series: &series focal
+
+applications:
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-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
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+relations:
+  - - neutron-api:amqp
+    - rabbitmq-server:amqp
+  - - neutron-api:identity-service
+    - keystone:identity-service
+  - ["keystone:shared-db", "keystone-mysql-router:shared-db"]
+  - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
+  - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+  - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

tests/bundles/hirsute-wallaby.yaml

@@ -0,0 +1,43 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series hirsute
+
+applications:
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-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
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+relations:
+  - - neutron-api:amqp
+    - rabbitmq-server:amqp
+  - - neutron-api:identity-service
+    - keystone:identity-service
+  - ["keystone:shared-db", "keystone-mysql-router:shared-db"]
+  - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
+  - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+  - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

tests/tests.yaml

@@ -2,6 +2,7 @@ charm_name: neutron-api
 
 gate_bundles:
   - groovy-victoria
+  - focal-wallaby
   - focal-victoria
   - focal-ussuri
   - bionic-ussuri
@@ -9,23 +10,29 @@ gate_bundles:
   - bionic-stein
   - bionic-queens
   - xenial-mitaka
+
 smoke_bundles:
-  - bionic-ussuri
+  - focal-ussuri
+
 dev_bundles:
   - trusty-mitaka
   - xenial-ocata
   - xenial-pike
   - xenial-queens
   - bionic-rocky
+  - hirsute-wallaby
+
 tests:
   - zaza.openstack.charm_tests.neutron.tests.NeutronApiTest
   - zaza.openstack.charm_tests.neutron.tests.NeutronCreateNetworkTest
   - zaza.openstack.charm_tests.neutron.tests.SecurityTest
   - zaza.openstack.charm_tests.policyd.tests.NeutronApiTests
+
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
+
 tests_options:
   policyd:
     service: neutron
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby