wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix traceback for empty config (#62515) (#63089)

Browse source 
Signed-off-by: NilashishC <nilashishchakraborty8@gmail.com>
(cherry picked from commit fc5358cea0)

Add changelog for IOS-XR traceback fix

Signed-off-by: NilashishC <nilashishchakraborty8@gmail.com>

Remove empty spaces
This commit is contained in:
Nilashish Chakraborty 2019-11-13 01:32:14 +05:30 committed by Matt Davis
parent e3f7b5327e
commit 5558b43f27
17 changed files with 291 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/62515-fix_traceback_for_empty_config_iosxr.yaml Normal file
View file

@ -0,0 +1,3 @@
---
bugfixes:
- iosxr - Make sure that empty configs don't throw a traceback for Resource Modules (https://github.com/ansible/ansible/pull/62515)

2
lib/ansible/module_utils/network/iosxr/config/interfaces/interfaces.py
View file

@ -100,6 +100,8 @@ class Interfaces(ConfigBase):
"""
commands = []
state = self._module.params['state']
if state in ('overridden', 'merged', 'replaced') and not want:
self._module.fail_json(msg='value of config parameter must not be empty for state {0}'.format(state))
if state == 'overridden':
commands = self._state_overridden(want, have)

4
lib/ansible/module_utils/network/iosxr/config/l2_interfaces/l2_interfaces.py
View file

@ -96,6 +96,10 @@ class L2_Interfaces(ConfigBase):
commands = []
state = self._module.params['state']
if state in ('overridden', 'merged', 'replaced') and not want:
self._module.fail_json(msg='value of config parameter must not be empty for state {0}'.format(state))
if state == 'overridden':
commands = self._state_overridden(want, have, self._module)
elif state == 'deleted':

4
lib/ansible/module_utils/network/iosxr/config/l3_interfaces/l3_interfaces.py
View file

@ -97,6 +97,10 @@ class L3_Interfaces(ConfigBase):
commands = []
state = self._module.params['state']
if state in ('overridden', 'merged', 'replaced') and not want:
self._module.fail_json(msg='value of config parameter must not be empty for state {0}'.format(state))
if state == 'overridden':
commands = self._state_overridden(want, have, self._module)
elif state == 'deleted':

2
lib/ansible/module_utils/network/iosxr/config/lacp/lacp.py
View file

@ -107,6 +107,8 @@ class Lacp(ConfigBase):
to the desired configuration
"""
state = self._module.params['state']
if state in ('merged', 'replaced') and not want:
self._module.fail_json(msg='value of config parameter must not be empty for state {0}'.format(state))
if state == 'deleted':
commands = self._state_deleted(want, have)

3
lib/ansible/module_utils/network/iosxr/config/lacp_interfaces/lacp_interfaces.py
View file

@ -105,6 +105,9 @@ class Lacp_interfaces(ConfigBase):
commands = []
state = self._module.params['state']
if state in ('overridden', 'merged', 'replaced') and not want:
self._module.fail_json(msg='value of config parameter must not be empty for state {0}'.format(state))
if state == 'overridden':
commands.extend(
Lacp_interfaces._state_overridden(

3
lib/ansible/module_utils/network/iosxr/config/lag_interfaces/lag_interfaces.py
View file

@ -128,6 +128,9 @@ class Lag_interfaces(ConfigBase):
state = self._module.params['state']
commands = []
if state in ('overridden', 'merged', 'replaced') and not want:
self._module.fail_json(msg='value of config parameter must not be empty for state {0}'.format(state))
if state == 'overridden':
commands.extend(self._state_overridden(want, have))

2
lib/ansible/module_utils/network/iosxr/config/lldp_global/lldp_global.py
View file

@ -104,6 +104,8 @@ class Lldp_global(ConfigBase):
to the desired configuration
"""
state = self._module.params['state']
if state in ('merged', 'replaced') and not want:
self._module.fail_json(msg='value of config parameter must not be empty for state {0}'.format(state))
if state == 'deleted':
commands = self._state_deleted(want, have)

2
lib/ansible/module_utils/network/iosxr/config/lldp_interfaces/lldp_interfaces.py
View file

@ -102,6 +102,8 @@ class Lldp_interfaces(ConfigBase):
"""
state = self._module.params['state']
commands = []
if state in ('overridden', 'merged', 'replaced') and not want:
self._module.fail_json(msg='value of config parameter must not be empty for state {0}'.format(state))
if state == 'overridden':
commands.extend(

36
test/integration/targets/iosxr_interfaces/tests/cli/empty_config.yaml Normal file
View file

@ -0,0 +1,36 @@
---
- debug:
msg: "START iosxr_interfaces empty_config integration tests on connection={{ ansible_connection }}"
- name: Merged with empty config should give appropriate error message
iosxr_interfaces:
config:
state: merged
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state merged'
- name: Replaced with empty config should give appropriate error message
iosxr_interfaces:
config:
state: replaced
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state replaced'
- name: Overridden with empty config should give appropriate error message
iosxr_interfaces:
config:
state: overridden
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state overridden'

36
test/integration/targets/iosxr_l2_interfaces/tests/cli/empty_config.yaml Normal file
View file

@ -0,0 +1,36 @@
---
- debug:
msg: "START iosxr_l2_interfaces empty_config integration tests on connection={{ ansible_connection }}"
- name: Merged with empty config should give appropriate error message
iosxr_l2_interfaces:
config:
state: merged
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state merged'
- name: Replaced with empty config should give appropriate error message
iosxr_l2_interfaces:
config:
state: replaced
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state replaced'
- name: Overridden with empty config should give appropriate error message
iosxr_l2_interfaces:
config:
state: overridden
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state overridden'

36
test/integration/targets/iosxr_l3_interfaces/tests/cli/empty_config.yaml Normal file
View file

@ -0,0 +1,36 @@
---
- debug:
msg: "START iosxr_l3_interfaces empty_config integration tests on connection={{ ansible_connection }}"
- name: Merged with empty config should give appropriate error message
iosxr_l3_interfaces:
config:
state: merged
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state merged'
- name: Replaced with empty config should give appropriate error message
iosxr_l3_interfaces:
config:
state: replaced
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state replaced'
- name: Overridden with empty config should give appropriate error message
iosxr_l3_interfaces:
config:
state: overridden
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state overridden'

25
test/integration/targets/iosxr_lacp/tests/cli/empty_config.yaml Normal file
View file

@ -0,0 +1,25 @@
---
- debug:
msg: "START iosxr_lacp empty_config integration tests on connection={{ ansible_connection }}"
- name: Merged with empty config should give appropriate error message
iosxr_lacp:
config:
state: merged
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state merged'
- name: Replaced with empty config should give appropriate error message
iosxr_lacp:
config:
state: replaced
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state replaced'

36
test/integration/targets/iosxr_lacp_interfaces/tests/cli/empty_config.yaml Normal file
View file

@ -0,0 +1,36 @@
---
- debug:
msg: "START iosxr_lacp_interfaces empty_config integration tests on connection={{ ansible_connection }}"
- name: Merged with empty config should give appropriate error message
iosxr_lacp_interfaces:
config:
state: merged
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state merged'
- name: Replaced with empty config should give appropriate error message
iosxr_lacp_interfaces:
config:
state: replaced
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state replaced'
- name: Overridden with empty config should give appropriate error message
iosxr_lacp_interfaces:
config:
state: overridden
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state overridden'

36
test/integration/targets/iosxr_lag_interfaces/tests/cli/empty_config.yaml Normal file
View file

@ -0,0 +1,36 @@
---
- debug:
msg: "START iosxr_lag_interfaces empty_config integration tests on connection={{ ansible_connection }}"
- name: Merged with empty config should give appropriate error message
iosxr_lag_interfaces:
config:
state: merged
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state merged'
- name: Replaced with empty config should give appropriate error message
iosxr_lag_interfaces:
config:
state: replaced
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state replaced'
- name: Overridden with empty config should give appropriate error message
iosxr_lag_interfaces:
config:
state: overridden
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state overridden'

25
test/integration/targets/iosxr_lldp_global/tests/cli/empty_config.yaml Normal file
View file

@ -0,0 +1,25 @@
---
- debug:
msg: "START iosxr_lldp_global empty_config integration tests on connection={{ ansible_connection }}"
- name: Merged with empty config should give appropriate error message
iosxr_lldp_global:
config:
state: merged
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state merged'
- name: Replaced with empty config should give appropriate error message
iosxr_lldp_global:
config:
state: replaced
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state replaced'

36
test/integration/targets/iosxr_lldp_interfaces/tests/cli/empty_config.yaml Normal file
View file

@ -0,0 +1,36 @@
---
- debug:
msg: "START iosxr_lldp_interfaces empty_config integration tests on connection={{ ansible_connection }}"
- name: Merged with empty config should give appropriate error message
iosxr_lldp_interfaces:
config:
state: merged
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state merged'
- name: Replaced with empty config should give appropriate error message
iosxr_lldp_interfaces:
config:
state: replaced
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state replaced'
- name: Overridden with empty config should give appropriate error message
iosxr_lldp_interfaces:
config:
state: overridden
register: result
ignore_errors: True
- assert:
that:
- result.msg == 'value of config parameter must not be empty for state overridden'