[dhcpmon] Classify nested VLAN members as downlinks

dockers/docker-dhcp-relay/cli-plugin-tests/test_show_dhcpmon_counters.py

@@ -35,16 +35,29 @@ def test_plugin_registration():
 
 def test_get_vlan_members_from_config_db():
     mock_db = MagicMock()
-    mock_db.keys.return_value = [
-        "VLAN_MEMBER|Vlan1000|Ethernet1",
-        "VLAN_MEMBER|Vlan1000|Ethernet2",
-        "VLAN_MEMBER|Vlan2000|Ethernet3"
-    ]
+    def mock_keys(_, pattern):
+        if pattern.startswith("VLAN_MEMBER"):
+            return [
+                "VLAN_MEMBER|Vlan1000|Ethernet1",
+                "VLAN_MEMBER|Vlan1000|PortChannel1001",
+                "VLAN_MEMBER|Vlan2000|Ethernet3"
+            ]
+        if pattern == "PORTCHANNEL_MEMBER|*":
+            return [
+                "PORTCHANNEL_MEMBER|PortChannel1001|Ethernet2",
+                "PORTCHANNEL_MEMBER|PortChannel1001|Ethernet4",
+                "PORTCHANNEL_MEMBER|PortChannel2001|Ethernet5"
+            ]
+        return []
+
+    mock_db.keys.side_effect = mock_keys
     result = show_dhcp_relay.get_vlan_members_from_config_db(
         mock_db, "Vlan1000"
     )
     assert result == {
-        "Vlan1000": set(["Ethernet1", "Ethernet2"])
+        "Vlan1000": set([
+            "Ethernet1", "PortChannel1001", "Ethernet2", "Ethernet4"
+        ])
     }
 
 

dockers/docker-dhcp-relay/cli/show/plugins/show_dhcp_relay.py

@@ -77,6 +77,7 @@
 # --- DB Key Separators ---
 
 VLAN_MEMBER_TABLE_PREFIX = "VLAN_MEMBER"
+PORTCHANNEL_MEMBER_TABLE_PREFIX = "PORTCHANNEL_MEMBER"
 COUNTERS_DB_SEPRATOR = ":"
 CONFIG_DB_SEPRATOR = "|"
 MGMT_PORT_TABLE = "MGMT_PORT"
@@ -496,17 +497,33 @@ def get_vlan_members_from_config_db(db, vlan_interface):
     Returns dict: {vlan_name: set(member_interfaces)}
     """
     vlan_members = {}
+    portchannel_members = {}
+    member_pattern = (
+        PORTCHANNEL_MEMBER_TABLE_PREFIX + CONFIG_DB_SEPRATOR + "*"
+    )
+    for key in (db.keys(db.CONFIG_DB, member_pattern) or []):
+        splits = key.split(CONFIG_DB_SEPRATOR)
+        if len(splits) < 3:
+            continue
+        portchannel_members.setdefault(splits[1], set()).add(splits[2])
+
     pattern = (
         VLAN_MEMBER_TABLE_PREFIX + CONFIG_DB_SEPRATOR
         + vlan_interface + "*"
     )
     for key in (db.keys(db.CONFIG_DB, pattern) or []):
         splits = key.split(CONFIG_DB_SEPRATOR)
+        if len(splits) < 3:
+            continue
         if not splits[1].endswith(vlan_interface):
             continue
         if splits[1] not in vlan_members:
             vlan_members[splits[1]] = set()
-        vlan_members[splits[1]].add(splits[2])
+        member = splits[2]
+        vlan_members[splits[1]].add(member)
+        vlan_members[splits[1]].update(
+            portchannel_members.get(member, set())
+        )
     return vlan_members