yang: replace dummy rmap-ref with actual route-map leafref

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/yang/frr-bgp-common-structure.yang b/yang/frr-bgp-common-structure.yang
index 8162527e900ecfefe81b112adad47b9c693fa49f..6543b1d1c39058e7fc8d46d97714565e697f720b 100644 (file)
--- a/yang/frr-bgp-common-structure.yang
+++ b/yang/frr-bgp-common-structure.yang
@@ -9,6 +9,10 @@ submodule frr-bgp-common-structure {
     prefix inet;
   }
 
+  import frr-route-map {
+    prefix frr-route-map;
+  }
+
   import frr-interface {
     prefix frr-interface;
   }
@@ -371,7 +375,7 @@ submodule frr-bgp-common-structure {
       }
 
       leaf rmap-policy-export {
-        type frr-bt:rmap-ref;
+        type frr-route-map:route-map-ref;
         description
           "Route-map to specify criteria to originate default.";
       }

diff --git a/yang/frr-bgp-common.yang b/yang/frr-bgp-common.yang
index 188cf856dbc230834d20179014424998f57bd82a..96ec9dc969d11c08d87826efccdcf648db966390 100644 (file)
--- a/yang/frr-bgp-common.yang
+++ b/yang/frr-bgp-common.yang
@@ -17,6 +17,10 @@ submodule frr-bgp-common {
     prefix frr-bt;
   }
 
+  import frr-route-map {
+    prefix frr-route-map;
+  }
+
   import frr-route-types {
     prefix frr-rt-type;
   }
@@ -73,25 +77,25 @@ submodule frr-bgp-common {
 
   grouping rmap-policy-import {
     leaf rmap-import {
-      type frr-bt:rmap-ref;
+      type frr-route-map:route-map-ref;
     }
   }
 
   grouping rmap-policy-export {
     leaf rmap-export {
-      type frr-bt:rmap-ref;
+      type frr-route-map:route-map-ref;
     }
   }
 
   grouping unsupress-map-policy-import {
     leaf unsupress-map-import {
-      type frr-bt:rmap-ref;
+      type frr-route-map:route-map-ref;
     }
   }
 
   grouping unsupress-map-policy-export {
     leaf unsupress-map-export {
-      type frr-bt:rmap-ref;
+      type frr-route-map:route-map-ref;
     }
   }
 
@@ -728,7 +732,7 @@ submodule frr-bgp-common {
       }
 
       leaf rmap-policy-import {
-        type frr-bt:rmap-ref;
+        type frr-route-map:route-map-ref;
         description
           "Route-map to be applied for redistributed routes into the bgp.";
       }
@@ -743,7 +747,7 @@ submodule frr-bgp-common {
     }
 
     leaf rmap-policy-export {
-      type frr-bt:rmap-ref;
+      type frr-route-map:route-map-ref;
       description
         "Route-map to modify the attributes for Routes going out
          via BGP updates.";
@@ -771,7 +775,7 @@ submodule frr-bgp-common {
     }
 
     leaf rmap-policy-export {
-      type frr-bt:rmap-ref;
+      type frr-route-map:route-map-ref;
       description
         "Apply route map to aggregate network.";
     }
@@ -1097,7 +1101,7 @@ submodule frr-bgp-common {
         }
 
         leaf rmap-policy-export {
-          type frr-bt:rmap-ref;
+          type frr-route-map:route-map-ref;
           description
             "Route-map to modify the attributes for Routes going out
              via BGP updates.";

diff --git a/yang/frr-bgp-types.yang b/yang/frr-bgp-types.yang
index 0afdea1ba63c1fbfa65c306a095ae1b89dd3e189..55834df2ee520ed4ca74e75e723a350facf309e0 100644 (file)
--- a/yang/frr-bgp-types.yang
+++ b/yang/frr-bgp-types.yang
@@ -41,10 +41,6 @@ module frr-bgp-types {
       "Initial revision.";
   }
 
-  typedef rmap-ref {
-    type string;
-  }
-
   typedef plist-ref {
     type string;
   }

diff --git a/yang/frr-ospfd.yang b/yang/frr-ospfd.yang
index 466dd42ce4a2539bb77206a72906c35b365616e0..42a7e8784ce86608bfe710979064dd299cd5322b 100644 (file)
--- a/yang/frr-ospfd.yang
+++ b/yang/frr-ospfd.yang
@@ -15,6 +15,10 @@ module frr-ospfd {
     prefix frr-interface;
   }
 
+  import frr-route-map {
+    prefix frr-route-map;
+  }
+
   import frr-route-types {
     prefix frr-route-types;
   }
@@ -41,10 +45,6 @@ module frr-ospfd {
   }
 
   /* Policy types to be removed later, once policy Yang finalized */
-  typedef rmap-ref {
-    type string;
-  }
-
   typedef plist-ref {
     type string;
   }
@@ -425,7 +425,7 @@ module frr-ospfd {
     }
 
     leaf route-map {
-      type rmap-ref;
+      type frr-route-map:route-map-ref;
       description
         "Route map reference.";
     }