From 684a5c8a6b0a1d7d1d34269200c8637e75cf988a Mon Sep 17 00:00:00 2001
From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Fri, 21 May 2021 07:42:46 -0300
Subject: [PATCH] yang: fix BGP multicast prefix type

Fix many of the commands in the `address-family ipv4 multicast` to use
the proper type to avoid wrong YANG model validation failures.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
---
 yang/frr-bgp.yang | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/yang/frr-bgp.yang b/yang/frr-bgp.yang
index a779bb2054..264ad70d65 100644
--- a/yang/frr-bgp.yang
+++ b/yang/frr-bgp.yang
@@ -11,10 +11,6 @@ module frr-bgp {
     prefix inet;
   }
 
-  import ietf-routing-types {
-    prefix rt-types;
-  }
-
   import frr-interface {
     prefix frr-interface;
   }
@@ -23,6 +19,10 @@ module frr-bgp {
     prefix frr-bt;
   }
 
+  import frr-route-types {
+    prefix frr-route-types;
+  }
+
   include "frr-bgp-common";
 
   include "frr-bgp-common-structure";
@@ -405,7 +405,7 @@ module frr-bgp {
       description
         "A list of network routes.";
       leaf prefix {
-        type rt-types:ipv4-multicast-group-address;
+        type frr-route-types:ipv4-multicast-group-prefix;
         description
           "IPv4 multicast destination prefix.";
       }
@@ -425,7 +425,7 @@ module frr-bgp {
       description
         "A list of aggregated routes.";
       leaf prefix {
-        type rt-types:ipv4-multicast-group-address;
+        type frr-route-types:ipv4-multicast-group-prefix;
         description
           "IPv4 multicast destination prefix.";
       }
@@ -438,7 +438,7 @@ module frr-bgp {
       description
         "A list of routes with a particular admin distance.";
       leaf prefix {
-        type rt-types:ipv4-multicast-group-address;
+        type frr-route-types:ipv4-multicast-group-prefix;
         description
           "IPv4 multicast destination prefix.";
       }
@@ -459,7 +459,7 @@ module frr-bgp {
       description
         "A list of network routes.";
       leaf prefix {
-        type rt-types:ipv6-multicast-group-address;
+        type frr-route-types:ipv6-multicast-group-prefix;
         description
           "IPv6 multicast destination prefix.";
       }
@@ -479,7 +479,7 @@ module frr-bgp {
       description
         "A list of aggregated routes.";
       leaf prefix {
-        type rt-types:ipv6-multicast-group-address;
+        type frr-route-types:ipv6-multicast-group-prefix;
         description
           "IPv6 multicast destination prefix.";
       }
@@ -492,7 +492,7 @@ module frr-bgp {
       description
         "A list of routes with a particular admin distance.";
       leaf prefix {
-        type rt-types:ipv6-multicast-group-address;
+        type frr-route-types:ipv6-multicast-group-prefix;
         description
           "IPv6 multicast destination prefix.";
       }
-- 
2.39.5