Fixes #23890 Remove idle ShellError exception and get_exception() method from nxos modules (#23947)

Remove idle ShellError exception and get_exception() method from nxos modules

lib/ansible/modules/network/nxos/nxos_bgp_af.py

@@ -946,13 +946,9 @@ def main():
     if state == 'present' or (state == 'absent' and existing):
         candidate = CustomNetworkConfig(indent=3)
         invoke('state_%s' % state, module, existing, proposed, candidate)
+        response = load_config(module, candidate)
+        result.update(response)
 
-        try:
-            response = load_config(module, candidate)
-            result.update(response)
-        except ShellError:
-            exc = get_exception()
-            module.fail_json(msg=str(exc))
     else:
         result['updates'] = []
 

lib/ansible/modules/network/nxos/nxos_bgp_neighbor.py

@@ -605,13 +605,9 @@ def main():
     if state == 'present' or (state == 'absent' and existing):
         candidate = CustomNetworkConfig(indent=3)
         invoke('state_%s' % state, module, existing, proposed, candidate)
+        response = load_config(module, candidate)
+        result.update(response)
 
-        try:
-            response = load_config(module, candidate)
-            result.update(response)
-        except ShellError:
-            exc = get_exception()
-            module.fail_json(msg=str(exc))
     else:
         result['updates'] = []
 

lib/ansible/modules/network/nxos/nxos_bgp_neighbor_af.py

@@ -958,13 +958,9 @@ def main():
     if state == 'present' or (state == 'absent' and existing):
         candidate = CustomNetworkConfig(indent=3)
         invoke('state_%s' % state, module, existing, proposed, candidate)
+        response = load_config(module, candidate)
+        result.update(response)
 
-        try:
-            response = load_config(module, candidate)
-            result.update(response)
-        except ShellError:
-            exc = get_exception()
-            module.fail_json(msg=str(exc))
     else:
         result['updates'] = []
 

lib/ansible/modules/network/nxos/nxos_evpn_vni.py

@@ -268,12 +268,8 @@ def state_absent(module, existing, proposed):
 
 def execute_config(module, candidate):
     result = {}
-    try:
+    response = load_config(module, candidate)
-        response = load_config(module, candidate)
+    result.update(response)
-        result.update(response)
-    except ShellError:
-        exc = get_exception()
-        module.fail_json(msg=str(exc))
     return result
 
 

lib/ansible/modules/network/nxos/nxos_file_copy.py

@@ -232,12 +232,8 @@ def main():
         file_exists = True
 
     if not module.check_mode and not file_exists:
-        try:
+        transfer_file(module, dest)
-            transfer_file(module, dest)
+        transfer_status = 'Sent'
-            transfer_status = 'Sent'
-        except ShellError:
-            clie = get_exception()
-            module.fail_json(msg=str(clie))
 
     if remote_file is None:
         remote_file = os.path.basename(local_file)

lib/ansible/modules/network/nxos/nxos_igmp.py

@@ -233,13 +233,9 @@ def main():
             True in existing.values()) or restart):
         candidate = CustomNetworkConfig(indent=3)
         invoke('get_commands', module, existing, proposed_args, candidate)
+        response = load_config(module, candidate)
+        result.update(response)
 
-        try:
-            response = load_config(module, candidate)
-            result.update(response)
-        except ShellError:
-            exc = get_exception()
-            module.fail_json(msg=str(exc))
     else:
         result['updates'] = []
 

lib/ansible/modules/network/nxos/nxos_interface_ospf.py

@@ -519,13 +519,9 @@ def main():
 
         candidate = CustomNetworkConfig(indent=3)
         invoke('state_%s' % state, module, existing, proposed, candidate)
+        response = load_config(module, candidate)
+        result.update(response)
 
-        try:
-            response = load_config(module, candidate)
-            result.update(response)
-        except ShellError:
-            exc = get_exception()
-            module.fail_json(msg=str(exc))
     else:
         result['updates'] = []
 

lib/ansible/modules/network/nxos/nxos_ntp_auth.py

@@ -335,11 +335,7 @@ def main():
         if module.check_mode:
             module.exit_json(changed=True, commands=cmds)
         else:
-            try:
+            load_config(module, cmds)
-                load_config(module, cmds)
-            except ShellError:
-                clie = get_exception()
-                module.fail_json(msg=str(clie) + ": " + cmds)
             end_state = get_ntp_auth_info(key_id, module)
             delta = dict(set(end_state.items()).difference(existing.items()))
             if delta or (len(existing) != len(end_state)):

lib/ansible/modules/network/nxos/nxos_ospf.py

@@ -188,13 +188,9 @@ def main():
     if (state == 'present' or (state == 'absent' and ospf in existing_list)):
         candidate = CustomNetworkConfig(indent=3)
         invoke('state_%s' % state, module, proposed, candidate)
+        response = load_config(module, candidate)
+        result.update(response)
 
-        try:
-            response = load_config(module, candidate)
-            result.update(response)
-        except ShellError:
-            exc = get_exception()
-            module.fail_json(msg=str(exc))
     else:
         result['updates'] = []
 

lib/ansible/modules/network/nxos/nxos_ospf_vrf.py

@@ -434,13 +434,9 @@ def main():
     if state == 'present' or (state == 'absent' and existing):
         candidate = CustomNetworkConfig(indent=3)
         invoke('state_%s' % state, module, existing, proposed, candidate)
+        response = load_config(module, candidate)
+        result.update(response)
 
-        try:
-            response = load_config(module, candidate)
-            result.update(response)
-        except ShellError:
-            exc = get_exception()
-            module.fail_json(msg=str(exc))
     else:
         result['updates'] = []
 

lib/ansible/modules/network/nxos/nxos_pim.py

@@ -173,13 +173,8 @@ def main():
     result = {}
     candidate = CustomNetworkConfig(indent=3)
     invoke('get_commands', module, existing, proposed, candidate)
-
+    response = load_config(module, candidate)
-    try:
+    result.update(response)
-        response = load_config(module, candidate)
-        result.update(response)
-    except ShellError:
-        exc = get_exception()
-        module.fail_json(msg=str(exc))
 
     if module._verbosity > 0:
         end_state = invoke('get_existing', module, args)

lib/ansible/modules/network/nxos/nxos_pim_rp_address.py

@@ -253,13 +253,8 @@ def main():
     result = {}
     candidate = CustomNetworkConfig(indent=3)
     invoke('state_%s' % state, module, existing, proposed, candidate)
-
+    response = load_config(module, candidate)
-    try:
+    result.update(response)
-        response = load_config(module, candidate)
-        result.update(response)
-    except ShellError:
-        exc = get_exception()
-        module.fail_json(msg=str(exc))
 
     if module._verbosity > 0:
         end_state = invoke('get_existing', module, args)

lib/ansible/modules/network/nxos/nxos_smu.py

@@ -174,12 +174,8 @@ def main():
 
     commands = get_commands(module, pkg, file_system)
     if not module.check_mode and commands:
-        try:
+        apply_patch(module, commands)
-            apply_patch(module, commands)
+        changed = True
-            changed = True
-        except ShellError:
-            e = get_exception()
-            module.fail_json(msg=str(e))
 
     if 'configure' in commands:
         commands.pop(0)

lib/ansible/modules/network/nxos/nxos_vrf_af.py

@@ -270,13 +270,9 @@ def main():
     if state == 'present' or (state == 'absent' and existing):
         candidate = CustomNetworkConfig(indent=3)
         invoke('state_%s' % state, module, existing, proposed, candidate)
+        response = load_config(module, candidate)
+        result.update(response)
 
-        try:
-            response = load_config(module, candidate)
-            result.update(response)
-        except ShellError:
-            exc = get_exception()
-            module.fail_json(msg=str(exc))
     else:
         result['updates'] = []
 

lib/ansible/modules/network/nxos/nxos_vxlan_vtep.py

@@ -363,13 +363,9 @@ def main():
                             "all logical interfaces.")
         candidate = CustomNetworkConfig(indent=3)
         invoke('state_%s' % state, module, existing, proposed, candidate)
+        response = load_config(module, candidate)
+        result.update(response)
 
-        try:
-            response = load_config(module, candidate)
-            result.update(response)
-        except ShellError:
-            exc = get_exception()
-            module.fail_json(msg=str(exc))
     else:
         result['updates'] = []