Skip to content

fix: handle charm status only from CollectStatus event callback #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2024
Merged

fix: handle charm status only from CollectStatus event callback #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ def __init__(self, *args):
self.unit.set_ports(PROMETHEUS_PORT)
try:
self._charm_config: CharmConfig = CharmConfig.from_charm(charm=self)
except CharmConfigInvalidError as exc:
self.model.unit.status = BlockedStatus(exc.msg)
except CharmConfigInvalidError:
return
self._kubernetes_multus = KubernetesMultusCharmLib(
charm=self,
Expand Down
9 changes: 9 additions & 0 deletions tests/unit/test_charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def test_given_bad_config_when_config_changed_then_status_is_blocked(self, patch
]
self.harness.update_config(key_values={"dnn": ""})
self.harness.begin()
self.harness.evaluate_status()

self.assertEqual(
self.harness.model.unit.status,
Expand All @@ -118,6 +119,7 @@ def test_given_empty_upf_mode_when_config_changed_then_status_is_blocked(self, p
]
self.harness.update_config(key_values={"upf-mode": ""})
self.harness.begin()
self.harness.evaluate_status()

self.assertEqual(
self.harness.model.unit.status,
Expand All @@ -139,6 +141,7 @@ def test_given_unsupported_upf_mode_when_config_changed_then_status_is_blocked(
]
self.harness.update_config(key_values={"upf-mode": "unsupported"})
self.harness.begin()
self.harness.evaluate_status()

self.assertEqual(
self.harness.model.unit.status,
Expand All @@ -162,6 +165,7 @@ def test_given_upf_mode_set_to_dpdk_but_other_required_configs_not_set_when_conf
]
self.harness.update_config(key_values={"cni-type": "vfioveth", "upf-mode": "dpdk"})
self.harness.begin()
self.harness.evaluate_status()

self.assertEqual(
self.harness.model.unit.status,
Expand All @@ -187,6 +191,7 @@ def test_given_upf_mode_set_to_dpdk_and_hugepages_enabled_but_mac_addresses_of_a
]
self.harness.update_config(key_values={"cni-type": "vfioveth", "upf-mode": "dpdk"})
self.harness.begin()
self.harness.evaluate_status()

self.assertEqual(
self.harness.model.unit.status,
Expand Down Expand Up @@ -219,6 +224,7 @@ def test_given_upf_mode_set_to_dpdk_and_hugepages_enabled_but_access_interface_m
}
)
self.harness.begin()
self.harness.evaluate_status()

self.assertEqual(
self.harness.model.unit.status,
Expand Down Expand Up @@ -251,6 +257,7 @@ def test_given_upf_mode_set_to_dpdk_and_hugepages_enabled_but_core_interface_mac
}
)
self.harness.begin()
self.harness.evaluate_status()

self.assertEqual(
self.harness.model.unit.status,
Expand Down Expand Up @@ -298,6 +305,8 @@ def test_given_default_config_with_interfaces_zero_mtu_sizes_when_network_attach
}
)
self.harness.begin()
self.harness.evaluate_status()

self.assertEqual(
self.harness.model.unit.status,
BlockedStatus(
Expand Down
Loading