]> git.proxmox.com Git - mirror_frr.git/blobdiff - isisd/isis_northbound.c
lib: enforce vrf_name_to_id by returning default_vrf when name is null
[mirror_frr.git] / isisd / isis_northbound.c
index f55a0ccf34605febcbc7adfddc109b3af604e34b..a4672828260fa0e846b842a82e5857d383f49c40 100644 (file)
@@ -253,31 +253,19 @@ static int isis_instance_dynamic_hostname_modify(enum nb_event event,
 /*
  * XPath: /frr-isisd:isis/instance/attached
  */
-static int isis_instance_attached_create(enum nb_event event,
+static int isis_instance_attached_modify(enum nb_event event,
                                         const struct lyd_node *dnode,
                                         union nb_resource *resource)
 {
        struct isis_area *area;
+       bool attached;
 
        if (event != NB_EV_APPLY)
                return NB_OK;
 
        area = yang_dnode_get_entry(dnode, true);
-       isis_area_attached_bit_set(area, true);
-
-       return NB_OK;
-}
-
-static int isis_instance_attached_delete(enum nb_event event,
-                                        const struct lyd_node *dnode)
-{
-       struct isis_area *area;
-
-       if (event != NB_EV_APPLY)
-               return NB_OK;
-
-       area = yang_dnode_get_entry(dnode, true);
-       isis_area_attached_bit_set(area, false);
+       attached = yang_dnode_get_bool(dnode, NULL);
+       isis_area_attached_bit_set(area, attached);
 
        return NB_OK;
 }
@@ -285,31 +273,19 @@ static int isis_instance_attached_delete(enum nb_event event,
 /*
  * XPath: /frr-isisd:isis/instance/overload
  */
-static int isis_instance_overload_create(enum nb_event event,
+static int isis_instance_overload_modify(enum nb_event event,
                                         const struct lyd_node *dnode,
                                         union nb_resource *resource)
 {
        struct isis_area *area;
+       bool overload;
 
        if (event != NB_EV_APPLY)
                return NB_OK;
 
        area = yang_dnode_get_entry(dnode, true);
-       isis_area_overload_bit_set(area, true);
-
-       return NB_OK;
-}
-
-static int isis_instance_overload_delete(enum nb_event event,
-                                        const struct lyd_node *dnode)
-{
-       struct isis_area *area;
-
-       if (event != NB_EV_APPLY)
-               return NB_OK;
-
-       area = yang_dnode_get_entry(dnode, true);
-       isis_area_overload_bit_set(area, false);
+       overload = yang_dnode_get_bool(dnode, NULL);
+       isis_area_overload_bit_set(area, overload);
 
        return NB_OK;
 }
@@ -339,7 +315,7 @@ static int isis_instance_metric_style_modify(enum nb_event event,
 /*
  * XPath: /frr-isisd:isis/instance/purge-originator
  */
-static int isis_instance_purge_originator_create(enum nb_event event,
+static int isis_instance_purge_originator_modify(enum nb_event event,
                                                 const struct lyd_node *dnode,
                                                 union nb_resource *resource)
 {
@@ -349,21 +325,7 @@ static int isis_instance_purge_originator_create(enum nb_event event,
                return NB_OK;
 
        area = yang_dnode_get_entry(dnode, true);
-       area->purge_originator = true;
-
-       return NB_OK;
-}
-
-static int isis_instance_purge_originator_delete(enum nb_event event,
-                                                const struct lyd_node *dnode)
-{
-       struct isis_area *area;
-
-       if (event != NB_EV_APPLY)
-               return NB_OK;
-
-       area = yang_dnode_get_entry(dnode, true);
-       area->purge_originator = false;
+       area->purge_originator = yang_dnode_get_bool(dnode, NULL);
 
        return NB_OK;
 }
@@ -845,36 +807,74 @@ static int isis_instance_domain_password_authenticate_snp_modify(
 /*
  * XPath: /frr-isisd:isis/instance/default-information-originate/ipv4
  */
+static void default_info_origin_apply_finish(const struct lyd_node *dnode,
+                                            int family)
+{
+       int originate_type = DEFAULT_ORIGINATE;
+       unsigned long metric = 0;
+       const char *routemap = NULL;
+       struct isis_area *area = yang_dnode_get_entry(dnode, true);
+       int level = yang_dnode_get_enum(dnode, "./level");
+
+       if (yang_dnode_get_bool(dnode, "./always")) {
+               originate_type = DEFAULT_ORIGINATE_ALWAYS;
+       } else if (family == AF_INET6) {
+               zlog_warn(
+                       "%s: Zebra doesn't implement default-originate for IPv6 yet, so use with care or use default-originate always.",
+                       __func__);
+       }
+
+       if (yang_dnode_exists(dnode, "./metric"))
+               metric = yang_dnode_get_uint32(dnode, "./metric");
+       else if (yang_dnode_exists(dnode, "./route-map"))
+               routemap = yang_dnode_get_string(dnode, "./route-map");
+
+       isis_redist_set(area, level, family, DEFAULT_ROUTE, metric, routemap,
+                       originate_type);
+}
+
+static void default_info_origin_ipv4_apply_finish(const struct lyd_node *dnode)
+{
+       default_info_origin_apply_finish(dnode, AF_INET);
+}
+
+static void default_info_origin_ipv6_apply_finish(const struct lyd_node *dnode)
+{
+       default_info_origin_apply_finish(dnode, AF_INET6);
+}
+
 static int isis_instance_default_information_originate_ipv4_create(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
 static int isis_instance_default_information_originate_ipv4_delete(
        enum nb_event event, const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       struct isis_area *area;
+       int level;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       area = yang_dnode_get_entry(dnode, true);
+       level = yang_dnode_get_enum(dnode, "./level");
+       isis_redist_unset(area, level, AF_INET, DEFAULT_ROUTE);
+
        return NB_OK;
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/default-information-originate/ipv4/always
  */
-static int isis_instance_default_information_originate_ipv4_always_create(
+static int isis_instance_default_information_originate_ipv4_always_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
-
-static int isis_instance_default_information_originate_ipv4_always_delete(
-       enum nb_event event, const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
@@ -885,14 +885,14 @@ static int isis_instance_default_information_originate_ipv4_route_map_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
 static int isis_instance_default_information_originate_ipv4_route_map_delete(
        enum nb_event event, const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
@@ -903,14 +903,14 @@ static int isis_instance_default_information_originate_ipv4_metric_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
 static int isis_instance_default_information_originate_ipv4_metric_delete(
        enum nb_event event, const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
@@ -921,32 +921,34 @@ static int isis_instance_default_information_originate_ipv6_create(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
 static int isis_instance_default_information_originate_ipv6_delete(
        enum nb_event event, const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       struct isis_area *area;
+       int level;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       area = yang_dnode_get_entry(dnode, true);
+       level = yang_dnode_get_enum(dnode, "./level");
+       isis_redist_unset(area, level, AF_INET6, DEFAULT_ROUTE);
+
        return NB_OK;
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/default-information-originate/ipv6/always
  */
-static int isis_instance_default_information_originate_ipv6_always_create(
+static int isis_instance_default_information_originate_ipv6_always_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
-
-static int isis_instance_default_information_originate_ipv6_always_delete(
-       enum nb_event event, const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
@@ -957,14 +959,14 @@ static int isis_instance_default_information_originate_ipv6_route_map_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
 static int isis_instance_default_information_originate_ipv6_route_map_delete(
        enum nb_event event, const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
@@ -975,32 +977,72 @@ static int isis_instance_default_information_originate_ipv6_metric_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
 static int isis_instance_default_information_originate_ipv6_metric_delete(
        enum nb_event event, const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       /* It's all done by default_info_origin_apply_finish */
        return NB_OK;
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/redistribute/ipv4
  */
+static void redistribute_apply_finish(const struct lyd_node *dnode, int family)
+{
+       assert(family == AF_INET || family == AF_INET6);
+       int type, level;
+       unsigned long metric = 0;
+       const char *routemap = NULL;
+       struct isis_area *area;
+
+       type = yang_dnode_get_enum(dnode, "./protocol");
+       level = yang_dnode_get_enum(dnode, "./level");
+       area = yang_dnode_get_entry(dnode, true);
+
+       if (yang_dnode_exists(dnode, "./metric"))
+               metric = yang_dnode_get_uint32(dnode, "./metric");
+       else if (yang_dnode_exists(dnode, "./route-map"))
+               routemap = yang_dnode_get_string(dnode, "./route-map");
+
+       isis_redist_set(area, level, family, type, metric, routemap, 0);
+}
+
+static void redistribute_ipv4_apply_finish(const struct lyd_node *dnode)
+{
+       redistribute_apply_finish(dnode, AF_INET);
+}
+
+static void redistribute_ipv6_apply_finish(const struct lyd_node *dnode)
+{
+       redistribute_apply_finish(dnode, AF_INET6);
+}
+
 static int isis_instance_redistribute_ipv4_create(enum nb_event event,
                                                  const struct lyd_node *dnode,
                                                  union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
 static int isis_instance_redistribute_ipv4_delete(enum nb_event event,
                                                  const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       struct isis_area *area;
+       int level, type;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       area = yang_dnode_get_entry(dnode, true);
+       level = yang_dnode_get_enum(dnode, "./level");
+       type = yang_dnode_get_enum(dnode, "./protocol");
+       isis_redist_unset(area, level, AF_INET, type);
+
        return NB_OK;
 }
 
@@ -1012,7 +1054,7 @@ isis_instance_redistribute_ipv4_route_map_modify(enum nb_event event,
                                                 const struct lyd_node *dnode,
                                                 union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
@@ -1020,7 +1062,7 @@ static int
 isis_instance_redistribute_ipv4_route_map_delete(enum nb_event event,
                                                 const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
@@ -1032,7 +1074,7 @@ isis_instance_redistribute_ipv4_metric_modify(enum nb_event event,
                                              const struct lyd_node *dnode,
                                              union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
@@ -1040,7 +1082,7 @@ static int
 isis_instance_redistribute_ipv4_metric_delete(enum nb_event event,
                                              const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
@@ -1051,14 +1093,24 @@ static int isis_instance_redistribute_ipv6_create(enum nb_event event,
                                                  const struct lyd_node *dnode,
                                                  union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
 static int isis_instance_redistribute_ipv6_delete(enum nb_event event,
                                                  const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       struct isis_area *area;
+       int level, type;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       area = yang_dnode_get_entry(dnode, true);
+       level = yang_dnode_get_enum(dnode, "./level");
+       type = yang_dnode_get_enum(dnode, "./protocol");
+       isis_redist_unset(area, level, AF_INET6, type);
+
        return NB_OK;
 }
 
@@ -1070,7 +1122,7 @@ isis_instance_redistribute_ipv6_route_map_modify(enum nb_event event,
                                                 const struct lyd_node *dnode,
                                                 union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
@@ -1078,7 +1130,7 @@ static int
 isis_instance_redistribute_ipv6_route_map_delete(enum nb_event event,
                                                 const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
@@ -1090,7 +1142,7 @@ isis_instance_redistribute_ipv6_metric_modify(enum nb_event event,
                                              const struct lyd_node *dnode,
                                              union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
@@ -1098,46 +1150,89 @@ static int
 isis_instance_redistribute_ipv6_metric_delete(enum nb_event event,
                                              const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       /* It's all done by redistribute_apply_finish */
        return NB_OK;
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/multi-topology/ipv4-multicast
  */
+static int isis_multi_topology_common(enum nb_event event,
+                                     const struct lyd_node *dnode,
+                                     const char *topology, bool create)
+{
+       struct isis_area *area;
+       struct isis_area_mt_setting *setting;
+       uint16_t mtid = isis_str2mtid(topology);
+
+       switch (event) {
+       case NB_EV_VALIDATE:
+               if (mtid == (uint16_t)-1) {
+                       flog_warn(EC_LIB_NB_CB_CONFIG_VALIDATE,
+                                 "Unknown topology %s", topology);
+                       return NB_ERR_VALIDATION;
+               }
+               break;
+       case NB_EV_PREPARE:
+       case NB_EV_ABORT:
+               break;
+       case NB_EV_APPLY:
+               area = yang_dnode_get_entry(dnode, true);
+               setting = area_get_mt_setting(area, mtid);
+               setting->enabled = create;
+               lsp_regenerate_schedule(area, IS_LEVEL_1 | IS_LEVEL_2, 0);
+               break;
+       }
+
+       return NB_OK;
+}
+
+static int isis_multi_topology_overload_common(enum nb_event event,
+                                              const struct lyd_node *dnode,
+                                              const char *topology)
+{
+       struct isis_area *area;
+       struct isis_area_mt_setting *setting;
+       uint16_t mtid = isis_str2mtid(topology);
+
+       /* validation is done in isis_multi_topology_common */
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       area = yang_dnode_get_entry(dnode, true);
+       setting = area_get_mt_setting(area, mtid);
+       setting->overload = yang_dnode_get_bool(dnode, NULL);
+       if (setting->enabled)
+               lsp_regenerate_schedule(area, IS_LEVEL_1 | IS_LEVEL_2, 0);
+
+       return NB_OK;
+}
+
 static int
 isis_instance_multi_topology_ipv4_multicast_create(enum nb_event event,
                                                   const struct lyd_node *dnode,
                                                   union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv4-multicast", true);
 }
 
 static int
 isis_instance_multi_topology_ipv4_multicast_delete(enum nb_event event,
                                                   const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv4-multicast",
+                                         false);
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/multi-topology/ipv4-multicast/overload
  */
-static int isis_instance_multi_topology_ipv4_multicast_overload_create(
+static int isis_instance_multi_topology_ipv4_multicast_overload_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
-
-static int isis_instance_multi_topology_ipv4_multicast_overload_delete(
-       enum nb_event event, const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_overload_common(event, dnode,
+                                                  "ipv4-multicast");
 }
 
 /*
@@ -1147,33 +1242,23 @@ static int isis_instance_multi_topology_ipv4_management_create(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv4-mgmt", true);
 }
 
 static int isis_instance_multi_topology_ipv4_management_delete(
        enum nb_event event, const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv4-mgmt", false);
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/multi-topology/ipv4-management/overload
  */
-static int isis_instance_multi_topology_ipv4_management_overload_create(
+static int isis_instance_multi_topology_ipv4_management_overload_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
-
-static int isis_instance_multi_topology_ipv4_management_overload_delete(
-       enum nb_event event, const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_overload_common(event, dnode, "ipv4-mgmt");
 }
 
 /*
@@ -1184,34 +1269,25 @@ isis_instance_multi_topology_ipv6_unicast_create(enum nb_event event,
                                                 const struct lyd_node *dnode,
                                                 union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv6-unicast", true);
 }
 
 static int
 isis_instance_multi_topology_ipv6_unicast_delete(enum nb_event event,
                                                 const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv6-unicast", false);
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/multi-topology/ipv6-unicast/overload
  */
-static int isis_instance_multi_topology_ipv6_unicast_overload_create(
+static int isis_instance_multi_topology_ipv6_unicast_overload_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
-
-static int isis_instance_multi_topology_ipv6_unicast_overload_delete(
-       enum nb_event event, const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_overload_common(event, dnode,
+                                                  "ipv6-unicast");
 }
 
 /*
@@ -1222,34 +1298,26 @@ isis_instance_multi_topology_ipv6_multicast_create(enum nb_event event,
                                                   const struct lyd_node *dnode,
                                                   union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv6-multicast", true);
 }
 
 static int
 isis_instance_multi_topology_ipv6_multicast_delete(enum nb_event event,
                                                   const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv6-multicast",
+                                         false);
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/multi-topology/ipv6-multicast/overload
  */
-static int isis_instance_multi_topology_ipv6_multicast_overload_create(
+static int isis_instance_multi_topology_ipv6_multicast_overload_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
-
-static int isis_instance_multi_topology_ipv6_multicast_overload_delete(
-       enum nb_event event, const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_overload_common(event, dnode,
+                                                  "ipv6-multicast");
 }
 
 /*
@@ -1259,33 +1327,23 @@ static int isis_instance_multi_topology_ipv6_management_create(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv6-mgmt", true);
 }
 
 static int isis_instance_multi_topology_ipv6_management_delete(
        enum nb_event event, const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv6-mgmt", false);
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/multi-topology/ipv6-management/overload
  */
-static int isis_instance_multi_topology_ipv6_management_overload_create(
+static int isis_instance_multi_topology_ipv6_management_overload_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
-
-static int isis_instance_multi_topology_ipv6_management_overload_delete(
-       enum nb_event event, const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_overload_common(event, dnode, "ipv6-mgmt");
 }
 
 /*
@@ -1296,53 +1354,43 @@ isis_instance_multi_topology_ipv6_dstsrc_create(enum nb_event event,
                                                const struct lyd_node *dnode,
                                                union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv6-dstsrc", true);
 }
 
 static int
 isis_instance_multi_topology_ipv6_dstsrc_delete(enum nb_event event,
                                                const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_common(event, dnode, "ipv6-dstsrc", false);
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/multi-topology/ipv6-dstsrc/overload
  */
-static int isis_instance_multi_topology_ipv6_dstsrc_overload_create(
+static int isis_instance_multi_topology_ipv6_dstsrc_overload_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
-
-static int isis_instance_multi_topology_ipv6_dstsrc_overload_delete(
-       enum nb_event event, const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
-       return NB_OK;
+       return isis_multi_topology_overload_common(event, dnode, "ipv6-dstsrc");
 }
 
 /*
  * XPath: /frr-isisd:isis/instance/log-adjacency-changes
  */
 static int
-isis_instance_log_adjacency_changes_create(enum nb_event event,
+isis_instance_log_adjacency_changes_modify(enum nb_event event,
                                           const struct lyd_node *dnode,
                                           union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
+       struct isis_area *area;
+       bool log = yang_dnode_get_bool(dnode, NULL);
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       area = yang_dnode_get_entry(dnode, true);
+       area->log_adj_changes = log ? 1 : 0;
 
-static int
-isis_instance_log_adjacency_changes_delete(enum nb_event event,
-                                          const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
        return NB_OK;
 }
 
@@ -1353,14 +1401,66 @@ static int isis_mpls_te_create(enum nb_event event,
                               const struct lyd_node *dnode,
                               union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct listnode *node;
+       struct isis_circuit *circuit;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       isisMplsTE.status = enable;
+
+       /*
+        * Following code is intended to handle two cases;
+        *
+        * 1) MPLS-TE was disabled at startup time, but now become enabled.
+        * In this case, we must enable MPLS-TE Circuit regarding interface
+        * MPLS_TE flag
+        * 2) MPLS-TE was once enabled then disabled, and now enabled again.
+        */
+       for (ALL_LIST_ELEMENTS_RO(isisMplsTE.cir_list, node, circuit)) {
+               if (circuit->mtc == NULL || IS_FLOOD_AS(circuit->mtc->type))
+                       continue;
+
+               if ((circuit->mtc->status == disable)
+                   && HAS_LINK_PARAMS(circuit->interface))
+                       circuit->mtc->status = enable;
+               else
+                       continue;
+
+               /* Reoriginate STD_TE & GMPLS circuits */
+               if (circuit->area)
+                       lsp_regenerate_schedule(circuit->area, circuit->is_type,
+                                               0);
+       }
+
        return NB_OK;
 }
 
 static int isis_mpls_te_delete(enum nb_event event,
                               const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       struct listnode *node;
+       struct isis_circuit *circuit;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       isisMplsTE.status = disable;
+
+       /* Flush LSP if circuit engage */
+       for (ALL_LIST_ELEMENTS_RO(isisMplsTE.cir_list, node, circuit)) {
+               if (circuit->mtc == NULL || (circuit->mtc->status == disable))
+                       continue;
+
+               /* disable MPLS_TE Circuit */
+               circuit->mtc->status = disable;
+
+               /* Re-originate circuit without STD_TE & GMPLS parameters */
+               if (circuit->area)
+                       lsp_regenerate_schedule(circuit->area, circuit->is_type,
+                                               0);
+       }
+
        return NB_OK;
 }
 
@@ -1371,14 +1471,50 @@ static int isis_mpls_te_router_address_modify(enum nb_event event,
                                              const struct lyd_node *dnode,
                                              union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct in_addr value;
+       struct listnode *node;
+       struct isis_area *area;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       yang_dnode_get_ipv4(&value, dnode, NULL);
+       isisMplsTE.router_id.s_addr = value.s_addr;
+       /* only proceed if MPLS-TE is enabled */
+       if (isisMplsTE.status == disable)
+               return NB_OK;
+
+       /* Update main Router ID in isis global structure */
+       isis->router_id = value.s_addr;
+       /* And re-schedule LSP update */
+       for (ALL_LIST_ELEMENTS_RO(isis->area_list, node, area))
+               if (listcount(area->area_addrs) > 0)
+                       lsp_regenerate_schedule(area, area->is_type, 0);
+
        return NB_OK;
 }
 
 static int isis_mpls_te_router_address_delete(enum nb_event event,
                                              const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       struct listnode *node;
+       struct isis_area *area;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       isisMplsTE.router_id.s_addr = INADDR_ANY;
+       /* only proceed if MPLS-TE is enabled */
+       if (isisMplsTE.status == disable)
+               return NB_OK;
+
+       /* Update main Router ID in isis global structure */
+       isis->router_id = 0;
+       /* And re-schedule LSP update */
+       for (ALL_LIST_ELEMENTS_RO(isis->area_list, node, area))
+               if (listcount(area->area_addrs) > 0)
+                       lsp_regenerate_schedule(area, area->is_type, 0);
+
        return NB_OK;
 }
 
@@ -1534,112 +1670,99 @@ static int lib_interface_isis_circuit_type_modify(enum nb_event event,
 /*
  * XPath: /frr-interface:lib/interface/frr-isisd:isis/ipv4-routing
  */
-static int lib_interface_isis_ipv4_routing_create(enum nb_event event,
+static int lib_interface_isis_ipv4_routing_modify(enum nb_event event,
                                                  const struct lyd_node *dnode,
                                                  union nb_resource *resource)
 {
-       bool ipv6;
+       bool ipv4, ipv6;
        struct isis_circuit *circuit;
 
        if (event != NB_EV_APPLY)
                return NB_OK;
 
        circuit = yang_dnode_get_entry(dnode, true);
-       ipv6 = yang_dnode_exists(dnode, "../ipv6-routing");
-       isis_circuit_af_set(circuit, true, ipv6);
+       ipv4 = yang_dnode_get_bool(dnode, NULL);
+       ipv6 = yang_dnode_get_bool(dnode, "../ipv6-routing");
+       isis_circuit_af_set(circuit, ipv4, ipv6);
 
        return NB_OK;
 }
 
-static int lib_interface_isis_ipv4_routing_delete(enum nb_event event,
-                                                 const struct lyd_node *dnode)
+/*
+ * XPath: /frr-interface:lib/interface/frr-isisd:isis/ipv6-routing
+ */
+static int lib_interface_isis_ipv6_routing_modify(enum nb_event event,
+                                                 const struct lyd_node *dnode,
+                                                 union nb_resource *resource)
 {
-       bool ipv6;
+       bool ipv4, ipv6;
        struct isis_circuit *circuit;
 
        if (event != NB_EV_APPLY)
                return NB_OK;
 
        circuit = yang_dnode_get_entry(dnode, true);
-       if (circuit && circuit->area) {
-               ipv6 = yang_dnode_exists(dnode, "../ipv6-routing");
-               isis_circuit_af_set(circuit, false, ipv6);
-       }
+       ipv4 = yang_dnode_exists(dnode, "../ipv4-routing");
+       ipv6 = yang_dnode_get_bool(dnode, NULL);
+       isis_circuit_af_set(circuit, ipv4, ipv6);
 
        return NB_OK;
 }
 
 /*
- * XPath: /frr-interface:lib/interface/frr-isisd:isis/ipv6-routing
+ * XPath: /frr-interface:lib/interface/frr-isisd:isis/csnp-interval/level-1
  */
-static int lib_interface_isis_ipv6_routing_create(enum nb_event event,
-                                                 const struct lyd_node *dnode,
-                                                 union nb_resource *resource)
+static int
+lib_interface_isis_csnp_interval_level_1_modify(enum nb_event event,
+                                               const struct lyd_node *dnode,
+                                               union nb_resource *resource)
 {
-       bool ipv4;
        struct isis_circuit *circuit;
 
        if (event != NB_EV_APPLY)
                return NB_OK;
 
        circuit = yang_dnode_get_entry(dnode, true);
-       ipv4 = yang_dnode_exists(dnode, "../ipv6-routing");
-       isis_circuit_af_set(circuit, ipv4, true);
+       circuit->csnp_interval[0] = yang_dnode_get_uint16(dnode, NULL);
 
        return NB_OK;
 }
 
-static int lib_interface_isis_ipv6_routing_delete(enum nb_event event,
-                                                 const struct lyd_node *dnode)
+/*
+ * XPath: /frr-interface:lib/interface/frr-isisd:isis/csnp-interval/level-2
+ */
+static int
+lib_interface_isis_csnp_interval_level_2_modify(enum nb_event event,
+                                               const struct lyd_node *dnode,
+                                               union nb_resource *resource)
 {
-       bool ipv4;
        struct isis_circuit *circuit;
 
        if (event != NB_EV_APPLY)
                return NB_OK;
 
        circuit = yang_dnode_get_entry(dnode, true);
-       if (circuit->area) {
-               ipv4 = yang_dnode_exists(dnode, "../ipv4-routing");
-               isis_circuit_af_set(circuit, ipv4, false);
-       }
+       circuit->csnp_interval[1] = yang_dnode_get_uint16(dnode, NULL);
 
        return NB_OK;
 }
 
 /*
- * XPath: /frr-interface:lib/interface/frr-isisd:isis/csnp-interval/level-1
+ * XPath: /frr-interface:lib/interface/frr-isisd:isis/psnp-interval/level-1
  */
 static int
-lib_interface_isis_csnp_interval_level_1_modify(enum nb_event event,
+lib_interface_isis_psnp_interval_level_1_modify(enum nb_event event,
                                                const struct lyd_node *dnode,
                                                union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
+       struct isis_circuit *circuit;
 
-/*
- * XPath: /frr-interface:lib/interface/frr-isisd:isis/csnp-interval/level-2
- */
-static int
-lib_interface_isis_csnp_interval_level_2_modify(enum nb_event event,
-                                               const struct lyd_node *dnode,
-                                               union nb_resource *resource)
-{
-       /* TODO: implement me. */
-       return NB_OK;
-}
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       circuit->psnp_interval[0] = yang_dnode_get_uint16(dnode, NULL);
 
-/*
- * XPath: /frr-interface:lib/interface/frr-isisd:isis/psnp-interval/level-1
- */
-static int
-lib_interface_isis_psnp_interval_level_1_modify(enum nb_event event,
-                                               const struct lyd_node *dnode,
-                                               union nb_resource *resource)
-{
-       /* TODO: implement me. */
        return NB_OK;
 }
 
@@ -1651,7 +1774,14 @@ lib_interface_isis_psnp_interval_level_2_modify(enum nb_event event,
                                                const struct lyd_node *dnode,
                                                union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       circuit->psnp_interval[1] = yang_dnode_get_uint16(dnode, NULL);
+
        return NB_OK;
 }
 
@@ -1662,7 +1792,14 @@ static int lib_interface_isis_hello_padding_modify(enum nb_event event,
                                                   const struct lyd_node *dnode,
                                                   union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       circuit->pad_hellos = yang_dnode_get_bool(dnode, NULL);
+
        return NB_OK;
 }
 
@@ -1674,7 +1811,16 @@ lib_interface_isis_hello_interval_level_1_modify(enum nb_event event,
                                                 const struct lyd_node *dnode,
                                                 union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+       uint32_t interval;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       interval = yang_dnode_get_uint32(dnode, NULL);
+       circuit->hello_interval[0] = interval;
+
        return NB_OK;
 }
 
@@ -1686,7 +1832,16 @@ lib_interface_isis_hello_interval_level_2_modify(enum nb_event event,
                                                 const struct lyd_node *dnode,
                                                 union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+       uint32_t interval;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       interval = yang_dnode_get_uint32(dnode, NULL);
+       circuit->hello_interval[1] = interval;
+
        return NB_OK;
 }
 
@@ -1698,7 +1853,16 @@ lib_interface_isis_hello_multiplier_level_1_modify(enum nb_event event,
                                                   const struct lyd_node *dnode,
                                                   union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+       uint16_t multi;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       multi = yang_dnode_get_uint16(dnode, NULL);
+       circuit->hello_multiplier[0] = multi;
+
        return NB_OK;
 }
 
@@ -1710,7 +1874,16 @@ lib_interface_isis_hello_multiplier_level_2_modify(enum nb_event event,
                                                   const struct lyd_node *dnode,
                                                   union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+       uint16_t multi;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       multi = yang_dnode_get_uint16(dnode, NULL);
+       circuit->hello_multiplier[1] = multi;
+
        return NB_OK;
 }
 
@@ -1722,7 +1895,16 @@ lib_interface_isis_metric_level_1_modify(enum nb_event event,
                                         const struct lyd_node *dnode,
                                         union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+       unsigned int met;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       met = yang_dnode_get_uint32(dnode, NULL);
+       isis_circuit_metric_set(circuit, IS_LEVEL_1, met);
+
        return NB_OK;
 }
 
@@ -1734,7 +1916,16 @@ lib_interface_isis_metric_level_2_modify(enum nb_event event,
                                         const struct lyd_node *dnode,
                                         union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+       unsigned int met;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       met = yang_dnode_get_uint32(dnode, NULL);
+       isis_circuit_metric_set(circuit, IS_LEVEL_2, met);
+
        return NB_OK;
 }
 
@@ -1746,7 +1937,14 @@ lib_interface_isis_priority_level_1_modify(enum nb_event event,
                                           const struct lyd_node *dnode,
                                           union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       circuit->priority[0] = yang_dnode_get_uint8(dnode, NULL);
+
        return NB_OK;
 }
 
@@ -1758,7 +1956,14 @@ lib_interface_isis_priority_level_2_modify(enum nb_event event,
                                           const struct lyd_node *dnode,
                                           union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       circuit->priority[1] = yang_dnode_get_uint8(dnode, NULL);
+
        return NB_OK;
 }
 
@@ -1769,32 +1974,82 @@ static int lib_interface_isis_network_type_modify(enum nb_event event,
                                                  const struct lyd_node *dnode,
                                                  union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
+       struct isis_circuit *circuit;
+       int net_type = yang_dnode_get_enum(dnode, NULL);
+
+       switch (event) {
+       case NB_EV_VALIDATE:
+               circuit = yang_dnode_get_entry(dnode, false);
+               if (!circuit)
+                       break;
+               if (circuit->circ_type == CIRCUIT_T_LOOPBACK
+                   || circuit->circ_type == CIRCUIT_T_UNKNOWN) {
+                       flog_warn(
+                               EC_LIB_NB_CB_CONFIG_VALIDATE,
+                               "Cannot change network type on unknown or loopback interface");
+                       return NB_ERR_VALIDATION;
+               }
+               if (net_type == CIRCUIT_T_BROADCAST
+                   && circuit->state == C_STATE_UP
+                   && !if_is_broadcast(circuit->interface)) {
+                       flog_warn(
+                               EC_LIB_NB_CB_CONFIG_VALIDATE,
+                               "Cannot configure non-broadcast interface for broadcast operation");
+                       return NB_ERR_VALIDATION;
+               }
+               break;
+       case NB_EV_PREPARE:
+       case NB_EV_ABORT:
+               break;
+       case NB_EV_APPLY:
+               circuit = yang_dnode_get_entry(dnode, true);
+               isis_circuit_circ_type_set(circuit, net_type);
+               break;
+       }
 
-static int lib_interface_isis_network_type_delete(enum nb_event event,
-                                                 const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
        return NB_OK;
 }
 
 /*
  * XPath: /frr-interface:lib/interface/frr-isisd:isis/passive
  */
-static int lib_interface_isis_passive_create(enum nb_event event,
+static int lib_interface_isis_passive_modify(enum nb_event event,
                                             const struct lyd_node *dnode,
                                             union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
+       struct isis_circuit *circuit;
+       struct isis_area *area;
+       struct interface *ifp;
+       bool passive = yang_dnode_get_bool(dnode, NULL);
+
+       /* validation only applies if we are setting passive to false */
+       if (!passive && event == NB_EV_VALIDATE) {
+               circuit = yang_dnode_get_entry(dnode, false);
+               if (!circuit)
+                       return NB_OK;
+               ifp = circuit->interface;
+               if (!ifp)
+                       return NB_OK;
+               if (if_is_loopback(ifp)) {
+                       flog_warn(EC_LIB_NB_CB_CONFIG_VALIDATE,
+                                 "Loopback is always passive");
+                       return NB_ERR_VALIDATION;
+               }
+       }
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       if (circuit->state != C_STATE_UP) {
+               circuit->is_passive = passive;
+       } else {
+               area = circuit->area;
+               isis_csm_state_change(ISIS_DISABLE, circuit, area);
+               circuit->is_passive = passive;
+               isis_csm_state_change(ISIS_ENABLE, circuit, area);
+       }
 
-static int lib_interface_isis_passive_delete(enum nb_event event,
-                                            const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
        return NB_OK;
 }
 
@@ -1805,14 +2060,20 @@ static int lib_interface_isis_password_create(enum nb_event event,
                                              const struct lyd_node *dnode,
                                              union nb_resource *resource)
 {
-       /* TODO: implement me. */
        return NB_OK;
 }
 
 static int lib_interface_isis_password_delete(enum nb_event event,
                                              const struct lyd_node *dnode)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       isis_circuit_passwd_unset(circuit);
+
        return NB_OK;
 }
 
@@ -1824,7 +2085,17 @@ lib_interface_isis_password_password_modify(enum nb_event event,
                                            const struct lyd_node *dnode,
                                            union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+       const char *password;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       password = yang_dnode_get_string(dnode, NULL);
+       circuit = yang_dnode_get_entry(dnode, true);
+       circuit->passwd.len = strlen(password);
+       strncpy((char *)circuit->passwd.passwd, password, 255);
+
        return NB_OK;
 }
 
@@ -1836,7 +2107,16 @@ lib_interface_isis_password_password_type_modify(enum nb_event event,
                                                 const struct lyd_node *dnode,
                                                 union nb_resource *resource)
 {
-       /* TODO: implement me. */
+       struct isis_circuit *circuit;
+       uint8_t pass_type;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       pass_type = yang_dnode_get_enum(dnode, NULL);
+       circuit = yang_dnode_get_entry(dnode, true);
+       circuit->passwd.type = pass_type;
+
        return NB_OK;
 }
 
@@ -1844,18 +2124,18 @@ lib_interface_isis_password_password_type_modify(enum nb_event event,
  * XPath:
  * /frr-interface:lib/interface/frr-isisd:isis/disable-three-way-handshake
  */
-static int lib_interface_isis_disable_three_way_handshake_create(
+static int lib_interface_isis_disable_three_way_handshake_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
-}
+       struct isis_circuit *circuit;
+
+       if (event != NB_EV_APPLY)
+               return NB_OK;
+
+       circuit = yang_dnode_get_entry(dnode, true);
+       circuit->disable_threeway_adj = yang_dnode_get_bool(dnode, NULL);
 
-static int lib_interface_isis_disable_three_way_handshake_delete(
-       enum nb_event event, const struct lyd_node *dnode)
-{
-       /* TODO: implement me. */
        return NB_OK;
 }
 
@@ -1863,12 +2143,41 @@ static int lib_interface_isis_disable_three_way_handshake_delete(
  * XPath:
  * /frr-interface:lib/interface/frr-isisd:isis/multi-topology/ipv4-unicast
  */
+static int lib_interface_isis_multi_topology_common(
+       enum nb_event event, const struct lyd_node *dnode, uint16_t mtid)
+{
+       struct isis_circuit *circuit;
+       bool value;
+
+       switch (event) {
+       case NB_EV_VALIDATE:
+               circuit = yang_dnode_get_entry(dnode, false);
+               if (circuit && circuit->area && circuit->area->oldmetric) {
+                       flog_warn(
+                               EC_LIB_NB_CB_CONFIG_VALIDATE,
+                               "Multi topology IS-IS can only be used with wide metrics");
+                       return NB_ERR_VALIDATION;
+               }
+               break;
+       case NB_EV_PREPARE:
+       case NB_EV_ABORT:
+               break;
+       case NB_EV_APPLY:
+               circuit = yang_dnode_get_entry(dnode, true);
+               value = yang_dnode_get_bool(dnode, NULL);
+               isis_circuit_mt_enabled_set(circuit, mtid, value);
+               break;
+       }
+
+       return NB_OK;
+}
+
 static int lib_interface_isis_multi_topology_ipv4_unicast_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return lib_interface_isis_multi_topology_common(event, dnode,
+                                                       ISIS_MT_IPV4_UNICAST);
 }
 
 /*
@@ -1879,8 +2188,8 @@ static int lib_interface_isis_multi_topology_ipv4_multicast_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return lib_interface_isis_multi_topology_common(event, dnode,
+                                                       ISIS_MT_IPV4_MULTICAST);
 }
 
 /*
@@ -1891,8 +2200,8 @@ static int lib_interface_isis_multi_topology_ipv4_management_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return lib_interface_isis_multi_topology_common(event, dnode,
+                                                       ISIS_MT_IPV4_MGMT);
 }
 
 /*
@@ -1903,8 +2212,8 @@ static int lib_interface_isis_multi_topology_ipv6_unicast_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return lib_interface_isis_multi_topology_common(event, dnode,
+                                                       ISIS_MT_IPV6_UNICAST);
 }
 
 /*
@@ -1915,8 +2224,8 @@ static int lib_interface_isis_multi_topology_ipv6_multicast_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return lib_interface_isis_multi_topology_common(event, dnode,
+                                                       ISIS_MT_IPV6_MULTICAST);
 }
 
 /*
@@ -1927,8 +2236,8 @@ static int lib_interface_isis_multi_topology_ipv6_management_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return lib_interface_isis_multi_topology_common(event, dnode,
+                                                       ISIS_MT_IPV6_MGMT);
 }
 
 /*
@@ -1938,8 +2247,500 @@ static int lib_interface_isis_multi_topology_ipv6_dstsrc_modify(
        enum nb_event event, const struct lyd_node *dnode,
        union nb_resource *resource)
 {
-       /* TODO: implement me. */
-       return NB_OK;
+       return lib_interface_isis_multi_topology_common(event, dnode,
+                                                       ISIS_MT_IPV6_DSTSRC);
+}
+
+/*
+ * NOTIFICATIONS
+ */
+static void notif_prep_instance_hdr(const char *xpath,
+                                   const struct isis_area *area,
+                                   const char *routing_instance,
+                                   struct list *args)
+{
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/routing-instance", xpath);
+       data = yang_data_new_string(xpath_arg, routing_instance);
+       listnode_add(args, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/routing-protocol-name",
+                xpath);
+       data = yang_data_new_string(xpath_arg, area->area_tag);
+       listnode_add(args, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/isis-level", xpath);
+       data = yang_data_new_enum(xpath_arg, area->is_type);
+       listnode_add(args, data);
+}
+
+static void notif_prepr_iface_hdr(const char *xpath,
+                                 const struct isis_circuit *circuit,
+                                 struct list *args)
+{
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/interface-name", xpath);
+       data = yang_data_new_string(xpath_arg, circuit->interface->name);
+       listnode_add(args, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/interface-level", xpath);
+       data = yang_data_new_enum(xpath_arg, circuit->is_type);
+       listnode_add(args, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/extended-circuit-id", xpath);
+       /* we do not seem to have the extended version of the circuit_id */
+       data = yang_data_new_uint32(xpath_arg, (uint32_t)circuit->circuit_id);
+       listnode_add(args, data);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:database-overload
+ */
+void isis_notif_db_overload(const struct isis_area *area, bool overload)
+{
+       const char *xpath = "/frr-isisd:database-overload";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/overload", xpath);
+       data = yang_data_new_enum(xpath_arg, !!overload);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:lsp-too-large
+ */
+void isis_notif_lsp_too_large(const struct isis_circuit *circuit,
+                             uint32_t pdu_size, const char *lsp_id)
+{
+       const char *xpath = "/frr-isisd:lsp-too-large";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/pdu-size", xpath);
+       data = yang_data_new_uint32(xpath_arg, pdu_size);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/lsp-id", xpath);
+       data = yang_data_new_string(xpath_arg, lsp_id);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:if-state-change
+ */
+void isis_notif_if_state_change(const struct isis_circuit *circuit, bool down)
+{
+       const char *xpath = "/frr-isisd:if-state-change";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/state", xpath);
+       data = yang_data_new_enum(xpath_arg, !!down);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:corrupted-lsp-detected
+ */
+void isis_notif_corrupted_lsp(const struct isis_area *area, const char *lsp_id)
+{
+       const char *xpath = "/frr-isisd:corrupted-lsp-detected";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/lsp-id", xpath);
+       data = yang_data_new_string(xpath_arg, lsp_id);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:attempt-to-exceed-max-sequence
+ */
+void isis_notif_lsp_exceed_max(const struct isis_area *area, const char *lsp_id)
+{
+       const char *xpath = "/frr-isisd:attempt-to-exceed-max-sequence";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/lsp-id", xpath);
+       data = yang_data_new_string(xpath_arg, lsp_id);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:max-area-addresses-mismatch
+ */
+void isis_notif_max_area_addr_mismatch(const struct isis_circuit *circuit,
+                                      uint8_t max_area_addrs,
+                                      const char *raw_pdu)
+{
+       const char *xpath = "/frr-isisd:max-area-addresses-mismatch";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/max-area-addresses", xpath);
+       data = yang_data_new_uint8(xpath_arg, max_area_addrs);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/raw-pdu", xpath);
+       data = yang_data_new(xpath_arg, raw_pdu);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:authentication-type-failure
+ */
+void isis_notif_authentication_type_failure(const struct isis_circuit *circuit,
+                                           const char *raw_pdu)
+{
+       const char *xpath = "/frr-isisd:authentication-type-failure";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/raw-pdu", xpath);
+       data = yang_data_new(xpath_arg, raw_pdu);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:authentication-failure
+ */
+void isis_notif_authentication_failure(const struct isis_circuit *circuit,
+                                      const char *raw_pdu)
+{
+       const char *xpath = "/frr-isisd:authentication-failure";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/raw-pdu", xpath);
+       data = yang_data_new(xpath_arg, raw_pdu);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:adjacency-state-change
+ */
+void isis_notif_adj_state_change(const struct isis_adjacency *adj,
+                                int new_state, const char *reason)
+{
+       const char *xpath = "/frr-isisd:adjacency-state-change";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_circuit *circuit = adj->circuit;
+       struct isis_area *area = circuit->area;
+       struct isis_dynhn *dyn = dynhn_find_by_id(adj->sysid);
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       if (dyn) {
+               snprintf(xpath_arg, sizeof(xpath_arg), "%s/neighbor", xpath);
+               data = yang_data_new_string(xpath_arg, dyn->hostname);
+               listnode_add(arguments, data);
+       }
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/neighbor-system-id", xpath);
+       data = yang_data_new_string(xpath_arg, sysid_print(adj->sysid));
+       listnode_add(arguments, data);
+
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/state", xpath);
+       switch (new_state) {
+       case ISIS_ADJ_DOWN:
+               data = yang_data_new_string(xpath_arg, "down");
+               break;
+       case ISIS_ADJ_UP:
+               data = yang_data_new_string(xpath_arg, "up");
+               break;
+       case ISIS_ADJ_INITIALIZING:
+               data = yang_data_new_string(xpath_arg, "init");
+               break;
+       default:
+               data = yang_data_new_string(xpath_arg, "failed");
+       }
+       listnode_add(arguments, data);
+       if (new_state == ISIS_ADJ_DOWN) {
+               snprintf(xpath_arg, sizeof(xpath_arg), "%s/reason", xpath);
+               data = yang_data_new_string(xpath_arg, reason);
+               listnode_add(arguments, data);
+       }
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:rejected-adjacency
+ */
+void isis_notif_reject_adjacency(const struct isis_circuit *circuit,
+                                const char *reason, const char *raw_pdu)
+{
+       const char *xpath = "/frr-isisd:rejected-adjacency";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/reason", xpath);
+       data = yang_data_new_string(xpath_arg, reason);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/raw-pdu", xpath);
+       data = yang_data_new(xpath_arg, raw_pdu);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:area-mismatch
+ */
+void isis_notif_area_mismatch(const struct isis_circuit *circuit,
+                             const char *raw_pdu)
+{
+       const char *xpath = "/frr-isisd:area-mismatch";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/raw-pdu", xpath);
+       data = yang_data_new(xpath_arg, raw_pdu);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:lsp-received
+ */
+void isis_notif_lsp_received(const struct isis_circuit *circuit,
+                            const char *lsp_id, uint32_t seqno,
+                            uint32_t timestamp, const char *sys_id)
+{
+       const char *xpath = "/frr-isisd:lsp-received";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/lsp-id", xpath);
+       data = yang_data_new_string(xpath_arg, lsp_id);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/sequence", xpath);
+       data = yang_data_new_uint32(xpath_arg, seqno);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/received-timestamp", xpath);
+       data = yang_data_new_uint32(xpath_arg, timestamp);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/neighbor-system-id", xpath);
+       data = yang_data_new_string(xpath_arg, sys_id);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:lsp-generation
+ */
+void isis_notif_lsp_gen(const struct isis_area *area, const char *lsp_id,
+                       uint32_t seqno, uint32_t timestamp)
+{
+       const char *xpath = "/frr-isisd:lsp-generation";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/lsp-id", xpath);
+       data = yang_data_new_string(xpath_arg, lsp_id);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/sequence", xpath);
+       data = yang_data_new_uint32(xpath_arg, seqno);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/send-timestamp", xpath);
+       data = yang_data_new_uint32(xpath_arg, timestamp);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:id-len-mismatch
+ */
+void isis_notif_id_len_mismatch(const struct isis_circuit *circuit,
+                               uint8_t rcv_id_len, const char *raw_pdu)
+{
+       const char *xpath = "/frr-isisd:id-len-mismatch";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/pdu-field-len", xpath);
+       data = yang_data_new_uint8(xpath_arg, rcv_id_len);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/raw-pdu", xpath);
+       data = yang_data_new(xpath_arg, raw_pdu);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:version-skew
+ */
+void isis_notif_version_skew(const struct isis_circuit *circuit,
+                            uint8_t version, const char *raw_pdu)
+{
+       const char *xpath = "/frr-isisd:version-skew";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/protocol-version", xpath);
+       data = yang_data_new_uint8(xpath_arg, version);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/raw-pdu", xpath);
+       data = yang_data_new(xpath_arg, raw_pdu);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:lsp-error-detected
+ */
+void isis_notif_lsp_error(const struct isis_circuit *circuit,
+                         const char *lsp_id, const char *raw_pdu,
+                         __attribute__((unused)) uint32_t offset,
+                         __attribute__((unused)) uint8_t tlv_type)
+{
+       const char *xpath = "/frr-isisd:lsp-error-detected";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/lsp-id", xpath);
+       data = yang_data_new_string(xpath_arg, lsp_id);
+       listnode_add(arguments, data);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/raw-pdu", xpath);
+       data = yang_data_new(xpath_arg, raw_pdu);
+       listnode_add(arguments, data);
+       /* ignore offset and tlv_type which cannot be set properly */
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:sequence-number-skipped
+ */
+void isis_notif_seqno_skipped(const struct isis_circuit *circuit,
+                             const char *lsp_id)
+{
+       const char *xpath = "/frr-isisd:sequence-number-skipped";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/lsp-id", xpath);
+       data = yang_data_new_string(xpath_arg, lsp_id);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
+}
+
+/*
+ * XPath:
+ * /frr-isisd:own-lsp-purge
+ */
+void isis_notif_own_lsp_purge(const struct isis_circuit *circuit,
+                             const char *lsp_id)
+{
+       const char *xpath = "/frr-isisd:own-lsp-purge";
+       struct list *arguments = yang_data_list_new();
+       char xpath_arg[XPATH_MAXLEN];
+       struct yang_data *data;
+       struct isis_area *area = circuit->area;
+
+       notif_prep_instance_hdr(xpath, area, "default", arguments);
+       notif_prepr_iface_hdr(xpath, circuit, arguments);
+       snprintf(xpath_arg, sizeof(xpath_arg), "%s/lsp-id", xpath);
+       data = yang_data_new_string(xpath_arg, lsp_id);
+       listnode_add(arguments, data);
+
+       nb_notification_send(xpath, arguments);
 }
 
 /* clang-format off */
@@ -1971,14 +2772,12 @@ const struct frr_yang_module_info frr_isisd_info = {
                },
                {
                        .xpath = "/frr-isisd:isis/instance/attached",
-                       .cbs.create = isis_instance_attached_create,
-                       .cbs.delete = isis_instance_attached_delete,
+                       .cbs.modify = isis_instance_attached_modify,
                        .cbs.cli_show = cli_show_isis_attached,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/overload",
-                       .cbs.create = isis_instance_overload_create,
-                       .cbs.delete = isis_instance_overload_delete,
+                       .cbs.modify = isis_instance_overload_modify,
                        .cbs.cli_show = cli_show_isis_overload,
                },
                {
@@ -1988,8 +2787,7 @@ const struct frr_yang_module_info frr_isisd_info = {
                },
                {
                        .xpath = "/frr-isisd:isis/instance/purge-originator",
-                       .cbs.create = isis_instance_purge_originator_create,
-                       .cbs.delete = isis_instance_purge_originator_delete,
+                       .cbs.modify = isis_instance_purge_originator_modify,
                        .cbs.cli_show = cli_show_isis_purge_origin,
                },
                {
@@ -2114,11 +2912,12 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-isisd:isis/instance/default-information-originate/ipv4",
                        .cbs.create = isis_instance_default_information_originate_ipv4_create,
                        .cbs.delete = isis_instance_default_information_originate_ipv4_delete,
+                       .cbs.apply_finish = default_info_origin_ipv4_apply_finish,
+                       .cbs.cli_show = cli_show_isis_def_origin_ipv4,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/default-information-originate/ipv4/always",
-                       .cbs.create = isis_instance_default_information_originate_ipv4_always_create,
-                       .cbs.delete = isis_instance_default_information_originate_ipv4_always_delete,
+                       .cbs.modify = isis_instance_default_information_originate_ipv4_always_modify,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/default-information-originate/ipv4/route-map",
@@ -2134,11 +2933,12 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-isisd:isis/instance/default-information-originate/ipv6",
                        .cbs.create = isis_instance_default_information_originate_ipv6_create,
                        .cbs.delete = isis_instance_default_information_originate_ipv6_delete,
+                       .cbs.apply_finish = default_info_origin_ipv6_apply_finish,
+                       .cbs.cli_show = cli_show_isis_def_origin_ipv6,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/default-information-originate/ipv6/always",
-                       .cbs.create = isis_instance_default_information_originate_ipv6_always_create,
-                       .cbs.delete = isis_instance_default_information_originate_ipv6_always_delete,
+                       .cbs.modify = isis_instance_default_information_originate_ipv6_always_modify,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/default-information-originate/ipv6/route-map",
@@ -2154,6 +2954,8 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-isisd:isis/instance/redistribute/ipv4",
                        .cbs.create = isis_instance_redistribute_ipv4_create,
                        .cbs.delete = isis_instance_redistribute_ipv4_delete,
+                       .cbs.apply_finish = redistribute_ipv4_apply_finish,
+                       .cbs.cli_show = cli_show_isis_redistribute_ipv4,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/redistribute/ipv4/route-map",
@@ -2169,6 +2971,8 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-isisd:isis/instance/redistribute/ipv6",
                        .cbs.create = isis_instance_redistribute_ipv6_create,
                        .cbs.delete = isis_instance_redistribute_ipv6_delete,
+                       .cbs.apply_finish = redistribute_ipv6_apply_finish,
+                       .cbs.cli_show = cli_show_isis_redistribute_ipv6,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/redistribute/ipv6/route-map",
@@ -2184,76 +2988,78 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv4-multicast",
                        .cbs.create = isis_instance_multi_topology_ipv4_multicast_create,
                        .cbs.delete = isis_instance_multi_topology_ipv4_multicast_delete,
+                       .cbs.cli_show = cli_show_isis_mt_ipv4_multicast,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv4-multicast/overload",
-                       .cbs.create = isis_instance_multi_topology_ipv4_multicast_overload_create,
-                       .cbs.delete = isis_instance_multi_topology_ipv4_multicast_overload_delete,
+                       .cbs.modify = isis_instance_multi_topology_ipv4_multicast_overload_modify,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv4-management",
                        .cbs.create = isis_instance_multi_topology_ipv4_management_create,
                        .cbs.delete = isis_instance_multi_topology_ipv4_management_delete,
+                       .cbs.cli_show = cli_show_isis_mt_ipv4_mgmt,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv4-management/overload",
-                       .cbs.create = isis_instance_multi_topology_ipv4_management_overload_create,
-                       .cbs.delete = isis_instance_multi_topology_ipv4_management_overload_delete,
+                       .cbs.modify = isis_instance_multi_topology_ipv4_management_overload_modify,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv6-unicast",
                        .cbs.create = isis_instance_multi_topology_ipv6_unicast_create,
                        .cbs.delete = isis_instance_multi_topology_ipv6_unicast_delete,
+                       .cbs.cli_show = cli_show_isis_mt_ipv6_unicast,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv6-unicast/overload",
-                       .cbs.create = isis_instance_multi_topology_ipv6_unicast_overload_create,
-                       .cbs.delete = isis_instance_multi_topology_ipv6_unicast_overload_delete,
+                       .cbs.modify = isis_instance_multi_topology_ipv6_unicast_overload_modify,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv6-multicast",
                        .cbs.create = isis_instance_multi_topology_ipv6_multicast_create,
                        .cbs.delete = isis_instance_multi_topology_ipv6_multicast_delete,
+                       .cbs.cli_show = cli_show_isis_mt_ipv6_multicast,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv6-multicast/overload",
-                       .cbs.create = isis_instance_multi_topology_ipv6_multicast_overload_create,
-                       .cbs.delete = isis_instance_multi_topology_ipv6_multicast_overload_delete,
+                       .cbs.modify = isis_instance_multi_topology_ipv6_multicast_overload_modify,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv6-management",
                        .cbs.create = isis_instance_multi_topology_ipv6_management_create,
                        .cbs.delete = isis_instance_multi_topology_ipv6_management_delete,
+                       .cbs.cli_show = cli_show_isis_mt_ipv6_mgmt,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv6-management/overload",
-                       .cbs.create = isis_instance_multi_topology_ipv6_management_overload_create,
-                       .cbs.delete = isis_instance_multi_topology_ipv6_management_overload_delete,
+                       .cbs.modify = isis_instance_multi_topology_ipv6_management_overload_modify,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv6-dstsrc",
                        .cbs.create = isis_instance_multi_topology_ipv6_dstsrc_create,
                        .cbs.delete = isis_instance_multi_topology_ipv6_dstsrc_delete,
+                       .cbs.cli_show = cli_show_isis_mt_ipv6_dstsrc,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/multi-topology/ipv6-dstsrc/overload",
-                       .cbs.create = isis_instance_multi_topology_ipv6_dstsrc_overload_create,
-                       .cbs.delete = isis_instance_multi_topology_ipv6_dstsrc_overload_delete,
+                       .cbs.modify = isis_instance_multi_topology_ipv6_dstsrc_overload_modify,
                },
                {
                        .xpath = "/frr-isisd:isis/instance/log-adjacency-changes",
-                       .cbs.create = isis_instance_log_adjacency_changes_create,
-                       .cbs.delete = isis_instance_log_adjacency_changes_delete,
+                       .cbs.modify = isis_instance_log_adjacency_changes_modify,
+                       .cbs.cli_show = cli_show_isis_log_adjacency,
                },
                {
                        .xpath = "/frr-isisd:isis/mpls-te",
                        .cbs.create = isis_mpls_te_create,
                        .cbs.delete = isis_mpls_te_delete,
+                       .cbs.cli_show = cli_show_isis_mpls_te,
                },
                {
                        .xpath = "/frr-isisd:isis/mpls-te/router-address",
                        .cbs.modify = isis_mpls_te_router_address_modify,
                        .cbs.delete = isis_mpls_te_router_address_delete,
+                       .cbs.cli_show = cli_show_isis_mpls_te_router_addr,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis",
@@ -2267,19 +3073,22 @@ const struct frr_yang_module_info frr_isisd_info = {
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/circuit-type",
                        .cbs.modify = lib_interface_isis_circuit_type_modify,
+                       .cbs.cli_show = cli_show_ip_isis_circ_type,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/ipv4-routing",
-                       .cbs.create = lib_interface_isis_ipv4_routing_create,
-                       .cbs.delete = lib_interface_isis_ipv4_routing_delete,
+                       .cbs.modify = lib_interface_isis_ipv4_routing_modify,
                        .cbs.cli_show = cli_show_ip_isis_ipv4,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/ipv6-routing",
-                       .cbs.create = lib_interface_isis_ipv6_routing_create,
-                       .cbs.delete = lib_interface_isis_ipv6_routing_delete,
+                       .cbs.modify = lib_interface_isis_ipv6_routing_modify,
                        .cbs.cli_show = cli_show_ip_isis_ipv6,
                },
+               {
+                       .xpath = "/frr-interface:lib/interface/frr-isisd:isis/csnp-interval",
+                       .cbs.cli_show = cli_show_ip_isis_csnp_interval,
+               },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/csnp-interval/level-1",
                        .cbs.modify = lib_interface_isis_csnp_interval_level_1_modify,
@@ -2288,6 +3097,10 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/csnp-interval/level-2",
                        .cbs.modify = lib_interface_isis_csnp_interval_level_2_modify,
                },
+               {
+                       .xpath = "/frr-interface:lib/interface/frr-isisd:isis/psnp-interval",
+                       .cbs.cli_show = cli_show_ip_isis_psnp_interval,
+               },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/psnp-interval/level-1",
                        .cbs.modify = lib_interface_isis_psnp_interval_level_1_modify,
@@ -2299,6 +3112,11 @@ const struct frr_yang_module_info frr_isisd_info = {
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/hello/padding",
                        .cbs.modify = lib_interface_isis_hello_padding_modify,
+                       .cbs.cli_show = cli_show_ip_isis_hello_padding,
+               },
+               {
+                       .xpath = "/frr-interface:lib/interface/frr-isisd:isis/hello/interval",
+                       .cbs.cli_show = cli_show_ip_isis_hello_interval,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/hello/interval/level-1",
@@ -2308,6 +3126,10 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/hello/interval/level-2",
                        .cbs.modify = lib_interface_isis_hello_interval_level_2_modify,
                },
+               {
+                       .xpath = "/frr-interface:lib/interface/frr-isisd:isis/hello/multiplier",
+                       .cbs.cli_show = cli_show_ip_isis_hello_multi,
+               },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/hello/multiplier/level-1",
                        .cbs.modify = lib_interface_isis_hello_multiplier_level_1_modify,
@@ -2316,6 +3138,10 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/hello/multiplier/level-2",
                        .cbs.modify = lib_interface_isis_hello_multiplier_level_2_modify,
                },
+               {
+                       .xpath = "/frr-interface:lib/interface/frr-isisd:isis/metric",
+                       .cbs.cli_show = cli_show_ip_isis_metric,
+               },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/metric/level-1",
                        .cbs.modify = lib_interface_isis_metric_level_1_modify,
@@ -2324,6 +3150,10 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/metric/level-2",
                        .cbs.modify = lib_interface_isis_metric_level_2_modify,
                },
+               {
+                       .xpath = "/frr-interface:lib/interface/frr-isisd:isis/priority",
+                       .cbs.cli_show = cli_show_ip_isis_priority,
+               },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/priority/level-1",
                        .cbs.modify = lib_interface_isis_priority_level_1_modify,
@@ -2335,17 +3165,18 @@ const struct frr_yang_module_info frr_isisd_info = {
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/network-type",
                        .cbs.modify = lib_interface_isis_network_type_modify,
-                       .cbs.delete = lib_interface_isis_network_type_delete,
+                       .cbs.cli_show = cli_show_ip_isis_network_type,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/passive",
-                       .cbs.create = lib_interface_isis_passive_create,
-                       .cbs.delete = lib_interface_isis_passive_delete,
+                       .cbs.modify = lib_interface_isis_passive_modify,
+                       .cbs.cli_show = cli_show_ip_isis_passive,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/password",
                        .cbs.create = lib_interface_isis_password_create,
                        .cbs.delete = lib_interface_isis_password_delete,
+                       .cbs.cli_show = cli_show_ip_isis_password,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/password/password",
@@ -2357,36 +3188,43 @@ const struct frr_yang_module_info frr_isisd_info = {
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/disable-three-way-handshake",
-                       .cbs.create = lib_interface_isis_disable_three_way_handshake_create,
-                       .cbs.delete = lib_interface_isis_disable_three_way_handshake_delete,
+                       .cbs.modify = lib_interface_isis_disable_three_way_handshake_modify,
+                       .cbs.cli_show = cli_show_ip_isis_threeway_shake,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/multi-topology/ipv4-unicast",
                        .cbs.modify = lib_interface_isis_multi_topology_ipv4_unicast_modify,
+                       .cbs.cli_show = cli_show_ip_isis_mt_ipv4_unicast,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/multi-topology/ipv4-multicast",
                        .cbs.modify = lib_interface_isis_multi_topology_ipv4_multicast_modify,
+                       .cbs.cli_show = cli_show_ip_isis_mt_ipv4_multicast,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/multi-topology/ipv4-management",
                        .cbs.modify = lib_interface_isis_multi_topology_ipv4_management_modify,
+                       .cbs.cli_show = cli_show_ip_isis_mt_ipv4_mgmt,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/multi-topology/ipv6-unicast",
                        .cbs.modify = lib_interface_isis_multi_topology_ipv6_unicast_modify,
+                       .cbs.cli_show = cli_show_ip_isis_mt_ipv6_unicast,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/multi-topology/ipv6-multicast",
                        .cbs.modify = lib_interface_isis_multi_topology_ipv6_multicast_modify,
+                       .cbs.cli_show = cli_show_ip_isis_mt_ipv6_multicast,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/multi-topology/ipv6-management",
                        .cbs.modify = lib_interface_isis_multi_topology_ipv6_management_modify,
+                       .cbs.cli_show = cli_show_ip_isis_mt_ipv6_mgmt,
                },
                {
                        .xpath = "/frr-interface:lib/interface/frr-isisd:isis/multi-topology/ipv6-dstsrc",
                        .cbs.modify = lib_interface_isis_multi_topology_ipv6_dstsrc_modify,
+                       .cbs.cli_show = cli_show_ip_isis_mt_ipv6_dstsrc,
                },
                {
                        .xpath = NULL,