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

Backport 2.7: Return correct version on installed VyOS (#39115) (#46730)

Browse source 
* Return correct version on installed VyOS (#39115)

* Return correct version on installed VyOS

Previously existing regexp will shows only "VyOS" without numeric output of router version.
For example: from  "Version:      VyOS 1.1.6" only VyOS will be written in ansible_net_version variable
For more informative output numeric value should be returned as well

* Fixed unittests

(cherry picked from commit 235b11f681)

* Added changelog
This commit is contained in:
Nilashish Chakraborty 2018-10-11 19:56:09 +05:30 committed by Toshio Kuratomi
parent 4ffc75ab44
commit 0e48544ae1
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/fix_vyos_version.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- vyos_facts - fix vyos_facts not returning version number issue (https://github.com/ansible/ansible/pull/39115)

2
lib/ansible/modules/network/vyos/vyos_facts.py
View file

@ -135,7 +135,7 @@ class Default(FactsBase):
self.facts['hostname'] = self.responses[1]
def parse_version(self, data):
match = re.search(r'Version:\s*(\S+)', data)
match = re.search(r'Version:\s*(.*)', data)
if match:
return match.group(1)

6
test/units/modules/network/vyos/test_vyos_facts.py
View file

@ -63,7 +63,7 @@ class TestVyosFactsModule(TestVyosModule):
facts = result.get('ansible_facts')
self.assertEqual(len(facts), 5)
self.assertEqual(facts['ansible_net_hostname'].strip(), 'vyos01')
self.assertEqual(facts['ansible_net_version'], 'VyOS')
self.assertEqual(facts['ansible_net_version'], 'VyOS 1.1.7')
def test_vyos_facts_not_all(self):
set_module_args(dict(gather_subset='!all'))
@ -71,7 +71,7 @@ class TestVyosFactsModule(TestVyosModule):
facts = result.get('ansible_facts')
self.assertEqual(len(facts), 5)
self.assertEqual(facts['ansible_net_hostname'].strip(), 'vyos01')
self.assertEqual(facts['ansible_net_version'], 'VyOS')
self.assertEqual(facts['ansible_net_version'], 'VyOS 1.1.7')
def test_vyos_facts_exclude_most(self):
set_module_args(dict(gather_subset=['!neighbors', '!config']))
@ -79,7 +79,7 @@ class TestVyosFactsModule(TestVyosModule):
facts = result.get('ansible_facts')
self.assertEqual(len(facts), 5)
self.assertEqual(facts['ansible_net_hostname'].strip(), 'vyos01')
self.assertEqual(facts['ansible_net_version'], 'VyOS')
self.assertEqual(facts['ansible_net_version'], 'VyOS 1.1.7')
def test_vyos_facts_invalid_subset(self):
set_module_args(dict(gather_subset='cereal'))