bgpd: neighbor peergrp config to transactional cli

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

4 files changed, 32 insertions, 7 deletions

diff --git a/yang/frr-bgp-common-structure.yang b/yang/frr-bgp-common-structure.yang
index 6543b1d1c..e17aa2783 100644
--- a/yang/frr-bgp-common-structure.yang
+++ b/yang/frr-bgp-common-structure.yang
@@ -110,7 +110,6 @@ submodule frr-bgp-common-structure {
     container local-as {
       leaf local-as {
         type inet:as-number;
-        mandatory true;
         description
           "The local autonomous system number that is to be used when
            establishing sessions with the remote peer or peer group, if
@@ -200,7 +199,6 @@ submodule frr-bgp-common-structure {
     container neighbor-remote-as {
       leaf remote-as-type {
         type frr-bt:as-type;
-        mandatory true;
         description
           "Remote AS type.";
       }
@@ -598,7 +596,7 @@ submodule frr-bgp-common-structure {
 
       leaf send-large-community {
         type boolean;
-        default "false";
+        default "true";
         description
           "Send large community attribute to this neighbor.";
       }
@@ -614,7 +612,6 @@ submodule frr-bgp-common-structure {
         "BGP Administrative Shutdown Communication.";
       leaf enable {
         type boolean;
-        mandatory true;
         description
           "When set to 'true', BGP shutdown communication is enabled.";
       }
diff --git a/yang/frr-bgp-neighbor.yang b/yang/frr-bgp-neighbor.yang
index 3b8d63c44..a4b50b156 100644
--- a/yang/frr-bgp-neighbor.yang
+++ b/yang/frr-bgp-neighbor.yang
@@ -97,8 +97,6 @@ submodule frr-bgp-neighbor {
 
     uses neighbor-update-source;
 
-    uses neighbor-remote-as;
-
     uses structure-neighbor-group-ebgp-multihop;
 
     uses neighbor-local-as-options;
@@ -124,7 +122,6 @@ submodule frr-bgp-neighbor {
 
         leaf enabled {
           type boolean;
-          default "false";
           description
             "This leaf indicates whether the IPv4 Unicast AFI, SAFI is
              enabled for the neighbour or group.";
diff --git a/yang/frr-bgp-peer-group.yang b/yang/frr-bgp-peer-group.yang
index 3ce628d2b..452ff1a12 100644
--- a/yang/frr-bgp-peer-group.yang
+++ b/yang/frr-bgp-peer-group.yang
@@ -9,6 +9,10 @@ submodule frr-bgp-peer-group {
     prefix inet;
   }
 
+  import frr-bgp-types {
+    prefix frr-bt;
+  }
+
   include frr-bgp-common-structure;
   include frr-bgp-neighbor;
 
@@ -72,6 +76,8 @@ submodule frr-bgp-peer-group {
         "Configure BGP dynamic neighbors listen range.";
     }
 
+    uses neighbor-remote-as;
+
     uses neighbor-parameters;
   }
 
diff --git a/yang/frr-bgp.yang b/yang/frr-bgp.yang
index 820c4b286..b55526756 100644
--- a/yang/frr-bgp.yang
+++ b/yang/frr-bgp.yang
@@ -19,6 +19,10 @@ module frr-bgp {
     prefix frr-interface;
   }
 
+  import frr-bgp-types {
+    prefix frr-bt;
+  }
+
   include "frr-bgp-common-structure";
 
   include "frr-bgp-common";
@@ -206,6 +210,25 @@ module frr-bgp {
               "The peer-group with which this neighbor is associated.";
           }
 
+          container neighbor-remote-as {
+            leaf remote-as-type {
+              type frr-bt:as-type;
+              mandatory true;
+              description
+                "Remote AS type.";
+            }
+
+            leaf remote-as {
+              when "../remote-as-type = 'as-specified'";
+              type inet:as-number;
+              description
+                "The remote autonomous system number received in
+                 the BGP OPEN message.";
+              reference
+                "RFC 4271";
+            }
+          }
+
           uses neighbor-parameters;
         }
 
@@ -238,6 +261,8 @@ module frr-bgp {
               "The peer-group with which this neighbor is associated.";
           }
 
+          uses neighbor-remote-as;
+
           uses neighbor-parameters;
         }
       }