Skip to content
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

Jump to bottom

routeros: Bug fix: Exception catching #27

Merged
merged 5 commits into from
May 18, 2020
Merged

routeros: Bug fix: Exception catching #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e710c6
Bug fix: Exception catching
renatoalmeidaoliveira May 4, 2020
85c9341
Lint Fix
renatoalmeidaoliveira May 4, 2020
1926311
changelog fragment
renatoalmeidaoliveira May 4, 2020
27b7281
changelog update
renatoalmeidaoliveira May 5, 2020
b385b32
to_text refactoring
renatoalmeidaoliveira May 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/27-routeros-exception-catching
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- routeros module_utils - created a ``try``/``except`` block on the function ``get_capabilities`` (https://github.com/ansible-collections/community.network/pull/27).
11 changes: 7 additions & 4 deletions plugins/module_utils/network/routeros/routeros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
import json
from ansible.module_utils._text import to_text
from ansible.module_utils._text import to_text, to_native
from ansible.module_utils.basic import env_fallback
from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import to_list, ComplexList
from ansible.module_utils.connection import Connection, ConnectionError
Expand Down Expand Up @@ -66,9 +66,12 @@ def get_capabilities(module):
if hasattr(module, '_routeros_capabilities'):
return module._routeros_capabilities

capabilities = Connection(module._socket_path).get_capabilities()
module._routeros_capabilities = json.loads(capabilities)
return module._routeros_capabilities
try:
capabilities = Connection(module._socket_path).get_capabilities()
module._routeros_capabilities = json.loads(capabilities)
return module._routeros_capabilities
except ConnectionError as exc:
module.fail_json(msg=to_native(exc, errors='surrogate_then_replace'))


def get_defaults_flag(module):
Expand Down