Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IOS-XR: Fail with a better message when config is not provided #62515

Merged
merged 1 commit into from
Oct 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ def set_state(self, want, have):
"""
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ def set_state(self, want, have):
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':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ def set_state(self, want, have):
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':
Expand Down
2 changes: 2 additions & 0 deletions lib/ansible/module_utils/network/iosxr/config/lacp/lacp.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ def set_state(self, want, have):
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ def set_state(self, want, have):
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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ def set_state(self, want, have):
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))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ def set_state(self, want, have):
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ def set_state(self, want, have):
"""
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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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 changes: 25 additions & 0 deletions test/integration/targets/iosxr_lacp/tests/cli/empty_config.yaml
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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'