Fix for napalm-automation#1145 = get_vlans() broken on NX-OS where no…

… interfaces in VLAN (napalm-automation#1150) * Fix for get_vlans() in nxos_ssh where no interfaces in VLAN * Fix for get_vlans() in nxos where no interfaces in VLAN * Fix indent * Fix indent * Fix indent * Adjust mocked data for get_vlans() fix in nxos * Adjust mocked data for get_vlans() fix in nxos_ssh * Adjust mocked data for get_vlans() fix in nxos * Update expected_result.json * Update expected_result.json * Update expected_result.json * Update show_vlan_brief.json * Update expected_result.json * Revert "Update show_vlan_brief.json" This reverts commit a0c1719. * Revert "Update expected_result.json" This reverts commit 70bddfb. * Revert "Update expected_result.json" This reverts commit b384b35. * Revert "Update expected_result.json" This reverts commit 3b2c742. * Revert "Adjust mocked data for get_vlans() fix in nxos" This reverts commit a809380. * Revert "Adjust mocked data for get_vlans() fix in nxos_ssh" This reverts commit d35a63b. * Revert "Adjust mocked data for get_vlans() fix in nxos" This reverts commit 9205be8. * Add test cases for get_vlans where interface has no VLANs. * Revert "Update expected_result.json" This reverts commit 8f986aa. * Fix for get_vlans() in nxos/nxos_ssh where no interfaces in VLAN Fix for get_vlans() in nxos where no interfaces in VLAN Fix indent Fix indent Fix indent Adjust mocked data for get_vlans() fix in nxos Adjust mocked data for get_vlans() fix in nxos_ssh Adjust mocked data for get_vlans() fix in nxos Update expected_result.json Update expected_result.json Update expected_result.json Update show_vlan_brief.json Update expected_result.json Revert "Update show_vlan_brief.json" This reverts commit a0c1719. Revert "Update expected_result.json" This reverts commit 70bddfb. Revert "Update expected_result.json" This reverts commit b384b35. Revert "Update expected_result.json" This reverts commit 3b2c742. Revert "Adjust mocked data for get_vlans() fix in nxos" This reverts commit a809380. Revert "Adjust mocked data for get_vlans() fix in nxos_ssh" This reverts commit d35a63b. Revert "Adjust mocked data for get_vlans() fix in nxos" This reverts commit 9205be8. Add test cases for get_vlans where interface has no VLANs. Revert "Update expected_result.json" This reverts commit 8f986aa.
Ichabond · Apr 14, 2020 · e1679b1 · e1679b1
1 parent 307467c
commit e1679b1
Show file tree

Hide file tree

Showing 6 changed files with 1,728 additions and 0 deletions.
diff --git a/napalm/nxos/nxos.py b/napalm/nxos/nxos.py
@@ -1485,6 +1485,8 @@ def get_vlans(self):
             vlan_table_raw = [vlan_table_raw]
 
         for vlan in vlan_table_raw:
+            if "vlanshowplist-ifidx" not in vlan.keys():
+                vlan["vlanshowplist-ifidx"] = []
             vlans[vlan["vlanshowbr-vlanid"]] = {
                 "name": vlan["vlanshowbr-vlanname"],
                 "interfaces": self._parse_vlan_ports(vlan["vlanshowplist-ifidx"]),

diff --git a/napalm/nxos_ssh/nxos_ssh.py b/napalm/nxos_ssh/nxos_ssh.py
@@ -1521,6 +1521,8 @@ def get_vlans(self):
             vlan_table_raw = [vlan_table_raw]
 
         for vlan in vlan_table_raw:
+            if "vlanshowplist-ifidx" not in vlan.keys():
+                vlan["vlanshowplist-ifidx"] = []
             vlans[vlan["vlanshowbr-vlanid"]] = {
                 "name": vlan["vlanshowbr-vlanname"],
                 "interfaces": self._parse_vlan_ports(vlan["vlanshowplist-ifidx"]),