cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

multiple fixes nxos (#32903)

Browse source 
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
This commit is contained in:
Trishna Guha 2017-11-14 15:23:11 +00:00 committed by GitHub
parent 177a4fb3ec
commit 3ee2501c83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/nxos.py
View file

@ -169,7 +169,7 @@ class Cli:
except ValueError:
out = to_text(out).strip()
if item['output'] == 'json' and out != 'ok' and isinstance(out, string_types):
if item['output'] == 'json' and out != '' and isinstance(out, string_types):
self._module.fail_json(msg='failed to retrieve output of %s in json format' % item['command'])
responses.append(out)

3
lib/ansible/modules/network/nxos/nxos_interface.py
View file

@ -488,6 +488,9 @@ def get_interface_config_commands(interface, intf, existing):
if mtu != 'None':
commands.append('mtu {0}'.format(mtu))
if 'mtu None' in commands:
commands.pop()
admin_state = interface.get('admin_state')
if admin_state:
command = get_admin_state(interface, intf, admin_state)

8
test/integration/targets/nxos_file_copy/tests/cli/sanity.yaml
View file

@ -21,8 +21,8 @@
local_file: "./nxos.yaml"
file_system: "bootflash:"
provider: "{{ cli }}"
username: "{{ nxos_cli_user | default('admin') }}"
password: "{{ nxos_cli_pass | default('admin') }}"
username: "{{ ansible_ssh_user }}"
password: "{{ ansible_ssh_pass }}"
host: "{{ ansible_host }}"
register: result
@ -48,8 +48,8 @@
remote_file: "nxos.yaml"
file_system: "bootflash:"
provider: "{{ cli }}"
username: "{{ nxos_cli_user | default('admin') }}"
password: "{{ nxos_cli_pass | default('admin') }}"
username: "{{ ansible_ssh_user }}"
password: "{{ ansible_ssh_pass }}"
host: "{{ ansible_host }}"
register: result

8
test/integration/targets/nxos_file_copy/tests/nxapi/sanity.yaml
View file

@ -23,8 +23,8 @@
local_file: "./nxos.yaml"
file_system: "bootflash:"
provider: "{{ nxapi }}"
username: "{{ nxos_nxapi_user | default('admin') }}"
password: "{{ nxos_nxapi_pass | default('admin') }}"
username: "{{ ansible_ssh_user }}"
password: "{{ ansible_ssh_pass }}"
host: "{{ ansible_host }}"
register: result
@ -51,8 +51,8 @@
remote_file: "nxos.yaml"
file_system: "bootflash:"
provider: "{{ nxapi }}"
username: "{{ nxos_nxapi_user | default('admin') }}"
password: "{{ nxos_nxapi_pass | default('admin') }}"
username: "{{ ansible_ssh_user }}"
password: "{{ ansible_ssh_pass }}"
host: "{{ ansible_host }}"
register: result

6
test/units/modules/network/nxos/test_nxos_interface.py
View file

@ -62,14 +62,12 @@ class TestNxosInterfaceModule(TestNxosModule):
def test_nxos_interface_up(self):
set_module_args(dict(interface='loopback0'))
result = self.execute_module(changed=True)
self.assertIn('interface loopback0', result['commands'])
self.assertIn('no shutdown', result['commands'])
self.assertEqual(result['commands'], ['interface loopback0', 'no shutdown'])
def test_nxos_interface_down(self):
set_module_args(dict(interface='loopback0', admin_state='down'))
result = self.execute_module(changed=True)
self.assertIn('interface loopback0', result['commands'])
self.assertIn('shutdown', result['commands'])
self.assertEqual(result['commands'], ['interface loopback0', 'shutdown'])
def test_nxos_interface_delete(self):
set_module_args(dict(interface='loopback0', state='absent'))