Skip to content
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

refactor: Add constant for default exporter port #154

Merged
merged 1 commit into from
Jan 30, 2024
Merged

refactor: Add constant for default exporter port #154

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
7 changes: 4 additions & 3 deletions src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class HardwareObserverCharm(ops.CharmBase):
"""Charm the application."""

_stored = StoredState()
DEFAULT_EXPORTER_PORT = "10200"

def __init__(self, *args: Any) -> None:
"""Init."""
Expand Down Expand Up @@ -81,7 +82,7 @@ def _on_install_or_upgrade(self, event: ops.InstallEvent) -> None:
self.model.unit.status = BlockedStatus(err_msg)
return

port = self.model.config.get("exporter-port", "10200")
port = self.model.config.get("exporter-port", self.DEFAULT_EXPORTER_PORT)
level = self.model.config.get("exporter-log-level", "INFO")
redfish_creds = self._get_redfish_creds()
success = self.exporter.install(port, level, redfish_creds)
Expand Down Expand Up @@ -201,7 +202,7 @@ def _on_config_changed(self, event: EventBase) -> None:
}
if exporter_configs.intersection(change_set):
logger.info("Detected changes in exporter config.")
port = self.model.config.get("exporter-port", "10200")
port = self.model.config.get("exporter-port", self.DEFAULT_EXPORTER_PORT)
level = self.model.config.get("exporter-log-level", "INFO")

redfish_creds = self._get_redfish_creds()
Expand Down Expand Up @@ -257,7 +258,7 @@ def _get_redfish_creds(self) -> Dict[str, str]:

def validate_exporter_configs(self) -> Tuple[bool, str]:
"""Validate the static and runtime config options for the exporter."""
port = int(self.model.config.get("exporter-port", "10200"))
port = int(self.model.config.get("exporter-port", self.DEFAULT_EXPORTER_PORT))
if not 1 <= port <= 65535:
logger.error("Invalid exporter-port: port must be in [1, 65535].")
return False, "Invalid config: 'exporter-port'"
Expand Down
4 changes: 3 additions & 1 deletion tests/unit/test_charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ def test_05_install_redfish_unavailable(self, mock_hw_tool_helper, mock_exporter

self.assertTrue(self.harness.charm._stored.resource_installed)

self.harness.charm.exporter.install.assert_called_with(10200, "INFO", {})
self.harness.charm.exporter.install.assert_called_with(
int(self.harness.charm.DEFAULT_EXPORTER_PORT), "INFO", {}
)

@mock.patch("charm.Exporter", return_value=mock.MagicMock())
@mock.patch("charm.HWToolHelper", return_value=mock.MagicMock())
Expand Down
Loading