ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Remove superfluous include on iosxr filesystems fact gathering (#21775)

Browse source 
The regex will catch only lines that start with 'Directory of' regardless.
Also, fixing unit tests while at it.
This commit is contained in:
Ricardo Carrillo Cruz 2017-02-22 15:44:17 +01:00 committed by GitHub
parent 9e6980a039
commit ab4e83f288
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,11 +166,11 @@ class Default(FactsBase):
class Hardware(FactsBase): class Hardware(FactsBase):
def commands(self): def commands(self):
return(['dir /all | include Directory', 'show memory summary']) return(['dir /all', 'show memory summary'])
def populate(self, results): def populate(self, results):
self.facts['filesystems'] = self.parse_filesystems( self.facts['filesystems'] = self.parse_filesystems(
results['dir /all | include Directory']) results['dir /all'])
match = re.search(r'Physical Memory (\d+)M total \((\d+)', match = re.search(r'Physical Memory (\d+)M total \((\d+)',
results['show memory summary']) results['show memory summary'])

6
test/units/modules/network/iosxr/fixtures/dir_7all Normal file
View file

@ -0,0 +1,6 @@
Directory of disk0:
file1
file2
Directory of flash0:
file3

1
test/units/modules/network/iosxr/fixtures/dir_7all_1_include_Directory
View file

@ -1 +0,0 @@
lollll

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

@ -52,7 +52,6 @@ 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('|', '1')
output.append(load_fixture(filename)) output.append(load_fixture(filename))
return output return output
@ -66,7 +65,7 @@ class TestIosxrFacts(TestIosxrModule):
self.assertIn('default', ansible_facts['ansible_net_gather_subset']) self.assertIn('default', ansible_facts['ansible_net_gather_subset'])
self.assertIn('interfaces', ansible_facts['ansible_net_gather_subset']) self.assertIn('interfaces', ansible_facts['ansible_net_gather_subset'])
self.assertEquals('iosxr01', ansible_facts['ansible_net_hostname']) self.assertEquals('iosxr01', ansible_facts['ansible_net_hostname'])
self.assertEquals([], ansible_facts['ansible_net_filesystems']) self.assertEquals(['disk0:', 'flash0:'], ansible_facts['ansible_net_filesystems'])
self.assertIn('GigabitEthernet0/0/0/0', self.assertIn('GigabitEthernet0/0/0/0',
ansible_facts['ansible_net_interfaces'].keys()) ansible_facts['ansible_net_interfaces'].keys())