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

Fix Issue #49612 (#50073)

Browse source 
* Fix Issue #49612

Signed-off-by: Anas Badaha <anasb@mellanox.com>

* Fix Pep8 failures

Signed-off-by: Anas Badaha <anasb@mellanox.com>

* Add validation for send empty group name

Signed-off-by: Anas Badaha <anasb@mellanox.com>

* Fix Error message

Signed-off-by: Anas Badaha <anasb@mellanox.com>
This commit is contained in:
anasbadaha 2018-12-21 08:23:36 +02:00 committed by Ganesh Nalawade
parent 01833b6fb1
commit 6178a55afd
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/network/onyx/onyx_mlag_vip.py
View file

@ -145,11 +145,17 @@ class OnyxMLagVipModule(BaseOnyxModule):
if req_mac: if req_mac:
req_mac = req_mac.lower() req_mac = req_mac.lower()
if req_group != current_group or req_ip != current_ip: if req_ip is not None:
if req_group is None:
self._module.fail_json(msg='In order to configure Mlag-Vip you must send '
'group name param beside IPaddress')
ipaddr, mask = req_ip.split('/') ipaddr, mask = req_ip.split('/')
self._commands.append( if req_group != current_group or req_ip != current_ip:
'mlag-vip %s ip %s /%s force' % (req_group, ipaddr, mask)) self._commands.append('mlag-vip %s ip %s /%s force' % (req_group, ipaddr, mask))
if req_mac != current_mac: elif req_group and req_group != current_group:
self._commands.append('mlag-vip %s' % req_group)
if req_mac and req_mac != current_mac:
self._commands.append( self._commands.append(
'mlag system-mac %s' % (req_mac)) 'mlag system-mac %s' % (req_mac))
if self._commands: if self._commands:

8
test/units/modules/network/onyx/test_onyx_mlag_vip.py
View file

@ -65,6 +65,14 @@ class TestOnyxMlagVipModule(TestOnyxModule):
'mlag system-mac 00:00:5e:00:01:4e', 'no mlag shutdown'] 'mlag system-mac 00:00:5e:00:01:4e', 'no mlag shutdown']
self.execute_module(changed=True, commands=commands) self.execute_module(changed=True, commands=commands)
def test_mlag_send_group_name_only_change(self):
self._mlag_enabled = False
set_module_args(dict(group_name='neo-mlag-vip-500',
delay=0))
commands = ['mlag-vip neo-mlag-vip-500',
'no mlag shutdown']
self.execute_module(changed=True, commands=commands)
def test_mlag_absent_no_change(self): def test_mlag_absent_no_change(self):
self._mlag_enabled = False self._mlag_enabled = False
set_module_args(dict(state='absent')) set_module_args(dict(state='absent'))