wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show version brief does not work on iosxr virtual (#37609)

Browse source 
* show version brief does not work on iosxr virtual

* ci failures fix
This commit is contained in:
Deepak Agrawal 2018-03-29 12:33:41 +05:30 committed by GitHub
parent 73d3ed85ef
commit 66b389a00d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/network/iosxr/iosxr_facts.py
View file

@ -136,12 +136,12 @@ class FactsBase(object):
class Default(FactsBase): class Default(FactsBase):
def commands(self): def commands(self):
return(['show version brief']) return(['show version | utility head -n 20'])
def populate(self, results): def populate(self, results):
self.facts['version'] = self.parse_version(results['show version brief']) self.facts['version'] = self.parse_version(results['show version | utility head -n 20'])
self.facts['image'] = self.parse_image(results['show version brief']) self.facts['image'] = self.parse_image(results['show version | utility head -n 20'])
self.facts['hostname'] = self.parse_hostname(results['show version brief']) self.facts['hostname'] = self.parse_hostname(results['show version | utility head -n 20'])
def parse_version(self, data): def parse_version(self, data):
match = re.search(r'Version (\S+)$', data, re.M) match = re.search(r'Version (\S+)$', data, re.M)

2
lib/ansible/plugins/cliconf/iosxr.py
View file

@ -35,7 +35,7 @@ class Cliconf(CliconfBase):
device_info = {} device_info = {}
device_info['network_os'] = 'iosxr' device_info['network_os'] = 'iosxr'
reply = self.get(b'show version brief') reply = self.get(b'show version | utility head -n 20')
data = to_text(reply, errors='surrogate_or_strict').strip() data = to_text(reply, errors='surrogate_or_strict').strip()
match = re.search(r'Version (\S+)$', data, re.M) match = re.search(r'Version (\S+)$', data, re.M)

18
test/units/modules/network/iosxr/fixtures/show_version___utility_head_-n_20 Normal file
View file

@ -0,0 +1,18 @@
Cisco IOS XR Software, Version 6.0.0[Default]
Copyright (c) 2015 by Cisco Systems, Inc.
ROM: GRUB, Version 1.99(0), DEV RELEASE
iosxr01 uptime is 11 weeks, 6 days, 2 hours, 2 minutes
System image file is "bootflash:disk0/xrvr-os-mbi-6.0.0/mbixrvr-rp.vm"
cisco IOS XRv Series (Pentium Celeron Stepping 3) processor with 3169911K bytes
of memory.
Pentium Celeron Stepping 3 processor at 3836MHz, Revision 2.174
IOS XRv Chassis
1 Management Ethernet
6 GigabitEthernet
97070k bytes of non-volatile configuration memory.
866M bytes of hard disk.
2321392k bytes of disk0: (Sector size 512 bytes).

1
test/units/modules/network/iosxr/test_iosxr_facts.py
View file

@ -57,6 +57,7 @@ class TestIosxrFacts(TestIosxrModule):
command = item command = item
filename = str(command).replace(' ', '_') filename = str(command).replace(' ', '_')
filename = filename.replace('/', '7') filename = filename.replace('/', '7')
filename = filename.replace('|', '_')
output.append(load_fixture(filename)) output.append(load_fixture(filename))
return output return output