lib: validate affinity-map reference using yang model

Change the type of affinity leaf-list in frr-zebra to a leafref with
"require-instance" property set to true. This change tells libyang to
automatically check that affinity-map exists before usage and doesn't
allow it to be deleted if it's referenced. It allows us to remove all
the manual code that is doing the same thing.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/isisd/isis_affinitymap.c b/isisd/isis_affinitymap.c
index 41bad0a7d9343da5d278dc40d7059b3195b4237a..595091db2727dcc661d6a6d9bbfa3312b4661f89 100644 (file)
--- a/isisd/isis_affinitymap.c
+++ b/isisd/isis_affinitymap.c
@@ -11,35 +11,6 @@
 
 #ifndef FABRICD
 
-static bool isis_affinity_map_check_use(const char *affmap_name)
-{
-       struct isis *isis = isis_lookup_by_vrfid(VRF_DEFAULT);
-       struct isis_area *area;
-       struct listnode *area_node, *fa_node;
-       struct flex_algo *fa;
-       struct affinity_map *map;
-       uint16_t pos;
-
-       if (!isis)
-               return false;
-
-       map = affinity_map_get(affmap_name);
-       pos = map->bit_position;
-
-       for (ALL_LIST_ELEMENTS_RO(isis->area_list, area_node, area)) {
-               for (ALL_LIST_ELEMENTS_RO(area->flex_algos->flex_algos, fa_node,
-                                         fa)) {
-                       if (admin_group_get(&fa->admin_group_exclude_any,
-                                           pos) ||
-                           admin_group_get(&fa->admin_group_include_any,
-                                           pos) ||
-                           admin_group_get(&fa->admin_group_include_all, pos))
-                               return true;
-               }
-       }
-       return false;
-}
-
 static void isis_affinity_map_update(const char *affmap_name, uint16_t old_pos,
                                     uint16_t new_pos)
 {
@@ -90,7 +61,6 @@ void isis_affinity_map_init(void)
 {
        affinity_map_init();
 
-       affinity_map_set_check_use_hook(isis_affinity_map_check_use);
        affinity_map_set_update_hook(isis_affinity_map_update);
 }
 

diff --git a/lib/affinitymap.c b/lib/affinitymap.c
index 17e1b2cc01692fdf9df79a5c30004023a9fe1456..b748e74884869b7713332caa82e204fbcae0c3d3 100644 (file)
--- a/lib/affinitymap.c
+++ b/lib/affinitymap.c
@@ -47,7 +47,7 @@ DEFINE_MTYPE_STATIC(LIB, AFFINITY_MAP_INDEX, "Affinity map index");
 DEFINE_QOBJ_TYPE(affinity_maps);
 DEFINE_QOBJ_TYPE(affinity_map);
 
-struct affinity_maps affinity_map_master = {NULL, NULL, NULL, NULL};
+struct affinity_maps affinity_map_master = {NULL, NULL, NULL};
 
 static void affinity_map_free(struct affinity_map *map)
 {
@@ -121,13 +121,6 @@ char *affinity_map_name_get(int pos)
        return NULL;
 }
 
-bool affinity_map_check_use_hook(const char *affmap_name)
-{
-       if (affinity_map_master.check_use_hook)
-               return (*affinity_map_master.check_use_hook)(affmap_name);
-       return false;
-}
-
 bool affinity_map_check_update_hook(const char *affmap_name, uint16_t new_pos)
 {
        if (affinity_map_master.check_update_hook)
@@ -153,12 +146,6 @@ void affinity_map_update_hook(const char *affmap_name, uint16_t new_pos)
                                           new_pos);
 }
 
-
-void affinity_map_set_check_use_hook(bool (*func)(const char *affmap_name))
-{
-       affinity_map_master.check_use_hook = func;
-}
-
 void affinity_map_set_check_update_hook(bool (*func)(const char *affmap_name,
                                                     uint16_t new_pos))
 {

diff --git a/lib/affinitymap.h b/lib/affinitymap.h
index 19edf5a269ea72cc4e8ede9ff43159180ac92245..5ce233404fc0cf16fb874642545d3980c2df512d 100644 (file)
--- a/lib/affinitymap.h
+++ b/lib/affinitymap.h
@@ -50,7 +50,6 @@ DECLARE_QOBJ_TYPE(affinity_map);
 struct affinity_maps {
        struct list *maps;
 
-       bool (*check_use_hook)(const char *affmap_name);
        bool (*check_update_hook)(const char *affmap_name, uint16_t new_pos);
        void (*update_hook)(const char *affmap_name, uint16_t old_pos,
                            uint16_t new_pos);
@@ -66,11 +65,9 @@ void affinity_map_unset(const char *name);
 struct affinity_map *affinity_map_get(const char *name);
 char *affinity_map_name_get(const int pos);
 
-bool affinity_map_check_use_hook(const char *affmap_name);
 bool affinity_map_check_update_hook(const char *affmap_name, uint16_t new_pos);
 void affinity_map_update_hook(const char *affmap_name, uint16_t new_pos);
 
-void affinity_map_set_check_use_hook(bool (*func)(const char *affmap_name));
 void affinity_map_set_check_update_hook(bool (*func)(const char *affmap_name,
                                                     uint16_t new_pos));
 void affinity_map_set_update_hook(void (*func)(const char *affmap_name,

diff --git a/lib/affinitymap_northbound.c b/lib/affinitymap_northbound.c
index 331075f5c111fa08bb075c30578c29c2c64197d8..bee2ebe8616a524902987347ebf5abcb7baa1721 100644 (file)
--- a/lib/affinitymap_northbound.c
+++ b/lib/affinitymap_northbound.c
@@ -47,11 +47,6 @@ static int lib_affinity_map_destroy(struct nb_cb_destroy_args *args)
 
        switch (args->event) {
        case NB_EV_VALIDATE:
-               if (!affinity_map_check_use_hook(name))
-                       break;
-               snprintf(args->errmsg, args->errmsg_len,
-                        "affinity-map %s is used", name);
-               return NB_ERR_VALIDATION;
        case NB_EV_PREPARE:
        case NB_EV_ABORT:
                break;

diff --git a/yang/frr-affinity-map.yang b/yang/frr-affinity-map.yang
index c4377e62467fc58bdae4aabce2995f7f0cdc882a..992f5c75354d2add3b03f1732af98f6548b302c9 100644 (file)
--- a/yang/frr-affinity-map.yang
+++ b/yang/frr-affinity-map.yang
@@ -53,6 +53,15 @@ module frr-affinity-map {
       "Initial revision";
   }
 
+  typedef affinity-map-ref {
+    type leafref {
+      path "/frr-affinity-map:lib/frr-affinity-map:affinity-maps/frr-affinity-map:affinity-map/frr-affinity-map:name";
+      require-instance true;
+    }
+    description
+      "Reference to an affinity map";
+  }
+
   container lib {
     container affinity-maps {
       description

diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang
index 3c6e45126a1637f24de132afac419f2282f3a005..68774a84fafca1a9b8b8ab5a27d47a830c2c91fe 100644 (file)
--- a/yang/frr-zebra.yang
+++ b/yang/frr-zebra.yang
@@ -2011,7 +2011,7 @@ module frr-zebra {
           case affinity {
             container affinities {
               leaf-list affinity {
-                type string;
+                type frr-affinity-map:affinity-map-ref;
                 max-elements "256";
                 description
                   "Array of Attribute Names";

diff --git a/zebra/zebra_affinitymap.c b/zebra/zebra_affinitymap.c
index ae0f9a8a354d8ce6aa475b3f6d6cc825358433dc..fabd3e677c970b6ce1307ce3c53e8959e2763fce 100644 (file)
--- a/zebra/zebra_affinitymap.c
+++ b/zebra/zebra_affinitymap.c
@@ -26,30 +26,6 @@
 #include "zebra/redistribute.h"
 #include "zebra/zebra_affinitymap.h"
 
-static bool zebra_affinity_map_check_use(const char *affmap_name)
-{
-       char xpath[XPATH_MAXLEN];
-       struct interface *ifp;
-       struct vrf *vrf;
-
-       RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id) {
-               FOR_ALL_INTERFACES (vrf, ifp) {
-                       snprintf(xpath, sizeof(xpath),
-                                "/frr-interface:lib/interface[name='%s']",
-                                ifp->name);
-                       if (!yang_dnode_exists(running_config->dnode, xpath))
-                               continue;
-                       snprintf(
-                               xpath, sizeof(xpath),
-                               "/frr-interface:lib/interface[name='%s']/frr-zebra:zebra/link-params/affinities[affinity='%s']",
-                               ifp->name, affmap_name);
-                       if (yang_dnode_exists(running_config->dnode, xpath))
-                               return true;
-               }
-       }
-       return false;
-}
-
 static bool zebra_affinity_map_check_update(const char *affmap_name,
                                            uint16_t new_pos)
 {
@@ -138,7 +114,6 @@ void zebra_affinity_map_init(void)
 {
        affinity_map_init();
 
-       affinity_map_set_check_use_hook(zebra_affinity_map_check_use);
        affinity_map_set_check_update_hook(zebra_affinity_map_check_update);
        affinity_map_set_update_hook(zebra_affinity_map_update);
 }