From efe1ab77edbef64d72820f15c12c835686bb5f2b Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Fri, 2 Oct 2020 12:44:03 -0300 Subject: [PATCH] yang: fix cisco access list network information Don't attempt to put the wildcard information into a 1 byte field otherwise we'll lose information. Signed-off-by: Rafael Zalamena --- yang/frr-filter.yang | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/yang/frr-filter.yang b/yang/frr-filter.yang index 1e44c2569e..400a093178 100644 --- a/yang/frr-filter.yang +++ b/yang/frr-filter.yang @@ -158,9 +158,17 @@ module frr-filter { description "Host to match"; type inet:ipv4-address; } - leaf network { - description "Network to match"; - type inet:ipv4-prefix; + container network { + leaf address { + mandatory true; + description "Network address part."; + type inet:ipv4-address; + } + leaf mask { + mandatory true; + description "Network mask/wildcard part."; + type inet:ipv4-address; + } } leaf source-any { /* @@ -178,9 +186,17 @@ module frr-filter { description "Host to match"; type inet:ipv4-address; } - leaf destination-network { - description "Network to match"; - type inet:ipv4-prefix; + container destination-network { + leaf address { + mandatory true; + description "Network address part."; + type inet:ipv4-address; + } + leaf mask { + mandatory true; + description "Network mask/wildcard part."; + type inet:ipv4-address; + } } leaf destination-any { description "Match any"; -- 2.39.5