ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 22:00:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Actually fix eos_facts feature detection (#43155)

Browse source
This commit is contained in:
Nathaniel Case 2018-07-23 14:51:44 -04:00 • committed by GitHub
commit 8a0967554f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/network/eos/eos.py
View file

@ -239,7 +239,7 @@ class Eapi:
return response 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 """Runs list of commands on remote device and returns results
""" """
output = None output = None

2
lib/ansible/modules/network/eos/eos_facts.py
View file

@ -153,7 +153,7 @@ class FactsBase(object):
self.responses = None self.responses = None
def populate(self): 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): class Default(FactsBase):

3
lib/ansible/plugins/cliconf/eos.py
View file

@ -213,12 +213,13 @@ class Cliconf(CliconfBase):
if check_rc: if check_rc:
raise raise
out = getattr(e, 'err', e) out = getattr(e, 'err', e)
out = to_text(out, errors='surrogate_or_strict')
if out is not None: if out is not None:
try: try:
out = json.loads(out) out = json.loads(out)
except ValueError: except ValueError:
out = to_text(out, errors='surrogate_or_strict').strip() out = out.strip()
responses.append(out) responses.append(out)
return responses return responses