bgpd, yang: add gretap encapsulation type in route-map

Add support for gretap encapsulation type.

Signed-off-by: Philippe Guibert <[email protected]>

Author: pguibert6WIND

bgpd/bgp_routemap.c

@@ -2294,7 +2294,7 @@ route_set_l3vpn_nexthop_encapsulation(void *rule, const struct prefix *prefix,
 
 	path = object;
 
-	if (rins->zif_type != ZEBRA_IF_GRE)
+	if (rins->zif_type != ZEBRA_IF_GRE && rins->zif_type != ZEBRA_IF_GRETAP)
 		return RMAP_OKAY;
 
 	SET_FLAG(path->attr->rmap_change_flags, BATTR_RMAP_L3VPN_ACCEPT_GRE);
@@ -2310,7 +2310,10 @@ static void *route_set_l3vpn_nexthop_encapsulation_compile(const char *arg)
 		       sizeof(struct rmap_l3vpn_nexthop_encapsulation_set));
 
 	/* XXX ALL GRE modes are accepted for now: gre or ip6gre */
-	rins->zif_type = ZEBRA_IF_GRE;
+	if (strmatch(arg, "gretap"))
+		rins->zif_type = ZEBRA_IF_GRETAP;
+	else
+		rins->zif_type = ZEBRA_IF_GRE;
 
 	return rins;
 }
@@ -6275,12 +6278,13 @@ DEFUN_YANG (no_set_distance,
 }
 
 DEFPY_YANG(set_l3vpn_nexthop_encapsulation, set_l3vpn_nexthop_encapsulation_cmd,
-	   "[no] set l3vpn next-hop encapsulation gre",
+	   "[no] set l3vpn next-hop encapsulation <gre|gretap>$ziftype",
 	   NO_STR SET_STR
 	   "L3VPN operations\n"
 	   "Next hop Information\n"
 	   "Encapsulation options (for BGP only)\n"
-	   "Accept L3VPN traffic over GRE encapsulation\n")
+	   "Accept L3VPN traffic over GRE encapsulation\n"
+	   "Accept L3VPN traffic over GRETAP encapsulation\n")
 {
 	const char *xpath =
 		"./set-action[action='frr-bgp-route-map:set-l3vpn-nexthop-encapsulation']";
@@ -6297,7 +6301,7 @@ DEFPY_YANG(set_l3vpn_nexthop_encapsulation, set_l3vpn_nexthop_encapsulation_cmd,
 	if (operation == NB_OP_DESTROY)
 		return nb_cli_apply_changes(vty, NULL);
 
-	nb_cli_enqueue_change(vty, xpath_value, NB_OP_MODIFY, "gre");
+	nb_cli_enqueue_change(vty, xpath_value, NB_OP_MODIFY, ziftype);
 
 	return nb_cli_apply_changes(vty, NULL);
 }

yang/frr-bgp-route-map.yang

@@ -1366,6 +1366,11 @@ identity set-extcommunity-color {
             description
               "GRE protocol";
           }
+          enum "gretap" {
+            value 1;
+            description
+              "GRE protocol";
+          }
         }
         description
           "Specify L3VPN traffic over other than LSP encapsulation value";