Fix VyOS check mode (#35977)

* Revert "commented out check tests (#35788)"

This reverts commit 3df2561405.

* `discard_changes()` now uses `exit discard`

instead of just `discard`. Also a slight tweak to avoid a second `exit` after
`exit discard`
This commit is contained in:
Nathaniel Case 2018-02-11 11:40:33 -05:00 committed by GitHub
parent d5ae63c0ea
commit 6cdf91fd35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 20 deletions

View file

@ -29,7 +29,7 @@ import json
from ansible.module_utils._text import to_text
from ansible.module_utils.basic import env_fallback, return_values
from ansible.module_utils.network.common.utils import to_list
from ansible.module_utils.connection import Connection
from ansible.module_utils.connection import Connection, ConnectionError
_DEVICE_CONFIGS = {}
@ -143,14 +143,13 @@ def load_config(module, commands, commit=False, comment=None):
if commit:
try:
out = connection.commit(comment)
except:
except ConnectionError:
connection.discard_changes()
module.fail_json(msg='commit failed: %s' % out)
if not commit:
connection.discard_changes()
else:
connection.get('exit')
else:
connection.get('exit')
connection.discard_changes()
if diff:
return diff