Add nrpe check tests for manila-ganesha charm #806
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Check if the custom plugins are being installed - Check if the custom cronjobs are being installed - Check if the NRPE services are being added. - The tests will not be ran if nrpe does not exists.
ajkavanagh
requested changes
Jun 30, 2022
Comment on lines
67
to
68
| logging.warn("Skipping as nrpe is not deployed.") | ||
| return |
There was a problem hiding this comment.
Please use self.skipTest(...) to skip a test.
| try: | ||
| zaza.model.get_application("nrpe") | ||
| except KeyError: | ||
| logging.warn("Skipping as nrpe is not deployed.") |
There was a problem hiding this comment.
Please use self.skipTest(...) to skip a test.
| zaza.model.get_application("nrpe") | ||
| except KeyError: | ||
| logging.warn("Skipping as nrpe is not deployed.") | ||
| return |
There was a problem hiding this comment.
Please use self.skipTest(...) to skip a test.
Comment on lines
73
to
75
| cmds = [] | ||
| for check_name in plugins: | ||
| cmds.append(f'ls /usr/local/lib/nagios/plugins/{check_name}') |
There was a problem hiding this comment.
It's nicer (and more efficient) to use a list comprehension here:
cmds = [f'ls ... {check_name}' for check_name in plugins]
Comment on lines
97
to
99
| cmds = [] | ||
| for check_name in plugins: | ||
| cmds.append(f'ls /etc/cron.d/nagios-check_{check_name}') |
There was a problem hiding this comment.
As above, please think of a list comprehension here.
Comment on lines
121
to
126
| cmds = [] | ||
| for check_name in services: | ||
| cmds.append( | ||
| 'egrep -oh /usr/local.* /etc/nagios/nrpe.d/' | ||
| 'check_{}.cfg'.format(check_name) | ||
| ) |
Comment on lines
77
to
84
| for attempt in tenacity.Retrying( | ||
| wait=tenacity.wait_fixed(20), | ||
| stop=tenacity.stop_after_attempt(2), | ||
| reraise=True | ||
| ): | ||
| with attempt: | ||
| ret = generic_utils.check_commands_on_units(cmds, units) | ||
| self.assertIsNone(ret, msg=ret) |
There was a problem hiding this comment.
This pattern is repeated 3 times; please consider a refactor to pull this into a helper function.
|
Thanks for the comments. I have refactored the code and updated the description of the PR, please have a look again. |
chanchiwai-ray
changed the title
ajkavanagh
approved these changes
Jul 5, 2022
ajkavanagh
reviewed
Jul 5, 2022
| ] | ||
|
|
||
| commands = [ | ||
| f"ls /usr/local/lib/nagios/plugins/{plugin}" |
There was a problem hiding this comment.
From the py35 test run:
zaza/openstack/charm_tests/manila_ganesha/tests.py:88:56: E999 SyntaxError: invalid syntax
Py3.5.sadly doesn't support f-strings. You'll need to use .format(...) here instead.
There was a problem hiding this comment.
Done, thanks for the hints!
ajkavanagh
requested changes
Jul 5, 2022
ajkavanagh
approved these changes
Jul 5, 2022
openstack-mirroring
pushed a commit
to openstack/charm-manila-ganesha
that referenced
this pull request
Jul 5, 2022
- added 3 basic checks to check: nfs connection, nfs services, and nfs shares - updated test bundles to include nrpe and nrpe-external-master for functional tests. func-test-pr: openstack-charmers/zaza-openstack-tests#806 Closes-bug: #1925975 Change-Id: I4d3736300f75b9811f4f6525b5454c7e495ef566
openstack-mirroring
pushed a commit
to openstack/openstack
that referenced
this pull request
Jul 5, 2022
* Update charm-manila-ganesha from branch 'master'
to 65ca408318ac637ef4787e61d5ec48f4d4477502
- Added NRPE checks for manila-ganesha charm.
- added 3 basic checks to check: nfs connection, nfs services, and nfs shares
- updated test bundles to include nrpe and nrpe-external-master for
functional tests.
func-test-pr: openstack-charmers/zaza-openstack-tests#806
Closes-bug: #1925975
Change-Id: I4d3736300f75b9811f4f6525b5454c7e495ef566
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds nrpe check tests for manila-ganesha charm. It's accompanied by the new features proposed in https://review.opendev.org/c/openstack/charm-manila-ganesha/+/848219