valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from rajvidhimar/fix_facts_refresh

Browse Source 
Bug fixes in facts_refresh and rpc
This commit is contained in:
Nitin Kumar 2017-01-31 16:18:52 +05:30 committed by GitHub
commit ebe9a6c196
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/modules/junos.py
View File

@ -73,14 +73,16 @@ def facts_refresh():
ret = dict()
ret['out'] = True
try:
__salt__['saltutil.sync_grains']()
except Exception as exception:
log.error('Grains could not be updated due to "{0}"'.format(exception))
try:
ret['message'] = conn.facts_refresh()
conn.facts_refresh()
# Earlier it was ret['message']
ret['facts'] = json.dumps(conn.facts)
except Exception as exception:
ret['message'] = 'Execution failed due to "{0}"'.format(exception)
ret['out'] = False
try:
__salt__['saltutil.sync_grains']()
except Exception as exception:
log.error('Grains could not be updated due to "{0}"'.format(exception))
return ret
@ -101,7 +103,7 @@ def facts():
ret = dict()
try:
facts = conn.facts
ret['message'] = json.dumps(facts)
ret['facts'] = json.dumps(facts)
ret['out'] = True
except Exception as exception:
ret['message'] = 'Could not display facts due to "{0}"'.format(
@ -183,7 +185,7 @@ def rpc(cmd=None, dest=None, format='xml', **kwargs):
cmd.replace('-',
'_'))(filter_reply,
options=op)
ret['message'] = jxmlease.parse(etree.tostring(xml_reply))
ret['rpc_reply'] = jxmlease.parse(etree.tostring(xml_reply))
write_response = etree.tostring(xml_reply)
if dest is not None and format != 'xml':
@ -202,7 +204,7 @@ def rpc(cmd=None, dest=None, format='xml', **kwargs):
log.warning(
'Filter ignored as it is only used with "get-config" rpc')
xml_reply = getattr(conn.rpc, cmd.replace('-', '_'))(**op)
ret['message'] = jxmlease.parse(etree.tostring(xml_reply))
ret['rpc_reply'] = jxmlease.parse(etree.tostring(xml_reply))
write_response = etree.tostring(xml_reply)
if dest is not None and format != 'xml':