bgpd: shorten names for default originate nb callbacks

Signed-off-by: Chirag Shah <chirag@nvidia.com>

2 files changed, 33 insertions, 3 deletions

diff --git a/yang/frr-bgp-common-structure.yang b/yang/frr-bgp-common-structure.yang
index 991756082..507928f28 100644
--- a/yang/frr-bgp-common-structure.yang
+++ b/yang/frr-bgp-common-structure.yang
@@ -361,18 +361,18 @@ submodule frr-bgp-common-structure {
     description
       "Structural grouping used to include default-originate
        configuration for both BGP neighbors and peer groups.";
-    container default-originate-options {
+    container default-originate {
       description
         "default originate parameters for the BGP neighbor or
          group.";
-      leaf send-default-route {
+      leaf originate {
         type boolean;
         default "false";
         description
           "If set to 'true', send the default-route to the neighbour(s).";
       }
 
-      leaf rmap-policy-export {
+      leaf route-map {
         type frr-route-map:route-map-ref;
         description
           "Route-map to specify criteria to originate default.";
diff --git a/yang/frr-bgp.yang b/yang/frr-bgp.yang
index b55526756..2fb5d13fa 100644
--- a/yang/frr-bgp.yang
+++ b/yang/frr-bgp.yang
@@ -577,6 +577,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -603,6 +605,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -629,6 +633,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -655,6 +661,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -681,6 +689,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -824,6 +834,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -850,6 +862,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -876,6 +890,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -902,6 +918,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -928,6 +946,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -1071,6 +1091,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -1097,6 +1119,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -1123,6 +1147,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -1149,6 +1175,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;
@@ -1175,6 +1203,8 @@ module frr-bgp {
 
     uses structure-neighbor-group-as-path-options;
 
+    uses structure-neighbor-default-originate-options;
+
     uses structure-neighbor-group-attr-unchanged;
 
     uses structure-neighbor-group-orf-capability;