x/charm-ovn-relay-k8s
Code Issues Proposed changes

Merge pull request #5 from openstack-charmers/switch-to-xena

Browse Source 
Switch to xena and pin aso
This commit is contained in:
Liam Young 2022-02-25 10:56:08 +00:00 committed by GitHub
commit 701a0a9c17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -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
src/charm.py
View File

@ -65,11 +65,11 @@ class OVNRelayOperatorCharm(ovn_charm.OSBaseOVNOperatorCharm):
return contexts
class OVNRelayWallabyOperatorCharm(OVNRelayOperatorCharm):
class OVNRelayXenaOperatorCharm(OVNRelayOperatorCharm):
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(OVNRelayWallabyOperatorCharm, use_juju_for_storage=True)
main(OVNRelayXenaOperatorCharm, use_juju_for_storage=True)

6
unit_tests/test_ovn_relay_charm.py
View File

@ -23,7 +23,7 @@ import charm
import advanced_sunbeam_openstack.test_utils as test_utils
class _OVNRelayWallabyOperatorCharm(charm.OVNRelayWallabyOperatorCharm):
class _OVNRelayXenaOperatorCharm(charm.OVNRelayXenaOperatorCharm):
def __init__(self, framework):
self.seen_events = []
@ -37,14 +37,14 @@ class _OVNRelayWallabyOperatorCharm(charm.OVNRelayWallabyOperatorCharm):
self._log_event(event)
class TestOVNRelayWallabyOperatorCharm(test_utils.CharmTestCase):
class TestOVNRelayXenaOperatorCharm(test_utils.CharmTestCase):
PATCHES = []
def setUp(self):
super().setUp(charm, self.PATCHES)
self.harness = test_utils.get_harness(
_OVNRelayWallabyOperatorCharm,
_OVNRelayXenaOperatorCharm,
container_calls=self.container_calls)
self.addCleanup(self.harness.cleanup)
self.harness.begin()