Merge pull request #7267 from donaldsharp/plist_relaxer

lib: Relax usage of `ip prefix-list A.B.C.D/M ge Y`
This commit is contained in:
Donatas Abraitis 2020-10-18 09:30:58 +03:00 committed by GitHub
commit 49f66cf17d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -77,11 +77,11 @@ static enum nb_error prefix_list_length_validate(struct nb_cb_modify_args *args)
/* /*
* Check rule: * Check rule:
* prefix length < ge. * prefix length <= ge.
*/ */
if (yang_dnode_exists(args->dnode, xpath_ge)) { if (yang_dnode_exists(args->dnode, xpath_ge)) {
ge = yang_dnode_get_uint8(args->dnode, xpath_ge); ge = yang_dnode_get_uint8(args->dnode, xpath_ge);
if (p.prefixlen >= ge) if (p.prefixlen > ge)
goto log_and_fail; goto log_and_fail;
} }
@ -102,7 +102,7 @@ static enum nb_error prefix_list_length_validate(struct nb_cb_modify_args *args)
log_and_fail: log_and_fail:
snprintfrr( snprintfrr(
args->errmsg, args->errmsg_len, args->errmsg, args->errmsg_len,
"Invalid prefix range for %pFX: Make sure that mask length < ge <= le", "Invalid prefix range for %pFX: Make sure that mask length <= ge <= le",
&p); &p);
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }