diff options
| author | Trishna Guha <trishnaguha17@gmail.com> | 2018-01-05 18:35:59 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 18:35:59 +0530 |
| commit | cf31e47cdcec2ebf03ac973c21330073b721e0c7 (patch) | |
| tree | e8c2405bea33a08c65bb6529ef96d81c0f5ddff5 | |
| parent | 1546ddb3c38919829f4e13f1d0c42938fe388fe1 (diff) | |
| download | ansible-cf31e47cdcec2ebf03ac973c21330073b721e0c7.tar.gz | |
Make eos_vlan idempotent (#34503)
* make eos_vlan idempotent (#34443)
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
(cherry picked from commit 0f24199012531a69bb9256ee267bb0a1651aeb8f)
* Make eos_vlan idempotent CHANGELOG
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | lib/ansible/modules/network/eos/eos_vlan.py | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8477e88e70..e57d689834 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,8 @@ Ansible Changes By Release (https://github.com/ansible/ansible/pull/34478) * Fix file related modules run in check_mode when the file being operated on does not exist (https://github.com/ansible/ansible/pull/33967) +* Make eos_vlan idempotent + (https://github.com/ansible/ansible/pull/34443) <a id="2.4.2"></a> diff --git a/lib/ansible/modules/network/eos/eos_vlan.py b/lib/ansible/modules/network/eos/eos_vlan.py index c1e7a3cfb3..b9bc4b554f 100644 --- a/lib/ansible/modules/network/eos/eos_vlan.py +++ b/lib/ansible/modules/network/eos/eos_vlan.py @@ -140,7 +140,8 @@ def map_obj_to_commands(updates, module): elif state == 'present': if not obj_in_have: 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']: for i in w['interfaces']: @@ -172,13 +173,15 @@ def map_obj_to_commands(updates, module): else: if not obj_in_have: 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']) - 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']) - if obj_in_have['name'] != w['name']: - commands.append('name %s' % w['name']) + if w['name']: + if obj_in_have['name'] != w['name']: + commands.append('name %s' % w['name']) if obj_in_have['state'] != w['state']: commands.append('state %s' % w['state']) |