make eos_vlan idempotent (#34443)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
pull/34456/head
Trishna Guha 7 years ago committed by GitHub
parent ab67539bef
commit 0f24199012
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -140,7 +140,8 @@ def map_obj_to_commands(updates, module):
elif state == 'present': elif state == 'present':
if not obj_in_have: if not obj_in_have:
commands.append('vlan %s' % w['vlan_id']) commands.append('vlan %s' % w['vlan_id'])
commands.append('name %s' % w['name']) if w['name']:
commands.append('name %s' % w['name'])
if w['interfaces']: if w['interfaces']:
for i in w['interfaces']: for i in w['interfaces']:
@ -172,13 +173,15 @@ def map_obj_to_commands(updates, module):
else: else:
if not obj_in_have: if not obj_in_have:
commands.append('vlan %s' % w['vlan_id']) commands.append('vlan %s' % w['vlan_id'])
commands.append('name %s' % w['name']) if w['name']:
commands.append('name %s' % w['name'])
commands.append('state %s' % w['state']) commands.append('state %s' % w['state'])
elif obj_in_have['name'] != w['name'] or obj_in_have['state'] != w['state']: elif (w['name'] and obj_in_have['name'] != w['name']) or obj_in_have['state'] != w['state']:
commands.append('vlan %s' % w['vlan_id']) commands.append('vlan %s' % w['vlan_id'])
if obj_in_have['name'] != w['name']: if w['name']:
commands.append('name %s' % w['name']) if obj_in_have['name'] != w['name']:
commands.append('name %s' % w['name'])
if obj_in_have['state'] != w['state']: if obj_in_have['state'] != w['state']:
commands.append('state %s' % w['state']) commands.append('state %s' % w['state'])

Loading…
Cancel
Save