Merge "Enable bionic/stein functional tests"

src/reactive/octavia_handlers.py

@@ -35,7 +35,8 @@ charm.use_defaults(
     'shared-db.connected',
     'identity-service.available',
     'config.changed',
-    'update-status')
+    'update-status',
+    'upgrade-charm')
 
 
 @reactive.when('identity-service.connected')

src/tests/bundles/bionic-stein.yaml

@@ -0,0 +1,115 @@
+series: bionic
+relations:
+- - glance:image-service
+  - nova-cloud-controller:image-service
+- - glance:image-service
+  - nova-compute:image-service
+- - mysql:shared-db
+  - glance:shared-db
+- - mysql:shared-db
+  - keystone:shared-db
+- - mysql:shared-db
+  - neutron-api:shared-db
+- - mysql:shared-db
+  - nova-cloud-controller:shared-db
+- - mysql:shared-db
+  - octavia:shared-db
+- - keystone:identity-service
+  - glance:identity-service
+- - keystone:identity-service
+  - nova-cloud-controller:identity-service
+- - keystone:identity-service
+  - neutron-api:identity-service
+- - keystone:identity-service
+  - octavia:identity-service
+- - nova-compute:cloud-compute
+  - nova-cloud-controller:cloud-compute
+- - rabbitmq-server:amqp
+  - neutron-api:amqp
+- - rabbitmq-server:amqp
+  - glance:amqp
+- - rabbitmq-server:amqp
+  - neutron-gateway:amqp
+- - rabbitmq-server:amqp
+  - nova-cloud-controller:amqp
+- - rabbitmq-server:amqp
+  - nova-compute:amqp
+- - rabbitmq-server:amqp
+  - octavia:amqp
+- - neutron-api:neutron-api
+  - nova-cloud-controller:neutron-api
+- - neutron-api:neutron-load-balancer
+  - octavia:neutron-api
+- - neutron-gateway:quantum-network-service
+  - nova-cloud-controller:quantum-network-service
+- - rabbitmq-server:amqp
+  - neutron-openvswitch:amqp
+- - neutron-api:neutron-plugin-api
+  - neutron-openvswitch:neutron-plugin-api
+- - neutron-openvswitch:neutron-plugin
+  - nova-compute:neutron-plugin
+- - neutron-openvswitch:neutron-plugin
+  - octavia:neutron-openvswitch
+applications:
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+  mysql:
+    constraints: mem=3072M
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+      debug: True
+      flat-network-providers: physnet1
+      neutron-security-groups: True
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+      bridge-mappings: physnet1:br-ex
+      debug: True
+  neutron-openvswitch:
+    series: bionic
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+    options:
+      debug: True
+      prevent-arp-spoofing: False
+      firewall-driver: openvswitch
+  nova-cloud-controller:
+    constraints: mem=3072M
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+      debug: True
+      network-manager: Neutron
+  nova-compute:
+    constraints: mem=7168M
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+      debug: True
+  octavia:
+    series: bionic
+    charm: ../../../octavia
+    num_units: 3
+    options:
+      debug: True
+      openstack-origin: cloud:bionic-stein
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1

src/tests/bundles/disco-stein.yaml

@@ -0,0 +1,106 @@
+series: disco
+relations:
+- - glance:image-service
+  - nova-cloud-controller:image-service
+- - glance:image-service
+  - nova-compute:image-service
+- - mysql:shared-db
+  - glance:shared-db
+- - mysql:shared-db
+  - keystone:shared-db
+- - mysql:shared-db
+  - neutron-api:shared-db
+- - mysql:shared-db
+  - nova-cloud-controller:shared-db
+- - mysql:shared-db
+  - octavia:shared-db
+- - keystone:identity-service
+  - glance:identity-service
+- - keystone:identity-service
+  - nova-cloud-controller:identity-service
+- - keystone:identity-service
+  - neutron-api:identity-service
+- - keystone:identity-service
+  - octavia:identity-service
+- - nova-compute:cloud-compute
+  - nova-cloud-controller:cloud-compute
+- - rabbitmq-server:amqp
+  - neutron-api:amqp
+- - rabbitmq-server:amqp
+  - glance:amqp
+- - rabbitmq-server:amqp
+  - neutron-gateway:amqp
+- - rabbitmq-server:amqp
+  - nova-cloud-controller:amqp
+- - rabbitmq-server:amqp
+  - nova-compute:amqp
+- - rabbitmq-server:amqp
+  - octavia:amqp
+- - neutron-api:neutron-api
+  - nova-cloud-controller:neutron-api
+- - neutron-api:neutron-load-balancer
+  - octavia:neutron-api
+- - neutron-gateway:quantum-network-service
+  - nova-cloud-controller:quantum-network-service
+- - rabbitmq-server:amqp
+  - neutron-openvswitch:amqp
+- - neutron-api:neutron-plugin-api
+  - neutron-openvswitch:neutron-plugin-api
+- - neutron-openvswitch:neutron-plugin
+  - nova-compute:neutron-plugin
+- - neutron-openvswitch:neutron-plugin
+  - octavia:neutron-openvswitch
+applications:
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+  mysql:
+    constraints: mem=3072M
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      debug: True
+      flat-network-providers: physnet1
+      neutron-security-groups: True
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      debug: True
+  neutron-openvswitch:
+    series: disco
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+    options:
+      debug: True
+      prevent-arp-spoofing: False
+      firewall-driver: openvswitch
+  nova-cloud-controller:
+    constraints: mem=3072M
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      debug: True
+      network-manager: Neutron
+  nova-compute:
+    constraints: mem=7168M
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      debug: True
+  octavia:
+    series: disco
+    charm: ../../../octavia
+    num_units: 3
+    options:
+      debug: True
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1

src/tests/tests.yaml

@@ -2,15 +2,18 @@ charm_name: octavia
 gate_bundles:
 - bionic-rocky
 - bionic-rocky-ha
+- bionic-stein
 - cosmic-rocky
 smoke_bundles:
 - bionic-rocky
 comment: |
+  Holding the ``disco-stein`` bundle pending LP: #1824112
   The `bionic-rocky-lxd` bundle currently fails due to a bug in LXD.
     https://github.com/lxc/lxd/issues/4947
-  Holding the `cosmic-rocky-lxd` bundle awaiting required changes to CI.
-  Holding the `cosmic-rocky-ha` bundle due to it consitently timing out atm.
+  Holding the ``cosmic-rocky-lxd`` bundle awaiting required changes to CI.
+  Holding the ``cosmic-rocky-ha`` bundle due to it consitently timing out atm.
 dev_bundles:
+- disco-stein
 - bionic-rocky-lxd
 - cosmic-rocky-ha
 - cosmic-rocky-lxd

unit_tests/test_octavia_handlers.py

@@ -33,7 +33,8 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks):
             'shared-db.connected',
             'identity-service.available',
             'config.changed',
-            'update-status']
+            'update-status',
+            'upgrade-charm']
         hook_set = {
             'when': {
                 'render': ('shared-db.available',