diff --git a/lib/ansible/modules/network/nxos/nxos_command.py b/lib/ansible/modules/network/nxos/nxos_command.py index 9df6e734ae7..dedd607caeb 100644 --- a/lib/ansible/modules/network/nxos/nxos_command.py +++ b/lib/ansible/modules/network/nxos/nxos_command.py @@ -168,7 +168,7 @@ from ansible.module_utils.nxos import nxos_argument_spec, check_args def to_lines(stdout): lines = list() for item in stdout: - if isinstance(item, basestring): + if isinstance(item, string_types): item = str(item).split('\n') lines.append(item) return lines diff --git a/test/units/modules/network/nxos/fixtures/nxos_command/show_version.txt b/test/units/modules/network/nxos/fixtures/nxos_command/show_version.txt new file mode 100644 index 00000000000..ba9ae665150 --- /dev/null +++ b/test/units/modules/network/nxos/fixtures/nxos_command/show_version.txt @@ -0,0 +1,68 @@ +Cisco NX-OS Software +Copyright (c) 2002-2016, Cisco Systems, Inc. All rights reserved. +NX-OSv software ("NX-OSv Software") and related documentation, +files or other reference materials ("Documentation") are +the proprietary property and confidential information of Cisco +Systems, Inc. ("Cisco") and are protected, without limitation, +pursuant to United States and International copyright and trademark +laws in the applicable jurisdiction which provide civil and criminal +penalties for copying or distribution without Cisco's authorization. + +Any use or disclosure, in whole or in part, of the NX-OSv Software +or Documentation to any third party for any purposes is expressly +prohibited except as otherwise authorized by Cisco in writing. +The copyrights to certain works contained herein are owned by other +third parties and are used and distributed under license. Some parts +of this software may be covered under the GNU Public License or the +GNU Lesser General Public License. A copy of each such license is +available at +http://www.gnu.org/licenses/gpl.html and +http://www.gnu.org/licenses/lgpl.html +*************************************************************************** +* NX-OSv is strictly limited to use for evaluation, demonstration and * +* NX-OS education. NX-OSv is provided as-is and is not supported by * +* Cisco's Technical Advisory Center. Any use or disclosure, in whole or * +* in part of the NX-OSv Software or Documentation to any third party for * +* any purposes is expressly prohibited except as otherwise authorized by * +* Cisco in writing. * +*************************************************************************** +nxos01# show version +Cisco Nexus Operating System (NX-OS) Software +TAC support: http://www.cisco.com/tac +Documents: http://www.cisco.com/en/US/products/ps9372/tsd_products_support_series_home.html +Copyright (c) 2002-2016, Cisco Systems, Inc. All rights reserved. +The copyrights to certain works contained herein are owned by +other third parties and are used and distributed under license. +Some parts of this software are covered under the GNU Public +License. A copy of the license is available at +http://www.gnu.org/licenses/gpl.html. + +NX-OSv is a demo version of the Nexus Operating System + +Software + loader: version N/A + kickstart: version 7.3(0)D1(1) + system: version 7.3(0)D1(1) + kickstart image file is: bootflash:///titanium-d1-kickstart.7.3.0.D1.1.bin + kickstart compile time: 1/11/2016 16:00:00 [02/11/2016 10:30:12] + system image file is: bootflash:///titanium-d1.7.3.0.D1.1.bin + system compile time: 1/11/2016 16:00:00 [02/11/2016 13:08:11] + + +Hardware + cisco NX-OSv Chassis ("NX-OSv Supervisor Module") + QEMU Virtual CPU version 2.0 with 3064860 kB of memory. + Processor Board ID TM3E35B910B + + Device name: nxos01 + bootflash: 3184776 kB + +Kernel uptime is 7 day(s), 17 hour(s), 0 minute(s), 23 second(s) + + +plugin + Core Plugin, Ethernet Plugin + +Active Package(s) + + diff --git a/test/units/modules/network/nxos/test_nxos_command.py b/test/units/modules/network/nxos/test_nxos_command.py new file mode 100644 index 00000000000..594d06856db --- /dev/null +++ b/test/units/modules/network/nxos/test_nxos_command.py @@ -0,0 +1,103 @@ +# (c) 2016 Red Hat Inc. +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + +# Make coding more python3-ish +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + +import json + +from ansible.compat.tests.mock import patch +from ansible.modules.network.nxos import nxos_command +from .nxos_module import TestNxosModule, load_fixture, set_module_args + +class TestNxosCommandModule(TestNxosModule): + + module = nxos_command + + def setUp(self): + self.mock_run_commands = patch('ansible.modules.network.nxos.nxos_command.run_commands') + self.run_commands = self.mock_run_commands.start() + + def tearDown(self): + self.mock_run_commands.stop() + + def load_fixtures(self, commands=None): + def load_from_file(*args, **kwargs): + module, commands = args + output = list() + + for item in commands: + try: + obj = json.loads(item['command']) + command = obj['command'] + except ValueError: + command = item['command'] + filename = str(command).replace(' ', '_') + filename = 'nxos_command/%s.txt' % filename + output.append(load_fixture(filename)) + return output + + self.run_commands.side_effect = load_from_file + + def test_nxos_command_simple(self): + set_module_args(dict(commands=['show version'])) + result = self.execute_module() + self.assertEqual(len(result['stdout']), 1) + self.assertTrue(result['stdout'][0].startswith('Cisco')) + + def test_nxos_command_multiple(self): + set_module_args(dict(commands=['show version', 'show version'])) + result = self.execute_module() + self.assertEqual(len(result['stdout']), 2) + self.assertTrue(result['stdout'][0].startswith('Cisco')) + + def test_nxos_command_wait_for(self): + wait_for = 'result[0] contains "Cisco NX-OS"' + set_module_args(dict(commands=['show version'], wait_for=wait_for)) + self.execute_module() + + def test_nxos_command_wait_for_fails(self): + wait_for = 'result[0] contains "test string"' + set_module_args(dict(commands=['show version'], wait_for=wait_for)) + self.execute_module(failed=True) + self.assertEqual(self.run_commands.call_count, 10) + + def test_nxos_command_retries(self): + wait_for = 'result[0] contains "test string"' + set_module_args(dict(commands=['show version'], wait_for=wait_for, retries=2)) + self.execute_module(failed=True) + self.assertEqual(self.run_commands.call_count, 2) + + def test_nxos_command_match_any(self): + wait_for = ['result[0] contains "Cisco"', + 'result[0] contains "test string"'] + set_module_args(dict(commands=['show version'], wait_for=wait_for, match='any')) + self.execute_module() + + def test_nxos_command_match_all(self): + wait_for = ['result[0] contains "Cisco"', + 'result[0] contains "system image file"'] + set_module_args(dict(commands=['show version'], wait_for=wait_for, match='all')) + self.execute_module() + + def test_nxos_command_match_all_failure(self): + wait_for = ['result[0] contains "Cisco"', + 'result[0] contains "test string"'] + commands = ['show version', 'show version'] + set_module_args(dict(commands=commands, wait_for=wait_for, match='all')) + self.execute_module(failed=True)