openstack/sunbeam-charms
Code Issues Proposed changes

Switch to xena and pin aso

Browse Source
This commit is contained in:
Liam Young 2022-02-25 10:47:49 +00:00
parent 67e439ae24
commit 752925ea82
3 changed files with 7 additions and 7 deletions
charms/ovn-central-k8s
requirements.txt
src
charm.py
unit_tests
test_ovn_central_charm.py

2
charms/ovn-central-k8s/requirements.txt

@ -1,7 +1,7 @@
ops
jinja2
git+https://opendev.org/openstack/charm-ops-openstack#egg=ops_openstack
git+https://github.com/openstack-charmers/advanced-sunbeam-openstack#egg=advanced_sunbeam_openstack
git+https://github.com/openstack-charmers/advanced-sunbeam-openstack@v0.1#egg=advanced_sunbeam_openstack
lightkube
# These are only needeed if the charm relates to ceph
git+https://github.com/openstack/charm-ops-interface-ceph-client#egg=interface_ceph_client

6
charms/ovn-central-k8s/src/charm.py

@ -363,11 +363,11 @@ class OVNCentralOperatorCharm(sunbeam_charm.OSBaseOperatorCharm):
})
class OVNCentralWallabyOperatorCharm(OVNCentralOperatorCharm):
class OVNCentralXenaOperatorCharm(OVNCentralOperatorCharm):
openstack_release = 'wallaby'
openstack_release = 'xena'
if __name__ == "__main__":
# Note: use_juju_for_storage=True required per
# https://github.com/canonical/operator/issues/506
main(OVNCentralWallabyOperatorCharm, use_juju_for_storage=True)
main(OVNCentralXenaOperatorCharm, use_juju_for_storage=True)

6
charms/ovn-central-k8s/unit_tests/test_ovn_central_charm.py

@ -24,7 +24,7 @@ import charm
import advanced_sunbeam_openstack.test_utils as test_utils
class _OVNCentralWallabyOperatorCharm(charm.OVNCentralWallabyOperatorCharm):
class _OVNCentralXenaOperatorCharm(charm.OVNCentralXenaOperatorCharm):
def __init__(self, framework):
self.seen_events = []
@ -51,7 +51,7 @@ class _OVNCentralWallabyOperatorCharm(charm.OVNCentralWallabyOperatorCharm):
return sb_mock
class TestOVNCentralWallabyOperatorCharm(test_utils.CharmTestCase):
class TestOVNCentralXenaOperatorCharm(test_utils.CharmTestCase):
PATCHES = [
'KubernetesServicePatch',
@ -60,7 +60,7 @@ class TestOVNCentralWallabyOperatorCharm(test_utils.CharmTestCase):
def setUp(self):
super().setUp(charm, self.PATCHES)
self.harness = test_utils.get_harness(
_OVNCentralWallabyOperatorCharm,
_OVNCentralXenaOperatorCharm,
container_calls=self.container_calls)
self.addCleanup(self.harness.cleanup)
self.harness.begin()