diff --git a/.gitignore b/.gitignore index a26d707..9ceb2e5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ __pycache__/ *.py[cod] .idea .vscode/ +version diff --git a/src/charm.py b/src/charm.py index 20e89da..c9eac4d 100755 --- a/src/charm.py +++ b/src/charm.py @@ -1,5 +1,9 @@ #!/usr/bin/env python3 +# Copyright 2020 Omnivector Solutions, LLC. +# See LICENSE file for licensing details. + """SlurmrestdCharm.""" + import logging from pathlib import Path @@ -8,11 +12,7 @@ from ops.charm import CharmBase from ops.framework import StoredState from ops.main import main -from ops.model import ( - ActiveStatus, - BlockedStatus, - WaitingStatus, -) +from ops.model import ActiveStatus, BlockedStatus, WaitingStatus from slurm_ops_manager import SlurmManager logger = logging.getLogger() @@ -134,10 +134,6 @@ def _on_configure_jwt_rsa(self, event): self._slurm_manager.configure_jwt_rsa(jwt_rsa) def _check_status(self) -> bool: - if self._slurm_manager.needs_reboot: - self.unit.status = BlockedStatus("Machine needs reboot") - return False - if not self._stored.slurm_installed: self.unit.status = BlockedStatus("Error installing slurmrestd") return False diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py index 977c1b6..9b007de 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -39,10 +39,6 @@ def test_config_available_fail(self, defer): "interface_slurmrestd.SlurmrestdRequires.get_stored_slurm_config", return_value={"cluster_name": "test"}, ) - @patch( - "slurm_ops_manager.SlurmManager.needs_reboot", - new_callable=PropertyMock(return_value=False), - ) @patch( "interface_slurmrestd.SlurmrestdRequires.is_joined", new_callable=PropertyMock(return_value=True), @@ -69,10 +65,6 @@ def test_install_fail(self, defer, *_): self.assertFalse(self.harness.charm._stored.slurm_installed) defer.assert_called() - @patch( - "slurm_ops_manager.SlurmManager.needs_reboot", - new_callable=PropertyMock(return_value=False), - ) @patch( "interface_slurmrestd.SlurmrestdRequires.is_joined", new_callable=PropertyMock(return_value=True), @@ -125,10 +117,6 @@ def test_restart_slurmrestd_fail(self, defer): defer.assert_called() @patch("slurm_ops_manager.SlurmManager.restart_slurm_component", lambda _: True) - @patch( - "slurm_ops_manager.SlurmManager.needs_reboot", - new_callable=PropertyMock(return_value=False), - ) @patch( "interface_slurmrestd.SlurmrestdRequires.is_joined", new_callable=PropertyMock(return_value=True), @@ -154,10 +142,6 @@ def test_update_status_fail(self): self.harness.charm.unit.status, BlockedStatus("Error installing slurmrestd") ) - @patch( - "slurm_ops_manager.SlurmManager.needs_reboot", - new_callable=PropertyMock(return_value=False), - ) @patch( "interface_slurmrestd.SlurmrestdRequires.is_joined", new_callable=PropertyMock(return_value=True), @@ -179,10 +163,6 @@ def test_upgrade_fail(self, *_): ) @patch("pathlib.Path.read_text", return_value="v1.0.0") - @patch( - "slurm_ops_manager.SlurmManager.needs_reboot", - new_callable=PropertyMock(return_value=False), - ) @patch( "interface_slurmrestd.SlurmrestdRequires.is_joined", new_callable=PropertyMock(return_value=True),