Merge pull request #7312 from idryzhov/fix-ip-router-isis

isisd: fix check for area-tag modification
This commit is contained in:
Donald Sharp 2020-10-15 07:09:39 -04:00 committed by GitHub
commit 160d7cb157
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2075,7 +2075,6 @@ int lib_interface_isis_area_tag_modify(struct nb_cb_modify_args *args)
struct interface *ifp;
struct vrf *vrf;
const char *area_tag, *ifname, *vrfname;
struct isis *isis = NULL;
if (args->event == NB_EV_VALIDATE) {
/* libyang doesn't like relative paths across module boundaries
@ -2091,11 +2090,7 @@ int lib_interface_isis_area_tag_modify(struct nb_cb_modify_args *args)
if (!ifp)
return NB_OK;
isis = isis_lookup_by_vrfid(ifp->vrf_id);
if (isis == NULL)
return NB_ERR_VALIDATION;
circuit = circuit_lookup_by_ifp(ifp, isis->init_circ_list);
circuit = circuit_scan_by_ifp(ifp);
area_tag = yang_dnode_get_string(args->dnode, NULL);
if (circuit && circuit->area && circuit->area->area_tag
&& strcmp(circuit->area->area_tag, area_tag)) {