Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / nexthop_group.c

diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c
index 52c1b6b6d4828ef0509664a57fd370913f610da2..0613fc6736ade0d0b43e8d99fd171c1c79653f4f 100644 (file)
--- a/lib/nexthop_group.c
+++ b/lib/nexthop_group.c
@@ -28,6 +28,7 @@ struct nexthop_hold {
        char *intf;
        bool onlink;
        char *labels;
+       vni_t vni;
        uint32_t weight;
        char *backup_str;
 };
@@ -118,6 +119,18 @@ nexthop_group_active_nexthop_num_no_recurse(const struct nexthop_group *nhg)
        return num;
 }
 
+bool nexthop_group_has_label(const struct nexthop_group *nhg)
+{
+       struct nexthop *nhop;
+
+       for (ALL_NEXTHOPS_PTR(nhg, nhop)) {
+               if (nhop->nh_label)
+                       return true;
+       }
+
+       return false;
+}
+
 struct nexthop *nexthop_exists(const struct nexthop_group *nhg,
                               const struct nexthop *nh)
 {
@@ -778,12 +791,13 @@ static bool nexthop_group_parse_nexthop(struct nexthop *nhop,
                                        const union sockunion *addr,
                                        const char *intf, bool onlink,
                                        const char *name, const char *labels,
-                                       int *lbl_ret, uint32_t weight,
-                                       const char *backup_str)
+                                       vni_t vni, int *lbl_ret,
+                                       uint32_t weight, const char *backup_str)
 {
        int ret = 0;
        struct vrf *vrf;
        int num;
+       uint8_t labelnum = 0;
 
        memset(nhop, 0, sizeof(*nhop));
 
@@ -824,10 +838,9 @@ static bool nexthop_group_parse_nexthop(struct nexthop *nhop,
                nhop->type = NEXTHOP_TYPE_IFINDEX;
 
        if (labels) {
-               uint8_t num = 0;
                mpls_label_t larray[MPLS_MAX_LABELS];
 
-               ret = mpls_str2label(labels, &num, larray);
+               ret = mpls_str2label(labels, &labelnum, larray);
 
                /* Return label parse result */
                if (lbl_ret)
@@ -835,9 +848,14 @@ static bool nexthop_group_parse_nexthop(struct nexthop *nhop,
 
                if (ret < 0)
                        return false;
-               else if (num > 0)
-                       nexthop_add_labels(nhop, ZEBRA_LSP_NONE,
-                                          num, larray);
+               else if (labelnum > 0)
+                       nexthop_add_labels(nhop, ZEBRA_LSP_NONE, labelnum,
+                                          larray);
+       } else if (vni) {
+               mpls_label_t label = MPLS_INVALID_LABEL;
+
+               vni2label(vni, &label);
+               nexthop_add_labels(nhop, ZEBRA_LSP_EVPN, 1, &label);
        }
 
        nhop->weight = weight;
@@ -864,7 +882,7 @@ static bool nexthop_group_parse_nhh(struct nexthop *nhop,
 {
        return (nexthop_group_parse_nexthop(
                nhop, nhh->addr, nhh->intf, nhh->onlink, nhh->nhvrf_name,
-               nhh->labels, NULL, nhh->weight, nhh->backup_str));
+               nhh->labels, nhh->vni, NULL, nhh->weight, nhh->backup_str));
 }
 
 DEFPY(ecmp_nexthops, ecmp_nexthops_cmd,
@@ -876,6 +894,7 @@ DEFPY(ecmp_nexthops, ecmp_nexthops_cmd,
        [{ \
           nexthop-vrf NAME$vrf_name \
           |label WORD \
+          |vni (1-16777215) \
            |weight (1-255) \
            |backup-idx WORD \
        }]",
@@ -890,6 +909,8 @@ DEFPY(ecmp_nexthops, ecmp_nexthops_cmd,
       "The nexthop-vrf Name\n"
       "Specify label(s) for this nexthop\n"
       "One or more labels in the range (16-1048575) separated by '/'\n"
+      "Specify VNI(s) for this nexthop\n"
+      "VNI in the range (1-16777215)\n"
       "Weight to be used by the nexthop for purposes of ECMP\n"
       "Weight value to be used\n"
       "Specify backup nexthop indexes in another group\n"
@@ -914,8 +935,8 @@ DEFPY(ecmp_nexthops, ecmp_nexthops_cmd,
        }
 
        legal = nexthop_group_parse_nexthop(&nhop, addr, intf, !!onlink,
-                                           vrf_name, label, &lbl_ret, weight,
-                                           backup_idx);
+                                           vrf_name, label, vni, &lbl_ret,
+                                           weight, backup_idx);
 
        if (nhop.type == NEXTHOP_TYPE_IPV6
            && IN6_IS_ADDR_LINKLOCAL(&nhop.gate.ipv6)) {
@@ -1045,9 +1066,8 @@ void nexthop_group_write_nexthop(struct vty *vty, const struct nexthop *nh)
        if (nh->nh_label && nh->nh_label->num_labels > 0) {
                char buf[200];
 
-               mpls_label2str(nh->nh_label->num_labels,
-                              nh->nh_label->label,
-                              buf, sizeof(buf), 0);
+               mpls_label2str(nh->nh_label->num_labels, nh->nh_label->label,
+                              buf, sizeof(buf), nh->nh_label_type, 0);
                vty_out(vty, " label %s", buf);
        }
 
@@ -1104,7 +1124,7 @@ void nexthop_group_json_nexthop(json_object *j, const struct nexthop *nh)
                char buf[200];
 
                mpls_label2str(nh->nh_label->num_labels, nh->nh_label->label,
-                              buf, sizeof(buf), 0);
+                              buf, sizeof(buf), nh->nh_label_type, 0);
                json_object_string_add(j, "label", buf);
        }
 
@@ -1142,6 +1162,9 @@ static void nexthop_group_write_nexthop_internal(struct vty *vty,
        if (nh->labels)
                vty_out(vty, " label %s", nh->labels);
 
+       if (nh->vni)
+               vty_out(vty, " vni %u", nh->vni);
+
        if (nh->weight)
                vty_out(vty, " weight %u", nh->weight);