From 7700cdd3bf4c47c97b8587428c352390271692b2 Mon Sep 17 00:00:00 2001 From: akhiljain23 Date: Fri, 19 Oct 2018 16:12:21 +0530 Subject: [PATCH] Add framework for masakari-status upgrade check This commit adds the functionality of masakari-status CLI for performing upgrade checks as part of the Stein cycle upgrade-checkers goal. It only includes a sample check which must be replaced by real checks in future. Change-Id: I17c79af15eca5f6da7e32dbedbdc392c97114d42 Story: 2003657 Task: 26140 --- doc/source/cli/index.rst | 11 +++ doc/source/cli/masakari-status.rst | 83 +++++++++++++++++++ doc/source/index.rst | 1 + lower-constraints.txt | 1 + masakari/cmd/status.py | 53 ++++++++++++ masakari/tests/unit/cmd/test_status.py | 30 +++++++ ...rade-check-framework-52268130b25317ab.yaml | 13 +++ requirements.txt | 1 + setup.cfg | 1 + 9 files changed, 194 insertions(+) create mode 100644 doc/source/cli/index.rst create mode 100644 doc/source/cli/masakari-status.rst create mode 100644 masakari/cmd/status.py create mode 100644 masakari/tests/unit/cmd/test_status.py create mode 100644 releasenotes/notes/add-upgrade-check-framework-52268130b25317ab.yaml diff --git a/doc/source/cli/index.rst b/doc/source/cli/index.rst new file mode 100644 index 00000000..9326698c --- /dev/null +++ b/doc/source/cli/index.rst @@ -0,0 +1,11 @@ +========================== +Masakari CLI Documentation +========================== + +In this section you will find information on Masakari’s command line +interface. + +.. toctree:: + :maxdepth: 1 + + masakari-status diff --git a/doc/source/cli/masakari-status.rst b/doc/source/cli/masakari-status.rst new file mode 100644 index 00000000..e865e450 --- /dev/null +++ b/doc/source/cli/masakari-status.rst @@ -0,0 +1,83 @@ +=============== +masakari-status +=============== + +------------------------------------------ +CLI interface for Masakari status commands +------------------------------------------ + +Synopsis +======== + +:: + + masakari-status [] + +Description +=========== + +:program:`masakari-status` is a tool that provides routines for checking the +status of a Masakari deployment. + +Options +======= + +The standard pattern for executing a :program:`masakari-status` command is:: + + masakari-status [] + +Run without arguments to see a list of available command categories:: + + masakari-status + +Categories are: + +* ``upgrade`` + +Detailed descriptions are below: + +You can also run with a category argument such as ``upgrade`` to see a list of +all commands in that category:: + + masakari-status upgrade + +These sections describe the available categories and arguments for +:program:`masakari-status`. + +Upgrade +~~~~~~~ + +.. _masakari-status-checks: + +``masakari-status upgrade check`` + Performs a release-specific readiness check before restarting services with + new code. For example, missing or changed configuration options, + incompatible object states, or other conditions that could lead to + failures while upgrading. + + **Return Codes** + + .. list-table:: + :widths: 20 80 + :header-rows: 1 + + * - Return code + - Description + * - 0 + - All upgrade readiness checks passed successfully and there is nothing + to do. + * - 1 + - At least one check encountered an issue and requires further + investigation. This is considered a warning but the upgrade may be OK. + * - 2 + - There was an upgrade status check failure that needs to be + investigated. This should be considered something that stops an + upgrade. + * - 255 + - An unexpected error occurred. + + **History of Checks** + + **7.0.0 (Stein)** + + * Sample check to be filled in with checks as they are added in Stein. diff --git a/doc/source/index.rst b/doc/source/index.rst index 1eb70cf0..ce5f2dc1 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -66,6 +66,7 @@ This section will help you in configuring masakari mannualy. :maxdepth: 1 operators_guide + cli/index sample_config sample_policy recovery_workflow_sample_config diff --git a/lower-constraints.txt b/lower-constraints.txt index 9d793751..1a34dda6 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -62,6 +62,7 @@ oslo.middleware==3.31.0 oslo.policy==1.30.0 oslo.serialization==2.25.0 oslo.service==1.24.0 +oslo.upgradecheck==0.1.0 oslo.utils==3.33.0 oslo.versionedobjects==1.31.2 oslosphinx==4.7.0 diff --git a/masakari/cmd/status.py b/masakari/cmd/status.py new file mode 100644 index 00000000..e135fba7 --- /dev/null +++ b/masakari/cmd/status.py @@ -0,0 +1,53 @@ +# Copyright (c) 2018 NEC, Corp. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import sys + +from oslo_upgradecheck import upgradecheck + +from masakari import conf +from masakari.i18n import _ + +CONF = conf.CONF + + +class Checks(upgradecheck.UpgradeCommands): + + """Contains upgrade checks + + Various upgrade checks should be added as separate methods in this class + and added to _upgrade_checks tuple. + """ + + def _sample_check(self): + """This is sample check added to test the upgrade check framework + + It needs to be removed after adding any real upgrade check + """ + return upgradecheck.Result(upgradecheck.Code.SUCCESS, 'Sample detail') + + _upgrade_checks = ( + # Sample check added for now. + # Whereas in future real checks must be added here in tuple + (_('Sample Check'), _sample_check), + ) + + +def main(): + return upgradecheck.main( + CONF, project='masakari', upgrade_command=Checks()) + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/masakari/tests/unit/cmd/test_status.py b/masakari/tests/unit/cmd/test_status.py new file mode 100644 index 00000000..96bf00e9 --- /dev/null +++ b/masakari/tests/unit/cmd/test_status.py @@ -0,0 +1,30 @@ +# Copyright (c) 2018 NEC, Corp. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from oslo_upgradecheck.upgradecheck import Code + +from masakari.cmd import status +from masakari import test + + +class TestUpgradeChecks(test.TestCase): + + def setUp(self): + super(TestUpgradeChecks, self).setUp() + self.cmd = status.Checks() + + def test__sample_check(self): + check_result = self.cmd._sample_check() + self.assertEqual( + Code.SUCCESS, check_result.code) diff --git a/releasenotes/notes/add-upgrade-check-framework-52268130b25317ab.yaml b/releasenotes/notes/add-upgrade-check-framework-52268130b25317ab.yaml new file mode 100644 index 00000000..466ad5b8 --- /dev/null +++ b/releasenotes/notes/add-upgrade-check-framework-52268130b25317ab.yaml @@ -0,0 +1,13 @@ +--- +prelude: > + Added new tool ``masakari-status upgrade check``. +features: + - | + New framework for ``masakari-status upgrade check`` command is added. + This framework allows adding various checks which can be run before a + Masakari upgrade to ensure if the upgrade can be performed safely. +upgrade: + - | + Operator can now use new CLI tool ``masakari-status upgrade check`` + to check if Masakari deployment can be safely upgraded from + N-1 to N release. diff --git a/requirements.txt b/requirements.txt index ee07e03a..ea431947 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,7 @@ oslo.log>=3.36.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 oslo.policy>=1.30.0 # Apache-2.0 oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 +oslo.upgradecheck>=0.1.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 oslo.versionedobjects>=1.31.2 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 9739c36f..863f2698 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,6 +48,7 @@ console_scripts = masakari-api = masakari.cmd.api:main masakari-engine = masakari.cmd.engine:main masakari-manage = masakari.cmd.manage:main + masakari-status = masakari.cmd.status:main wsgi_scripts = masakari-wsgi = masakari.cmd.api:initialize_application