Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / yang / frr-bgp-neighbor.yang

diff --git a/yang/frr-bgp-neighbor.yang b/yang/frr-bgp-neighbor.yang
index 3b8d63c44714cc5c5e28f923bd2e065b6c01c4f0..5a4c37974f40565c46ef12639a2a2dced0da5557 100644 (file)
--- a/yang/frr-bgp-neighbor.yang
+++ b/yang/frr-bgp-neighbor.yang
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-2-Clause
 submodule frr-bgp-neighbor {
   yang-version 1.1;
 
@@ -5,8 +6,9 @@ submodule frr-bgp-neighbor {
     prefix "bgp";
   }
 
-  include frr-bgp-common-structure;
-  include frr-bgp-common-multiprotocol;
+  include "frr-bgp-common-multiprotocol";
+
+  include "frr-bgp-common-structure";
 
   organization
     "FRRouting";
@@ -93,12 +95,8 @@ submodule frr-bgp-neighbor {
         "Don't send open messages to this neighbor.";
     }
 
-    uses structure-neighbor-group-capability-options;
-
     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.";