Skip to content

Fix compound matches with nodegroups #56592

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

Merged
dwoz merged 2 commits into from
Apr 18, 2020
Merged

Fix compound matches with nodegroups #56592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59581e8
Fix for compound nodegroup matching
Apr 8, 2020
94e0078
Fix "coumpound" test names
Apr 8, 2020
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
36 changes: 30 additions & 6 deletions salt/client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,19 +1673,43 @@ def get_event_iter_returns(self, jid, minions, timeout=None):
yield ret
time.sleep(0.02)

def _resolve_nodegroup(self, ng):
"""
Resolve a nodegroup into its configured components
"""
if ng not in self.opts["nodegroups"]:
conf_file = self.opts.get("conf_file", "the master config file")
raise SaltInvocationError(
"Node group {0} unavailable in {1}".format(ng, conf_file)
)
return salt.utils.minions.nodegroup_comp(ng, self.opts["nodegroups"])

def _prep_pub(self, tgt, fun, arg, tgt_type, ret, jid, timeout, **kwargs):
"""
Set up the payload_kwargs to be sent down to the master
"""
if tgt_type == "nodegroup":
if tgt not in self.opts["nodegroups"]:
conf_file = self.opts.get("conf_file", "the master config file")
raise SaltInvocationError(
"Node group {0} unavailable in {1}".format(tgt, conf_file)
)
tgt = salt.utils.minions.nodegroup_comp(tgt, self.opts["nodegroups"])
tgt = self._resolve_nodegroup(tgt)
tgt_type = "compound"

if tgt_type == "compound":
# Resolve all nodegroups, so that the minions don't have to.
new_tgt = list()
log.debug("compound resolution: original tgt: %s", tgt)

if isinstance(tgt, six.string_types):
tgt = tgt.split()

for word in tgt:
if word.startswith("N@") and len(word) > 2:
resolved = self._resolve_nodegroup(word[2:])
new_tgt.extend(resolved)
else:
new_tgt.append(word)

log.debug("compound resolution: new_tgt: %s", new_tgt)
tgt = " ".join(new_tgt)

# Convert a range expression to a list of nodes and change expression
# form to list
if tgt_type == "range" and HAS_RANGE:
Expand Down
34 changes: 16 additions & 18 deletions tests/integration/shell/test_matcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def test_list(self):
self.assertIn("minion", data)
self.assertIn("sub_minion", data)

# compound matcher tests: 11
# compound matcher tests: 12

def test_compound_min_with_grain(self):
"""
Expand Down Expand Up @@ -88,7 +88,7 @@ def test_compound_grain_regex(self):
assert minion_in_returns("minion", data) is True
assert minion_in_returns("sub_minion", data) is False

def test_coumpound_pcre_grain_regex(self):
def test_compound_pcre_grain_regex(self):
data = self.run_salt('-C "P%@planets%^(mercury|saturn)$" test.ping')
assert minion_in_returns("minion", data) is True
assert minion_in_returns("sub_minion", data) is True
Expand All @@ -102,25 +102,23 @@ def test_compound_pillar(self):

@skipIf(True, "This test is unreliable. Need to investigate why more deeply.")
@flaky
def test_coumpound_pillar_pcre(self):
def test_compound_pillar_pcre(self):
data = self.run_salt("-C 'J%@knights%^(Lancelot|Galahad)$' test.ping")
self.assertTrue(minion_in_returns("minion", data))
self.assertTrue(minion_in_returns("sub_minion", data))
# The multiline nodegroup tests are failing in develop.
Comment thread
dwoz marked this conversation as resolved.
Outdated
# This needs to be fixed for Fluorine. @skipIf wasn't used, because
# the rest of the assertions above pass just fine, so we don't want
# to bypass the whole test.
# time.sleep(2)
# data = self.run_salt("-C 'N@multiline_nodegroup' test.ping")
# self.assertTrue(minion_in_returns('minion', data))
# self.assertTrue(minion_in_returns('sub_minion', data))
# time.sleep(2)
# data = self.run_salt("-C 'N@multiline_nodegroup not sub_minion' test.ping")
# self.assertTrue(minion_in_returns('minion', data))
# self.assertFalse(minion_in_returns('sub_minion', data))
# data = self.run_salt("-C 'N@multiline_nodegroup not @fakenodegroup not sub_minion' test.ping")
# self.assertTrue(minion_in_returns('minion', data))
# self.assertFalse(minion_in_returns('sub_minion', data))

def test_compound_nodegroup(self):
data = self.run_salt('-C "N@multiline_nodegroup" test.ping')
self.assertTrue(minion_in_returns("minion", data))
self.assertTrue(minion_in_returns("sub_minion", data))
data = self.run_salt('-C "N@multiline_nodegroup not sub_minion" test.ping')
self.assertTrue(minion_in_returns("minion", data))
self.assertFalse(minion_in_returns("sub_minion", data))
data = self.run_salt(
'-C "N@multiline_nodegroup not @fakenodegroup not sub_minion" test.ping'
)
self.assertTrue(minion_in_returns("minion", data))
self.assertFalse(minion_in_returns("sub_minion", data))

def test_nodegroup(self):
"""
Expand Down