[IOS][get_vlans()] Parse VLAN IDs when private VLANs are implemented

napalm/ios/ios.py

@@ -3741,15 +3741,18 @@ def get_vlans(self):
         if output.find("Invalid input detected") >= 0:
             return self._get_vlan_from_id()
         else:
-            return self._get_vlan_all_ports(output)
+            return self._get_vlan_all_ports(output, _vlan_id=None, _vlan_name=None)
 
-    def _get_vlan_all_ports(self, output):
+    def _get_vlan_all_ports(self, output, _vlan_id, _vlan_name):
         find_regexp = re.compile(
             r"^(\d+)\s+"  # vlan id
             r"(.*?(?=active|act\/[isl]{1}shut|act\/unsup))"  # vlan name
             r"\w+(?:\/\w+)?\S+(\s+[A-Z][a-z].*)?$"  # ports
         )
         continuation_regexp = re.compile(r"^\s+([A-Z][a-z].*)$")
+        match_pvlan_regexp = re.compile(
+            r"^(\d+)\s+(\S+)\s+(community|isolated)?\s+(\s+[A-Z][a-z].*)?$"
+        )
         output = output.splitlines()
         vlans = {}
 
@@ -3759,20 +3762,31 @@ def _get_vlan_all_ports(self, output):
         interfaces = ""
         for line in output:
             vlan_m = find_regexp.match(line)
+            p_vlan_m = match_pvlan_regexp.match(line)
             if vlan_m:
                 was_vlan_or_cont = True
                 vlan_id = vlan_m.group(1)
                 vlan_name = vlan_m.group(2).strip()
                 interfaces = vlan_m.group(3) or ""
                 vlans[vlan_id] = {"name": vlan_name, "interfaces": []}
+            if p_vlan_m:
+                was_vlan_or_cont = True
+                p_vlan_id = p_vlan_m.group(2)
+                vlan_name = (
+                    vlans.get(vlan_id)["name"]
+                    if vlans.get(vlan_id)
+                    else p_vlan_m.group(2)
+                )
+                interfaces = p_vlan_m.group(4) or ""
+                vlans[p_vlan_id] = {"name": vlan_name, "interfaces": []}
 
             cont_m = None
             if was_vlan_or_cont:
                 cont_m = continuation_regexp.match(line)
                 if cont_m:
                     interfaces = cont_m.group(1)
 
-            if not cont_m and not vlan_m:
+            if not cont_m and not (vlan_m or p_vlan_m):
                 was_vlan_or_cont = False
                 continue
 
@@ -3784,17 +3798,20 @@ def _get_vlan_all_ports(self, output):
                 ]
             )
 
+        if vlans and len(vlans) > 1:
+            del vlans[vlan_id]
+
         return vlans
 
     def _get_vlan_from_id(self):
-        command = "show vlan brief"
+        command = "show vlan"
         output = self._send_command(command)
         vlan_regexp = r"^(\d+)\W+(.*?(?=active|act\/[isl]{1}shut|act\/unsup))"
         find_vlan = re.findall(vlan_regexp, output, re.MULTILINE)
         vlans = {}
         for vlan_id, vlan_name in find_vlan:
             output = self._send_command("show vlan id {}".format(vlan_id))
-            _vlans = self._get_vlan_all_ports(output)
+            _vlans = self._get_vlan_all_ports(output, vlan_id, vlan_name)
             if len(_vlans) == 0:
                 vlans[vlan_id] = {"name": vlan_name.strip(), "interfaces": []}
             elif len(_vlans) == 1:

test/ios/mocked_data/test_get_vlans/no_show_vlan_all_ports/expected_result.json

@@ -8,6 +8,28 @@
       "GigabitEthernet0/20"
     ]
   },
+  "500": {
+    "name": "VLAN500",
+    "interfaces": [
+      "GigabitEthernet1/1",
+      "GigabitEthernet1/2",
+      "GigabitEthernet1/3"
+    ]
+  },
+  "501": {
+    "name": "Vlan501",
+    "interfaces": [
+      "GigabitEthernet1/1",
+      "GigabitEthernet1/2"
+    ]
+  },
+  "502": {
+    "name": "VLAN502",
+    "interfaces": [
+      "GigabitEthernet1/1",
+      "GigabitEthernet1/3"
+    ]
+  },
   "710": {
     "name": "Vlan710",
     "interfaces": [

test/ios/mocked_data/test_get_vlans/no_show_vlan_all_ports/show_vlan_brief.txt → test/ios/mocked_data/test_get_vlans/no_show_vlan_all_ports/show_vlan.txt

@@ -1,6 +1,9 @@
 VLAN Name                             Status    Ports
 ---- -------------------------------- --------- -------------------------------
 1    default                          active    Gi0/17, Gi0/18, Gi0/19, Gi0/20
+500  VLAN500                          active
+501  Vlan501                          active
+502  VLAN502                          active
 710  Vlan710                          active
 736  Vlan736                          active
 748  Vlan748                          active
@@ -11,4 +14,6 @@ VLAN Name                             Status    Ports
 1002 Vlan1002                         act/unsup
 1003 Vlan1003                         act/unsup
 1004 Vlan1004                         act/unsup
-1005 Vlan1005                         act/unsup
+1005 Vlan1005                         act/unsup
+500     501       community         Gi1/1, Gi1/2
+500     502       isolated          Gi1/1, Gi1/3

test/ios/mocked_data/test_get_vlans/no_show_vlan_all_ports/show_vlan_id_500.txt

@@ -0,0 +1,16 @@
+VLAN Name                             Status    Ports
+---- -------------------------------- --------- -------------------------------
+500  VLAN0500                         active
+
+VLAN Type  SAID       MTU   Parent RingNo BridgeNo Stp  BrdgMode Trans1 Trans2
+---- ----- ---------- ----- ------ ------ -------- ---- -------- ------ ------
+500  enet  100500     1500  -      -      -        -    -        0      0
+
+Remote SPAN VLAN
+----------------
+Disabled
+
+Primary Secondary Type              Ports
+------- --------- ----------------- ------------------------------------------
+500     501       community         Gi1/1, Gi1/2
+500     502       isolated          Gi1/1, Gi1/3

test/ios/mocked_data/test_get_vlans/no_show_vlan_all_ports/show_vlan_id_501.txt

@@ -0,0 +1,15 @@
+VLAN Name                             Status    Ports
+---- -------------------------------- --------- -------------------------------
+501  VLAN0501                         active
+
+VLAN Type  SAID       MTU   Parent RingNo BridgeNo Stp  BrdgMode Trans1 Trans2
+---- ----- ---------- ----- ------ ------ -------- ---- -------- ------ ------
+501  enet  100501     1500  -      -      -        -    -        0      0
+
+Remote SPAN VLAN
+----------------
+Disabled
+
+Primary Secondary Type              Ports
+------- --------- ----------------- ------------------------------------------
+500     501       community         Gi1/1, Gi1/2

test/ios/mocked_data/test_get_vlans/no_show_vlan_all_ports/show_vlan_id_502.txt

@@ -0,0 +1,15 @@
+VLAN Name                             Status    Ports
+---- -------------------------------- --------- -------------------------------
+502  VLAN0502                         active
+
+VLAN Type  SAID       MTU   Parent RingNo BridgeNo Stp  BrdgMode Trans1 Trans2
+---- ----- ---------- ----- ------ ------ -------- ---- -------- ------ ------
+502  enet  100502     1500  -      -      -        -    -        0      0
+
+Remote SPAN VLAN
+----------------
+Disabled
+
+Primary Secondary Type              Ports
+------- --------- ----------------- ------------------------------------------
+500     502       isolated          Gi1/1, Gi1/3