diff options
| author | Nathaniel Case <this.is@nathanielca.se> | 2016-09-12 14:20:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-12 14:20:50 -0400 |
| commit | 060ed665f60959722522183008ccf4db689652e3 (patch) | |
| tree | 85ef1bc5152af2e75d2c61f9c700e003835291d4 | |
| parent | 5aa83041bf7bfb2d096ab8b98854a01b25fcd657 (diff) | |
| download | ansible-060ed665f60959722522183008ccf4db689652e3.tar.gz | |
Cleanup nxos
closes #17414
| -rw-r--r-- | lib/ansible/module_utils/nxos.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/ansible/module_utils/nxos.py b/lib/ansible/module_utils/nxos.py index 1680a825df..7ba3018317 100644 --- a/lib/ansible/module_utils/nxos.py +++ b/lib/ansible/module_utils/nxos.py @@ -21,7 +21,7 @@ import re import time import collections -from ansible.module_utils.basic import json +from ansible.module_utils.basic import json, json_dict_bytes_to_unicode from ansible.module_utils.network import ModuleStub, NetworkError, NetworkModule from ansible.module_utils.network import add_argument, register_transport, to_list from ansible.module_utils.shell import CliBase @@ -145,14 +145,14 @@ class Nxapi(NxapiConfigMixin): while commands: stack.append(commands.popleft()) if len(stack) == 10: - data = self._get_body(stack, output) - data = self._jsonify(data) + body = self._get_body(stack, output) + data = self._jsonify(body) requests.append(data) stack = list() if stack: - data = self._get_body(stack, output) - data = self._jsonify(data) + body = self._get_body(stack, output) + data = self._jsonify(body) requests.append(data) headers = {'Content-Type': 'application/json'} @@ -279,12 +279,14 @@ class Cli(NxapiConfigMixin, CliBase): Cli = register_transport('cli', default=True)(Cli) + def prepare_config(commands): prepared = ['config'] prepared.extend(to_list(commands)) prepared.append('end') return prepared + def prepare_commands(commands): jsonify = lambda x: '%s | json' % x for cmd in to_list(commands): |