Fixes #30769 - nxos_vtp_version errors out on N1 images. (#30770) (#31285)

* Fixes #30769

* add the same fix for 2 more vtp modules

(cherry picked from commit a12a05c219)

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

@@ -149,10 +149,13 @@ def get_vtp_config(module):
 def get_vtp_password(module):
     command = 'show vtp password'
     body = execute_show_command(command, module)[0]
-    password = body['passwd']
+    try:
-    if password:
+        password = body['passwd']
-        return str(password)
+        if password:
-    else:
+            return str(password)
+        else:
+            return ""
+    except TypeError:
         return ""
 
 

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

@@ -180,10 +180,13 @@ def get_vtp_config(module):
 def get_vtp_password(module):
     command = 'show vtp password'
     body = execute_show_command(command, module)[0]
-    password = body['passwd']
+    try:
-    if password:
+        password = body['passwd']
-        return str(password)
+        if password:
-    else:
+            return str(password)
+        else:
+            return ""
+    except TypeError:
         return ""
 
 

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

@@ -147,10 +147,13 @@ def get_vtp_config(module):
 def get_vtp_password(module):
     command = 'show vtp password'
     body = execute_show_command(command, module)[0]
-    password = body['passwd']
+    try:
-    if password:
+        password = body['passwd']
-        return str(password)
+        if password:
-    else:
+            return str(password)
+        else:
+            return ""
+    except TypeError:
         return ""