Merge pull request #32 from CaptTrews/ansible/collections-sync-master

Updated from network content collector

Reviewed-by: https://github.com/apps/ansible-zuul

plugins/module_utils/network/iosxr/config/interfaces/interfaces.py

@@ -109,6 +109,12 @@ 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)

plugins/module_utils/network/iosxr/config/l2_interfaces/l2_interfaces.py

@@ -107,6 +107,14 @@ 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":

plugins/module_utils/network/iosxr/config/l3_interfaces/l3_interfaces.py

@@ -111,6 +111,14 @@ 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":

plugins/module_utils/network/iosxr/config/lacp/lacp.py

@@ -108,6 +108,12 @@ 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)

plugins/module_utils/network/iosxr/config/lacp_interfaces/lacp_interfaces.py

@@ -111,6 +111,13 @@ 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(want, have))
 

plugins/module_utils/network/iosxr/config/lag_interfaces/lag_interfaces.py

@@ -128,6 +128,13 @@ 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))
 

plugins/module_utils/network/iosxr/config/lldp_global/lldp_global.py

@@ -110,6 +110,12 @@ 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)

plugins/module_utils/network/iosxr/config/lldp_interfaces/lldp_interfaces.py

@@ -113,6 +113,12 @@ 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))

tests/integration/targets/iosxr_interfaces/tests/cli/empty_config.yaml

@@ -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
+  cisco.iosxr.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
+  cisco.iosxr.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
+  cisco.iosxr.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'

tests/integration/targets/iosxr_l2_interfaces/tests/cli/empty_config.yaml

@@ -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
+  cisco.iosxr.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
+  cisco.iosxr.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
+  cisco.iosxr.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'

tests/integration/targets/iosxr_l3_interfaces/tests/cli/empty_config.yaml

@@ -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
+  cisco.iosxr.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
+  cisco.iosxr.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
+  cisco.iosxr.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'

tests/integration/targets/iosxr_lacp/tests/cli/empty_config.yaml

@@ -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
+  cisco.iosxr.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
+  cisco.iosxr.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'

tests/integration/targets/iosxr_lacp_interfaces/tests/cli/empty_config.yaml

@@ -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
+  cisco.iosxr.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
+  cisco.iosxr.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
+  cisco.iosxr.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'

tests/integration/targets/iosxr_lag_interfaces/tests/cli/empty_config.yaml

@@ -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
+  cisco.iosxr.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
+  cisco.iosxr.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
+  cisco.iosxr.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'

tests/integration/targets/iosxr_lldp_global/tests/cli/empty_config.yaml

@@ -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
+  cisco.iosxr.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
+  cisco.iosxr.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'

tests/integration/targets/iosxr_lldp_interfaces/tests/cli/empty_config.yaml

@@ -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
+  cisco.iosxr.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
+  cisco.iosxr.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
+  cisco.iosxr.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'