From ee4b89c784416b9c65f5797a5754a8d3247d3604 Mon Sep 17 00:00:00 2001
From: Chirag Shah <chirag@cumulusnetworks.com>
Date: Tue, 14 Jul 2020 10:55:37 -0700
Subject: [PATCH] yang: move evpn l3vni config under vrf

Move EVPN L3VNI configuration under vrf tree.

augment /frr-vrf:lib/frr-vrf:vrf:
  +--rw zebra
     |
     +--rw vni-id?        vni-id-type
     +--rw prefix-only?   boolean

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
---
 yang/frr-zebra.yang | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang
index 8894eeaa26..7762c75d68 100644
--- a/yang/frr-zebra.yang
+++ b/yang/frr-zebra.yang
@@ -648,6 +648,23 @@ module frr-zebra {
     }
   }
 
+  grouping vrf-vni-mapping {
+    description
+      "EVPN L3-VNI mapping corresponding to a VRF.";
+    leaf l3vni-id {
+      type vni-id-type;
+      description
+        "EVPN L3-VNI id to map to the VRF.";
+    }
+
+    leaf prefix-only {
+      type boolean;
+      default "false";
+      description
+        "EVPN asymmetric mode advertise prefix routes only.";
+    }
+  }
+
   // End of zebra container
   /*
    * RPCs
@@ -2041,7 +2058,11 @@ module frr-zebra {
     description
       "Extends VRF model with Zebra-related parameters.";
     container zebra {
+      description
+        "Zebra's vrf specific configuration and operational model.";
       uses ribs;
+
+      uses vrf-vni-mapping;
     }
   }
 
@@ -2144,26 +2165,6 @@ module frr-zebra {
       description
         "Limit on the number of updates queued to the dataplane subsystem.";
     }
-    list vrf-vni-mapping {
-      key "vrf-id";
-      description
-        "EVPN VNI mapping corresponding to a VRF.";
-      leaf vrf-id {
-        type uint32;
-        description
-          "The identifier for a VRF.";
-      }
-      leaf vni-id {
-        type vni-id-type;
-        description
-          "The VNI id to map to the VRF.";
-      }
-      leaf prefix-only {
-        type empty;
-        description
-          "Prefix routes only.";
-      }
-    }
     /*
      * Debug options
      */