#2871 Params search works with nested hostgroups #834
Closed
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
|
Daniel, thanks for the contribution. Taking for testing. |
|
This is good, thanks. Could you please add a test? I'd suggest adding a new hostgroup fixture which uses ancestry, then adding to test/unit/host_test.rb, see the existing search_for test. |
| @@ -114,7 +114,7 @@ def param_conditions(p) | |||
| when 'OsParameter' | |||
| conditions << "hosts.operatingsystem_id = #{param.reference_id}" | |||
| when 'GroupParameter' | |||
| conditions << "hosts.hostgroup_id = #{param.reference_id}" | |||
| conditions << "hosts.hostgroup_id IN (#{(param.hostgroup.children.map(&:id) << param.reference_id).join(', ')})" | |||
There was a problem hiding this comment.
can we use child_ids or descendant_ids instead?
e.g.
conditions << "hosts.hostgroup_id IN (#{(param.hostgroup.descendant_ids << param.reference_id).join(', ')})"
|
Added tests and used subtree_ids instead of iterating over the children to get their ids, |
| @@ -114,7 +114,7 @@ def param_conditions(p) | |||
| when 'OsParameter' | |||
| conditions << "hosts.operatingsystem_id = #{param.reference_id}" | |||
| when 'GroupParameter' | |||
| conditions << "hosts.hostgroup_id = #{param.reference_id}" | |||
| conditions << "hosts.hostgroup_id IN (#{(param.hostgroup.subtree_ids << param.reference_id).join(', ')})" | |||
There was a problem hiding this comment.
subtree_ids already includes param.reference_id, you can write:
conditions << "hosts.hostgroup_id IN (#{param.hostgroup.subtree_ids.join(', ')})"
Tests for search in params inherited from hostgroups Use subtree ids to avoid adding parent id on inherited params search
|
@abenari Thanks, I just updated the PR with your suggestion |
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 tiny tiny PR allows you to search (UI or API) on parameters that are inherited from hostgroups.
For instance, imagine a host 'foo.cern.ch', and a hostgroup 'bar/baz'. If hostgroup 'bar' defines a parameter 'firewall = on', 'foo.cern.ch' will inherit it. Nonetheless, if you use the search bar, and search for 'params.firewall = true', it will not show 'foo.cern.ch' unless you move it to '/bar/' instead of '/bar/baz'