From 7a5a5e7c87daee1d343a432894ff04a2251d6349 Mon Sep 17 00:00:00 2001 From: Sumit Jaiswal Date: Tue, 17 Sep 2019 18:24:50 +0530 Subject: [PATCH] Fix traceback error in IOS and IOSXR when ran without config (#62400) * fixes issue 61321 * complete iosxr * fix ios_vlans Signed-off-by: Sumit Jaiswal --- lib/ansible/modules/network/ios/ios_interfaces.py | 5 +++++ lib/ansible/modules/network/ios/ios_l2_interfaces.py | 5 +++++ lib/ansible/modules/network/ios/ios_l3_interfaces.py | 5 +++++ lib/ansible/modules/network/ios/ios_lacp.py | 4 ++++ lib/ansible/modules/network/ios/ios_lacp_interfaces.py | 5 +++++ lib/ansible/modules/network/ios/ios_lag_interfaces.py | 6 ++++++ lib/ansible/modules/network/ios/ios_lldp_global.py | 4 ++++ lib/ansible/modules/network/ios/ios_lldp_interfaces.py | 5 +++++ lib/ansible/modules/network/ios/ios_vlans.py | 5 +++++ lib/ansible/modules/network/iosxr/iosxr_interfaces.py | 5 +++++ lib/ansible/modules/network/iosxr/iosxr_l2_interfaces.py | 5 +++++ lib/ansible/modules/network/iosxr/iosxr_l3_interfaces.py | 5 +++++ 12 files changed, 59 insertions(+) diff --git a/lib/ansible/modules/network/ios/ios_interfaces.py b/lib/ansible/modules/network/ios/ios_interfaces.py index 9f8ac4dae17..abb605e2928 100644 --- a/lib/ansible/modules/network/ios/ios_interfaces.py +++ b/lib/ansible/modules/network/ios/ios_interfaces.py @@ -389,7 +389,12 @@ def main(): :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=InterfacesArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = Interfaces(module).execute_module() diff --git a/lib/ansible/modules/network/ios/ios_l2_interfaces.py b/lib/ansible/modules/network/ios/ios_l2_interfaces.py index be201956628..43991fdbca9 100644 --- a/lib/ansible/modules/network/ios/ios_l2_interfaces.py +++ b/lib/ansible/modules/network/ios/ios_l2_interfaces.py @@ -348,7 +348,12 @@ def main(): :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=L2_InterfacesArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = L2_Interfaces(module).execute_module() diff --git a/lib/ansible/modules/network/ios/ios_l3_interfaces.py b/lib/ansible/modules/network/ios/ios_l3_interfaces.py index 3afec28c636..c158fcf089e 100644 --- a/lib/ansible/modules/network/ios/ios_l3_interfaces.py +++ b/lib/ansible/modules/network/ios/ios_l3_interfaces.py @@ -426,7 +426,12 @@ def main(): Main entry point for module execution :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=L3_InterfacesArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = L3_Interfaces(module).execute_module() diff --git a/lib/ansible/modules/network/ios/ios_lacp.py b/lib/ansible/modules/network/ios/ios_lacp.py index 7ff26a04636..1ebe3b3cef6 100644 --- a/lib/ansible/modules/network/ios/ios_lacp.py +++ b/lib/ansible/modules/network/ios/ios_lacp.py @@ -170,7 +170,11 @@ def main(): :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',))] + module = AnsibleModule(argument_spec=LacpArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = Lacp(module).execute_module() diff --git a/lib/ansible/modules/network/ios/ios_lacp_interfaces.py b/lib/ansible/modules/network/ios/ios_lacp_interfaces.py index 7ebb497b3f5..d9e52e39cfb 100644 --- a/lib/ansible/modules/network/ios/ios_lacp_interfaces.py +++ b/lib/ansible/modules/network/ios/ios_lacp_interfaces.py @@ -347,7 +347,12 @@ def main(): :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=Lacp_InterfacesArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = Lacp_Interfaces(module).execute_module() diff --git a/lib/ansible/modules/network/ios/ios_lag_interfaces.py b/lib/ansible/modules/network/ios/ios_lag_interfaces.py index 765bfcce73f..aa3c5768845 100644 --- a/lib/ansible/modules/network/ios/ios_lag_interfaces.py +++ b/lib/ansible/modules/network/ios/ios_lag_interfaces.py @@ -374,8 +374,14 @@ def main(): Main entry point for module execution :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=Lag_interfacesArgs.argument_spec, + required_if=required_if, supports_check_mode=True) + result = Lag_interfaces(module).execute_module() module.exit_json(**result) diff --git a/lib/ansible/modules/network/ios/ios_lldp_global.py b/lib/ansible/modules/network/ios/ios_lldp_global.py index a83d899a9cf..f9b44a6daab 100644 --- a/lib/ansible/modules/network/ios/ios_lldp_global.py +++ b/lib/ansible/modules/network/ios/ios_lldp_global.py @@ -241,7 +241,11 @@ def main(): :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',))] + module = AnsibleModule(argument_spec=Lldp_globalArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = Lldp_global(module).execute_module() diff --git a/lib/ansible/modules/network/ios/ios_lldp_interfaces.py b/lib/ansible/modules/network/ios/ios_lldp_interfaces.py index 2079f5b5da0..c1bbc274e43 100644 --- a/lib/ansible/modules/network/ios/ios_lldp_interfaces.py +++ b/lib/ansible/modules/network/ios/ios_lldp_interfaces.py @@ -485,7 +485,12 @@ def main(): :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=Lldp_InterfacesArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = Lldp_Interfaces(module).execute_module() diff --git a/lib/ansible/modules/network/ios/ios_vlans.py b/lib/ansible/modules/network/ios/ios_vlans.py index 2d76dc18b37..7de87dbb527 100644 --- a/lib/ansible/modules/network/ios/ios_vlans.py +++ b/lib/ansible/modules/network/ios/ios_vlans.py @@ -448,7 +448,12 @@ def main(): :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=VlansArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = Vlans(module).execute_module() diff --git a/lib/ansible/modules/network/iosxr/iosxr_interfaces.py b/lib/ansible/modules/network/iosxr/iosxr_interfaces.py index 7e7f34b7d47..33f556c96bd 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_interfaces.py +++ b/lib/ansible/modules/network/iosxr/iosxr_interfaces.py @@ -349,7 +349,12 @@ def main(): Main entry point for module execution :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=InterfacesArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = Interfaces(module).execute_module() diff --git a/lib/ansible/modules/network/iosxr/iosxr_l2_interfaces.py b/lib/ansible/modules/network/iosxr/iosxr_l2_interfaces.py index ae82957e983..50d0555c013 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_l2_interfaces.py +++ b/lib/ansible/modules/network/iosxr/iosxr_l2_interfaces.py @@ -413,7 +413,12 @@ def main(): Main entry point for module execution :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=L2_InterfacesArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = L2_Interfaces(module).execute_module() diff --git a/lib/ansible/modules/network/iosxr/iosxr_l3_interfaces.py b/lib/ansible/modules/network/iosxr/iosxr_l3_interfaces.py index ad425ee6e06..049066dc2c9 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_l3_interfaces.py +++ b/lib/ansible/modules/network/iosxr/iosxr_l3_interfaces.py @@ -408,7 +408,12 @@ def main(): Main entry point for module execution :returns: the result form module invocation """ + required_if = [('state', 'merged', ('config',)), + ('state', 'replaced', ('config',)), + ('state', 'overridden', ('config',))] + module = AnsibleModule(argument_spec=L3_InterfacesArgs.argument_spec, + required_if=required_if, supports_check_mode=True) result = L3_Interfaces(module).execute_module()