From 0213a658006216ddcd796b77c040797b1f5a01a4 Mon Sep 17 00:00:00 2001
From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Tue, 20 Apr 2021 14:54:01 -0300
Subject: [PATCH] yang: rework PIM MSDP mesh group

Allow PIM MSDP configuration to support multiple MSDP mesh groups per
PIM instance.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
---
 yang/frr-pim.yang | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/yang/frr-pim.yang b/yang/frr-pim.yang
index 70adb37b26..4c4819ac25 100644
--- a/yang/frr-pim.yang
+++ b/yang/frr-pim.yang
@@ -174,26 +174,36 @@ module frr-pim {
         "Enable ssmpingd operation.";
     }
 
-    container msdp-mesh-group {
-      presence
-        "Configure MSDP mesh-group.";
+    list msdp-mesh-groups {
+      key "name";
+      description
+        "RFC 3618 Section 10.2. MSDP mesh-group semantics
 
-      leaf mesh-group-name {
-        type string;
+         Groups multiple MSDP peers to reduce SA flooding typically used
+         in intra-domain settings.";
+
+      leaf name {
+        type string {
+          length 1..64;
+        }
         description
-          "MSDP mesh group name.";
+          "The mesh group name.";
       }
 
-      leaf-list member-ip {
+      leaf source {
         type inet:ip-address;
         description
-          "Peer ip address.";
+          "Source IP address for the TCP connections.";
       }
 
-      leaf source-ip {
-        type inet:ip-address;
-        description
-          "Source ip address for the TCP connection.";
+      list members {
+        key "address";
+
+        leaf address {
+          type inet:ip-address;
+          description
+            "Peer member IP address.";
+        }
       }
     }
 
-- 
2.39.5