staticd: fix nexthop creation and installation

Currently, staticd creates a VRF for the nexthop it is trying to install.
Later, when this nexthop is deleted, the VRF stays in the system and can
not be deleted by the user because "no vrf" command doesn't work for this
VRF because it was not created through northbound code.

There is no need to create the VRF. Just set nh_vrf_id to VRF_UNKNOWN
when the VRF doesn't exist.

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

diff --git a/staticd/static_nb_config.c b/staticd/static_nb_config.c
index 5b2fe720cb02a3c7753f7bb5acc429f9aa8e35db..8d3ec1c3a86fe1aa5f48561588f794a5bd32ec00 100644 (file)
--- a/staticd/static_nb_config.c
+++ b/staticd/static_nb_config.c
@@ -148,18 +148,6 @@ static bool static_nexthop_create(struct nb_cb_create_args *args,
                                                      "./gateway"));
                nh = static_add_nexthop(rn, pn, info->safi, info->svrf, nh_type,
                                        &ipaddr, ifname, nh_vrf, 0);
-               if (!nh) {
-                       char buf[SRCDEST2STR_BUFFER];
-
-                       flog_warn(
-                               EC_LIB_NB_CB_CONFIG_APPLY,
-                               "%s : nh [%d:%s:%s:%s] nexthop creation failed",
-                               srcdest_rnode2str(rn, buf, sizeof(buf)),
-                               nh_type, ifname,
-                               yang_dnode_get_string(args->dnode, "./gateway"),
-                               nh_vrf);
-                       return NB_ERR;
-               }
                nb_running_set_entry(args->dnode, nh);
                break;
        }

diff --git a/staticd/static_routes.c b/staticd/static_routes.c
index 4237da24bdd25aa7e1f82218cc62717cdd037d9a..7689f54412575404804dff9fe9f6ffe9e1933392 100644 (file)
--- a/staticd/static_routes.c
+++ b/staticd/static_routes.c
@@ -217,10 +217,7 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
 
        route_lock_node(rn);
 
-       nh_svrf = static_vty_get_unknown_vrf(nh_vrf);
-
-       if (!nh_svrf)
-               return NULL;
+       nh_svrf = static_vrf_lookup_by_name(nh_vrf);
 
        /* Make new static route structure. */
        nh = XCALLOC(MTYPE_STATIC_NEXTHOP, sizeof(struct static_nexthop));
@@ -228,8 +225,8 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
        nh->type = type;
        nh->color = color;
 
-       nh->nh_vrf_id = nh_svrf->vrf->vrf_id;
-       strlcpy(nh->nh_vrfname, nh_svrf->vrf->name, sizeof(nh->nh_vrfname));
+       nh->nh_vrf_id = nh_svrf ? nh_svrf->vrf->vrf_id : VRF_UNKNOWN;
+       strlcpy(nh->nh_vrfname, nh_vrf, sizeof(nh->nh_vrfname));
 
        if (ifname)
                strlcpy(nh->ifname, ifname, sizeof(nh->ifname));
@@ -264,7 +261,7 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
        }
        static_nexthop_list_add_after(&(pn->nexthop_list), cp, nh);
 
-       if (nh_svrf->vrf->vrf_id == VRF_UNKNOWN)
+       if (nh->nh_vrf_id == VRF_UNKNOWN)
                return nh;
 
        /* check whether interface exists in system & install if it does */
@@ -274,7 +271,7 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
                break;
        case STATIC_IPV4_GATEWAY_IFNAME:
        case STATIC_IPV6_GATEWAY_IFNAME:
-               ifp = if_lookup_by_name(ifname, nh_svrf->vrf->vrf_id);
+               ifp = if_lookup_by_name(ifname, nh->nh_vrf_id);
                if (ifp && ifp->ifindex != IFINDEX_INTERNAL)
                        nh->ifindex = ifp->ifindex;
                else
@@ -287,7 +284,7 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
                nh->bh_type = STATIC_BLACKHOLE_NULL;
                break;
        case STATIC_IFNAME:
-               ifp = if_lookup_by_name(ifname, nh_svrf->vrf->vrf_id);
+               ifp = if_lookup_by_name(ifname, nh->nh_vrf_id);
                if (ifp && ifp->ifindex != IFINDEX_INTERNAL) {
                        nh->ifindex = ifp->ifindex;
                } else
@@ -305,15 +302,9 @@ void static_install_nexthop(struct route_node *rn, struct static_path *pn,
                            struct static_vrf *svrf, const char *ifname,
                            static_types type, const char *nh_vrf)
 {
-       struct static_vrf *nh_svrf;
        struct interface *ifp;
 
-       nh_svrf = static_vty_get_unknown_vrf(nh_vrf);
-
-       if (!nh_svrf)
-               return;
-
-       if (nh_svrf->vrf->vrf_id == VRF_UNKNOWN)
+       if (nh->nh_vrf_id == VRF_UNKNOWN)
                return;
 
        /* check whether interface exists in system & install if it does */
@@ -332,7 +323,7 @@ void static_install_nexthop(struct route_node *rn, struct static_path *pn,
                static_install_path(rn, pn, safi, svrf);
                break;
        case STATIC_IFNAME:
-               ifp = if_lookup_by_name(ifname, nh_svrf->vrf->vrf_id);
+               ifp = if_lookup_by_name(ifname, nh->nh_vrf_id);
                if (ifp && ifp->ifindex != IFINDEX_INTERNAL)
                        static_install_path(rn, pn, safi, svrf);
 
@@ -344,13 +335,9 @@ int static_delete_nexthop(struct route_node *rn, struct static_path *pn,
                          safi_t safi, struct static_vrf *svrf,
                          struct static_nexthop *nh)
 {
-       struct static_vrf *nh_svrf;
-
-       nh_svrf = static_vrf_lookup_by_name(nh->nh_vrfname);
-
        static_nexthop_list_del(&(pn->nexthop_list), nh);
 
-       if (nh_svrf->vrf->vrf_id == VRF_UNKNOWN)
+       if (nh->nh_vrf_id == VRF_UNKNOWN)
                goto EXIT;
 
        static_zebra_nht_register(rn, nh, false);

diff --git a/staticd/static_vrf.c b/staticd/static_vrf.c
index 5ae34257158cca6d0628ea64432874751212b4cd..9748833a77d1243fc67819c2f2d2427a0a5d989d 100644 (file)
--- a/staticd/static_vrf.c
+++ b/staticd/static_vrf.c
@@ -263,25 +263,3 @@ void static_vrf_terminate(void)
 {
        vrf_terminate();
 }
-
-struct static_vrf *static_vty_get_unknown_vrf(const char *vrf_name)
-{
-       struct static_vrf *svrf;
-       struct vrf *vrf;
-
-       svrf = static_vrf_lookup_by_name(vrf_name);
-
-       if (svrf)
-               return svrf;
-
-       vrf = vrf_get(VRF_UNKNOWN, vrf_name);
-       if (!vrf)
-               return NULL;
-       svrf = vrf->info;
-       if (!svrf)
-               return NULL;
-       /* Mark as having FRR configuration */
-       vrf_set_user_cfged(vrf);
-
-       return svrf;
-}

diff --git a/staticd/static_vrf.h b/staticd/static_vrf.h
index 12ad1b255af0a40dd610bc4d57a599218ef90744..81296f286463351e7ce6ca65239532d6f310a709 100644 (file)
--- a/staticd/static_vrf.h
+++ b/staticd/static_vrf.h
@@ -45,5 +45,4 @@ struct route_table *static_vrf_static_table(afi_t afi, safi_t safi,
                                            struct static_vrf *svrf);
 extern void static_vrf_terminate(void);
 
-struct static_vrf *static_vty_get_unknown_vrf(const char *vrf_name);
 #endif