Fix ios_facts return values (#35239)

* Revert model and serialnum to older version

* Add stacked versions of model and serialnum as separate facts

* Add unit test to check stacked output

* Alter model regex to address #34768
This commit is contained in:
Nathaniel Case 2018-01-30 11:17:14 -05:00 committed by GitHub
commit 4a79112e5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 157 additions and 27 deletions

View file

@ -0,0 +1,68 @@
Cisco Internetwork Operating System Software
IOS (tm) C3750 Software (C3750-I5-M), Version 12.1(14)EA1, RELEASE SOFTWARE (fc1)
Copyright (c) 1986-2003 by cisco Systems, Inc.
Compiled Tue 22-Jul-03 13:17 by antonino
Image text-base: 0x00003000, data-base: 0x008F0CF8
ROM: Bootstrap program is C3750 boot loader
BOOTLDR: C3750 Boot Loader (C3750-HBOOT-M) Version 12.1(11r)AX, RELEASE SOFTWARE (fc1)
3750RJ uptime is 1 hour, 29 minutes
System returned to ROM by power-on
System image file is "flash:c3750-i5-mz.121.14-EA1/c3750-i5-mz.121.14-EA1.bin"
cisco WS-C3750-24TS (PowerPC405) processor (revision A0) with 120822K/10240K bytes of memory.
Processor board ID CAT0726R0ZU
Last reset from power-on
Bridging software.
2 Virtual Ethernet/IEEE 802.3 interface(s)
48 FastEthernet/IEEE 802.3 interface(s)
16 Gigabit Ethernet/IEEE 802.3 interface(s)
The password-recovery mechanism is enabled.
512K bytes of flash-simulated non-volatile configuration memory.
Base ethernet MAC Address : 00:0D:29:B4:18:00
Motherboard assembly number : 73-7055-06
Power supply part number : 341-0034-01
Motherboard serial number : CAT0726043V
Power supply serial number : PHI0708009K
Model revision number : A0
Motherboard revision number : A0
Model number : WS-C3750-24TS-E
System serial number : CAT0726R0ZU
Switch Ports Model SW Version SW Image
------ ----- ----- ---------- ----------
* 1 26 WS-C3750-24TS 12.1(14)EA1 C3750-I5-M
2 26 WS-C3750-24TS 12.1(14)EA1 C3750-I5-M
3 12 WS-C3750G-12S 12.1(14)EA1 C3750-I5-M
Switch 02
---------
Switch Uptime : 1 hour, 29 minutes
Base ethernet MAC Address : 00:0D:29:B4:3F:00
Motherboard assembly number : 73-7055-06
Power supply part number : 341-0034-01
Motherboard serial number : CAT07260438
Power supply serial number : PHI0708008X
Model revision number : A0
Motherboard revision number : A0
Model number : WS-C3750-24TS-E
System serial number : CAT0726R10A
Switch 03
---------
Switch Uptime : 1 hour, 29 minutes
Base ethernet MAC Address : 00:0D:BD:6A:3E:00
Motherboard assembly number : 73-8307-06
Power supply part number : 341-0048-01
Motherboard serial number : CAT073205S2
Power supply serial number : DTH0731055Z
Model revision number : A0
Motherboard revision number : A0
Model number : WS-C3750G-12S-E
System serial number : CAT0732R0M4
Top assembly part number : 800-23419-01
Top assembly revision number : A0
Configuration register is 0xF

View file

@ -0,0 +1,66 @@
# 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 <http://www.gnu.org/licenses/>.
# Make coding more python3-ish
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from ansible.compat.tests.mock import patch
from ansible.modules.network.ios import ios_facts
from units.modules.utils import set_module_args
from .ios_module import TestIosModule, load_fixture
class TestIosFactsModule(TestIosModule):
module = ios_facts
def setUp(self):
super(TestIosFactsModule, self).setUp()
self.mock_run_commands = patch('ansible.modules.network.ios.ios_facts.run_commands')
self.run_commands = self.mock_run_commands.start()
def tearDown(self):
super(TestIosFactsModule, self).tearDown()
self.mock_run_commands.stop()
def load_fixtures(self, commands=None):
def load_from_file(*args, **kwargs):
module = args
commands = kwargs['commands']
output = list()
for command in commands:
filename = str(command).split(' | ')[0].replace(' ', '_')
output.append(load_fixture('ios_facts_%s' % filename))
return output
self.run_commands.side_effect = load_from_file
def test_ios_facts_stacked(self):
set_module_args(dict(gather_subset='default'))
result = self.execute_module()
self.assertEqual(
result['ansible_facts']['ansible_net_model'], 'WS-C3750-24TS'
)
self.assertEqual(
result['ansible_facts']['ansible_net_serialnum'], 'CAT0726R0ZU'
)
self.assertEqual(
result['ansible_facts']['ansible_net_stacked_models'], ['WS-C3750-24TS-E', 'WS-C3750-24TS-E', 'WS-C3750G-12S-E']
)
self.assertEqual(
result['ansible_facts']['ansible_net_stacked_serialnums'], ['CAT0726R0ZU', 'CAT0726R10A', 'CAT0732R0M4']
)