openstack/sunbeam-charms
Code Issues Proposed changes

Fix unit tests

Browse Source
This commit is contained in:
Liam Young 2022-04-28 15:00:05 +01:00
parent 9cf0318351
commit 26ed090dac
2 changed files with 31 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ jinja2
git+https://github.com/openstack/charm-ops-openstack#egg=ops_openstack
git+https://github.com/openstack/charm-ops-interface-tls-certificates#egg=interface_tls_certificates
git+https://github.com/openstack-charmers/advanced-sunbeam-openstack@v0.1#egg=advanced_sunbeam_openstack
git+https://github.com/openstack-charmers/advanced-sunbeam-openstack#egg=advanced_sunbeam_openstack
lightkube
lightkube-models
cryptography < 3.4

81
charms/ovn-central-k8s/unit_tests/test_ovn_central_charm.py
View File

@ -70,35 +70,40 @@ class TestOVNCentralXenaOperatorCharm(test_utils.CharmTestCase):
test_utils.set_all_pebbles_ready(self.harness)
self.assertEqual(len(self.harness.charm.seen_events), 3)
def check_rendered_files(self):
sb_config_files = [
'/etc/ovn/cert_host',
'/etc/ovn/key_host',
'/etc/ovn/ovn-central.crt',
'/root/ovn-sb-cluster-join.sh',
'/root/ovn-sb-db-server-wrapper.sh']
for f in sb_config_files:
self.check_file('ovn-sb-db-server', f)
nb_config_files = [
'/etc/ovn/cert_host',
'/etc/ovn/key_host',
'/etc/ovn/ovn-central.crt',
'/root/ovn-nb-cluster-join.sh',
'/root/ovn-nb-db-server-wrapper.sh']
for f in nb_config_files:
self.check_file('ovn-nb-db-server', f)
northd_config_files = [
'/etc/ovn/cert_host',
'/etc/ovn/key_host',
'/etc/ovn/ovn-central.crt',
'/etc/ovn/ovn-northd-db-params.conf',
'/root/ovn-northd-wrapper.sh']
for f in northd_config_files:
self.check_file('ovn-northd', f)
def test_all_relations_leader(self):
self.harness.set_leader()
self.assertEqual(self.harness.charm.seen_events, [])
test_utils.set_all_pebbles_ready(self.harness)
test_utils.add_all_relations(self.harness)
self.assertEqual(
sorted(self.container_calls.updated_files('ovn-sb-db-server')),
[
'/etc/ovn/cert_host',
'/etc/ovn/key_host',
'/etc/ovn/ovn-central.crt',
'/root/ovn-sb-cluster-join.sh',
'/root/ovn-sb-db-server-wrapper.sh'])
self.assertEqual(
sorted(self.container_calls.updated_files('ovn-nb-db-server')),
[
'/etc/ovn/cert_host',
'/etc/ovn/key_host',
'/etc/ovn/ovn-central.crt',
'/root/ovn-nb-cluster-join.sh',
'/root/ovn-nb-db-server-wrapper.sh'])
self.assertEqual(
sorted(self.container_calls.updated_files('ovn-northd')),
[
'/etc/ovn/cert_host',
'/etc/ovn/key_host',
'/etc/ovn/ovn-central.crt',
'/etc/ovn/ovn-northd-db-params.conf',
'/root/ovn-northd-wrapper.sh'])
self.check_rendered_files()
def test_all_relations_non_leader(self):
self.harness.set_leader(False)
@ -115,33 +120,7 @@ class TestOVNCentralXenaOperatorCharm(test_utils.CharmTestCase):
'nb_cid': 'nbcid',
'sb_cid': 'sbcid'}
)
self.assertEqual(
sorted(list(set(
self.container_calls.updated_files('ovn-sb-db-server')))),
[
'/etc/ovn/cert_host',
'/etc/ovn/key_host',
'/etc/ovn/ovn-central.crt',
'/root/ovn-sb-cluster-join.sh',
'/root/ovn-sb-db-server-wrapper.sh'])
self.assertEqual(
sorted(list(set(
self.container_calls.updated_files('ovn-nb-db-server')))),
[
'/etc/ovn/cert_host',
'/etc/ovn/key_host',
'/etc/ovn/ovn-central.crt',
'/root/ovn-nb-cluster-join.sh',
'/root/ovn-nb-db-server-wrapper.sh'])
self.assertEqual(
sorted(list(set(
self.container_calls.updated_files('ovn-northd')))),
[
'/etc/ovn/cert_host',
'/etc/ovn/key_host',
'/etc/ovn/ovn-central.crt',
'/etc/ovn/ovn-northd-db-params.conf',
'/root/ovn-northd-wrapper.sh'])
self.check_rendered_files()
self.assertEqual(
self.container_calls.execute['ovn-sb-db-server'],
[