mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-03 17:23:09 +00:00
Actually fix eos_facts feature detection (#43155)
This commit is contained in:
@@ -239,7 +239,7 @@ class Eapi:
|
||||
|
||||
return response
|
||||
|
||||
def run_commands(self, commands):
|
||||
def run_commands(self, commands, check_rc=True):
|
||||
"""Runs list of commands on remote device and returns results
|
||||
"""
|
||||
output = None
|
||||
|
||||
@@ -153,7 +153,7 @@ class FactsBase(object):
|
||||
self.responses = None
|
||||
|
||||
def populate(self):
|
||||
self.responses = run_commands(self.module, list(self.COMMANDS))
|
||||
self.responses = run_commands(self.module, list(self.COMMANDS), check_rc=False)
|
||||
|
||||
|
||||
class Default(FactsBase):
|
||||
|
||||
@@ -213,12 +213,13 @@ class Cliconf(CliconfBase):
|
||||
if check_rc:
|
||||
raise
|
||||
out = getattr(e, 'err', e)
|
||||
out = to_text(out, errors='surrogate_or_strict')
|
||||
|
||||
if out is not None:
|
||||
try:
|
||||
out = json.loads(out)
|
||||
except ValueError:
|
||||
out = to_text(out, errors='surrogate_or_strict').strip()
|
||||
out = out.strip()
|
||||
|
||||
responses.append(out)
|
||||
return responses
|
||||
|
||||
Reference in New Issue
Block a user