Merge pull request #1490 from thomasbridge74/develop

Fixing the issue with the updated json output in newer versions of NXOS.
napalm-automation · Oct 14, 2021 · 48a73ef · 48a73ef
2 parents c320023 + f3f8788
commit 48a73ef
Show file tree

Hide file tree

Showing 5 changed files with 1,698 additions and 1 deletion.
diff --git a/napalm/nxos_ssh/nxos_ssh.py b/napalm/nxos_ssh/nxos_ssh.py
@@ -1534,7 +1534,11 @@ def get_vlans(self):
         for vlan in vlan_table_raw:
             if "vlanshowplist-ifidx" not in vlan.keys():
                 vlan["vlanshowplist-ifidx"] = []
-            vlans[vlan["vlanshowbr-vlanid"]] = {
+            if "vlanshowbr-vlanid-utf" in vlan.keys():
+                vlan_number = vlan["vlanshowbr-vlanid-utf"]
+            else:
+                vlan_number = vlan["vlanshowbr-vlanid"]
+            vlans[vlan_number] = {
                 "name": vlan["vlanshowbr-vlanname"],
                 "interfaces": self._parse_vlan_ports(vlan["vlanshowplist-ifidx"]),
             }