diff options
Diffstat (limited to 'yang')
| -rw-r--r-- | yang/frr-bfdd.yang | 3 | ||||
| -rw-r--r-- | yang/frr-eigrpd.yang | 2 | ||||
| -rw-r--r-- | yang/frr-gmp.yang | 21 | ||||
| -rw-r--r-- | yang/frr-isisd.yang | 4 | ||||
| -rw-r--r-- | yang/frr-pim.yang | 49 | ||||
| -rw-r--r-- | yang/frr-route-map.yang | 6 | ||||
| -rw-r--r-- | yang/frr-zebra.yang | 1 | ||||
| -rw-r--r-- | yang/ietf/frr-deviations-ietf-routing.yang | 3 | ||||
| -rw-r--r-- | yang/ietf/ietf-bgp-types.yang | 2 |
9 files changed, 79 insertions, 12 deletions
diff --git a/yang/frr-bfdd.yang b/yang/frr-bfdd.yang index ffba42b53b..02ed921459 100644 --- a/yang/frr-bfdd.yang +++ b/yang/frr-bfdd.yang @@ -16,9 +16,6 @@ module frr-bfdd { import frr-vrf { prefix frr-vrf; } - import frr-route-types { - prefix frr-route-types; - } organization "FRRouting"; contact diff --git a/yang/frr-eigrpd.yang b/yang/frr-eigrpd.yang index f672dd5571..d3d9db2f62 100644 --- a/yang/frr-eigrpd.yang +++ b/yang/frr-eigrpd.yang @@ -75,7 +75,7 @@ module frr-eigrpd { typedef autonomous-system { description "Administrative domain identification for a network"; type uint16 { - range 1..65535; + range "1..65535"; } } diff --git a/yang/frr-gmp.yang b/yang/frr-gmp.yang index c8a05a2bdb..e6a1f7f640 100644 --- a/yang/frr-gmp.yang +++ b/yang/frr-gmp.yang @@ -147,10 +147,10 @@ module frr-gmp { expected packet loss on a network."; } - list static-group { + list join-group { key "group-addr source-addr"; description - "A static multicast route, (*,G) or (S,G). + "A static GMP join, (*,G) or (S,G). The version of IGMP must be 3 to support (S,G)."; leaf group-addr { @@ -164,6 +164,23 @@ module frr-gmp { "Multicast source address."; } } + + list static-group { + key "group-addr source-addr"; + description + "A static multicast group without GMP, (*,G) or (S,G)."; + + leaf group-addr { + type rt-types:ip-multicast-group-address; + description + "Multicast group address."; + } + leaf source-addr { + type inet:ip-address; + description + "Multicast source address."; + } + } } // interface-config-attributes /* diff --git a/yang/frr-isisd.yang b/yang/frr-isisd.yang index d1a08fa976..60914b0be9 100644 --- a/yang/frr-isisd.yang +++ b/yang/frr-isisd.yang @@ -685,7 +685,7 @@ module frr-isisd { type uint32 { range "0..16777215"; } - must ". < 64 or /frr-isisd:isis/instance[area-tag = current()/../../area-tag]/metric-style = 'wide' or not(/frr-isisd:isis/instance[area-tag = current()/../../area-tag]/metric-style)"; + must ". < 64 or not(/frr-isisd:isis/instance[area-tag = current()/../../area-tag]/metric-style) or /frr-isisd:isis/instance[area-tag = current()/../../area-tag]/metric-style != 'narrow'"; default "10"; description "Default level-1 metric for this IS-IS circuit."; @@ -695,7 +695,7 @@ module frr-isisd { type uint32 { range "0..16777215"; } - must ". < 64 or /frr-isisd:isis/instance[area-tag = current()/../../area-tag]/metric-style = 'wide' or not(/frr-isisd:isis/instance[area-tag = current()/../../area-tag]/metric-style)"; + must ". < 64 or not(/frr-isisd:isis/instance[area-tag = current()/../../area-tag]/metric-style) or /frr-isisd:isis/instance[area-tag = current()/../../area-tag]/metric-style != 'narrow'"; default "10"; description "Default level-2 metric for this IS-IS circuit."; diff --git a/yang/frr-pim.yang b/yang/frr-pim.yang index 732a38a9e3..6a6c52185d 100644 --- a/yang/frr-pim.yang +++ b/yang/frr-pim.yang @@ -5,6 +5,10 @@ module frr-pim { prefix frr-pim; + import frr-filter { + prefix frr-filter; + } + import frr-interface { prefix frr-interface; } @@ -118,6 +122,37 @@ module frr-pim { } } + grouping msdp-authentication { + description + "MSDP authentication options."; + + leaf authentication-type { + type enumeration { + enum None { + value 0; + description + "No authentication."; + } + enum MD5 { + value 1; + description + "Use MD5 digest."; + } + } + default None; + description + "Authentication method."; + } + + leaf authentication-key { + when "../authentication-type = 'MD5'"; + mandatory true; + type string; + description + "Authentication key."; + } + } + grouping global-pim-config-attributes { description "A grouping defining per address family pim global attributes"; @@ -267,6 +302,20 @@ module frr-pim { description "MSDP source IP address."; } + + leaf sa-filter-in { + type frr-filter:access-list-name; + description + "Access list name used to filter the incoming SAs exchanged."; + } + + leaf sa-filter-out { + type frr-filter:access-list-name; + description + "Access list name used to filter the outgoing SAs exchanged."; + } + + uses msdp-authentication; } container mlag { diff --git a/yang/frr-route-map.yang b/yang/frr-route-map.yang index 26d56acc03..c875a6ec7f 100644 --- a/yang/frr-route-map.yang +++ b/yang/frr-route-map.yang @@ -360,16 +360,16 @@ module frr-route-map { case set-min-metric { when "derived-from-or-self(../action, 'set-min-metric')"; - choice minimun-metric-value { + choice minimum-metric-value { description - "Mimimum metric to set or use"; + "Minimum metric to set or use"; case min-metric { leaf min-metric { type uint32 { range "0..4294967295"; } description - "Use the following mimumn metric value"; + "Use the following minimum metric value"; } } } diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang index 4aa368e57f..f97a4cc129 100644 --- a/yang/frr-zebra.yang +++ b/yang/frr-zebra.yang @@ -626,6 +626,7 @@ module frr-zebra { leaf table-id { type uint32; + default "254"; description "Routing Table id (default id - 254)."; } diff --git a/yang/ietf/frr-deviations-ietf-routing.yang b/yang/ietf/frr-deviations-ietf-routing.yang index 15ceb6b929..5c0ae30bea 100644 --- a/yang/ietf/frr-deviations-ietf-routing.yang +++ b/yang/ietf/frr-deviations-ietf-routing.yang @@ -6,6 +6,9 @@ module frr-deviations-ietf-routing { import ietf-routing { prefix ietf-routing; } + import ietf-rip { + prefix ietf-rip; + } organization "FRRouting"; diff --git a/yang/ietf/ietf-bgp-types.yang b/yang/ietf/ietf-bgp-types.yang index 9c7a6af76c..ed64b78ad6 100644 --- a/yang/ietf/ietf-bgp-types.yang +++ b/yang/ietf/ietf-bgp-types.yang @@ -333,7 +333,7 @@ module ietf-bgp-types { // TODO: needs more work to make this more precise given the // variability of extended community attribute specifications // 8-octet value: - // <type> 2 octects + // <type> 2 octets // <value> 6 octets type union { |