bgpd: Refactor subgroup_announce_table() to reuse an existing helpers

[mirror_frr.git] / yang / frr-nexthop.yang

diff --git a/yang/frr-nexthop.yang b/yang/frr-nexthop.yang
index 619514de7d4b2e50a8981f4c006fa7160dd20345..d73fdb8bd3d67d3b462a9688962bddc924535b27 100644 (file)
--- a/yang/frr-nexthop.yang
+++ b/yang/frr-nexthop.yang
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-2-Clause
 module frr-nexthop {
   yang-version 1.1;
   namespace "http://frrouting.org/yang/nexthop";
@@ -61,7 +62,7 @@ module frr-nexthop {
     type union {
       type inet:ip-address;
       type string {
-        pattern '';
+        length "0";
       }
     }
   }
@@ -160,6 +161,7 @@ module frr-nexthop {
       description
         "The nexthop vrf name, if different from the route.";
     }
+
     leaf gateway {
       type frr-nexthop:optional-ip-address;
       description
@@ -173,15 +175,12 @@ module frr-nexthop {
     }
 
     leaf bh-type {
-      when "../nh-type = 'blackhole'";
       type blackhole-type;
       description
         "A blackhole sub-type, if the nexthop is a blackhole type.";
     }
 
     leaf onlink {
-      when "../nh-type = 'ip4-ifindex' or
-            ../nh-type = 'ip6-ifindex'";
       type boolean;
       default "false";
       description