proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 14:29:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue #4032: Add IS-IS-TE support per Area

Browse Source 
- Change MPLS-TE from global to per Area
 - Add new mpls_te_area structure to area in replacement of global variable
isisMPLS_TE
 - Move mpls-te frmo global to instance in frr-isisd.yang
 - Change code in isis_te.c, isis_northbound.c, isis_cli.c, isis_pdu.c,
isis_lsp.c and isis_zebra.c accordingly

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
This commit is contained in:
Olivier Dugeon 2019-04-15 16:11:40 +02:00
parent 45ec928f49
commit 9c95fe6986
11 changed files with 188 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
isisd/isis_circuit.h
View File

@ -121,8 +121,7 @@ struct isis_circuit {
uint16_t psnp_interval[2]; /* psnp-interval in seconds */ uint16_t psnp_interval[2]; /* psnp-interval in seconds */
uint8_t metric[2]; uint8_t metric[2];
uint32_t te_metric[2]; uint32_t te_metric[2];
struct mpls_te_circuit struct mpls_te_circuit *mtc; /* MPLS-TE parameters */
*mtc; /* Support for MPLS-TE parameters - see isis_te.[c,h] */
int ip_router; /* Route IP ? */ int ip_router; /* Route IP ? */
int is_passive; /* Is Passive ? */ int is_passive; /* Is Passive ? */
struct list *mt_settings; /* IS-IS MT Settings */ struct list *mt_settings; /* IS-IS MT Settings */

27
isisd/isis_cli.c
View File

@ -932,12 +932,12 @@ void cli_show_isis_purge_origin(struct vty *vty, struct lyd_node *dnode,
} }
/* /*
* XPath: /frr-isisd:isis/mpls-te * XPath: /frr-isisd:isis/instance/mpls-te
*/ */
DEFPY(isis_mpls_te_on, isis_mpls_te_on_cmd, "mpls-te on", DEFPY(isis_mpls_te_on, isis_mpls_te_on_cmd, "mpls-te on",
MPLS_TE_STR "Enable the MPLS-TE functionality\n") MPLS_TE_STR "Enable the MPLS-TE functionality\n")
{ {
nb_cli_enqueue_change(vty, "/frr-isisd:isis/mpls-te", NB_OP_CREATE, nb_cli_enqueue_change(vty, "./mpls-te", NB_OP_CREATE,
NULL); NULL);
return nb_cli_apply_changes(vty, NULL); return nb_cli_apply_changes(vty, NULL);
@ -946,9 +946,9 @@ DEFPY(isis_mpls_te_on, isis_mpls_te_on_cmd, "mpls-te on",
DEFPY(no_isis_mpls_te_on, no_isis_mpls_te_on_cmd, "no mpls-te [on]", DEFPY(no_isis_mpls_te_on, no_isis_mpls_te_on_cmd, "no mpls-te [on]",
NO_STR NO_STR
"Disable the MPLS-TE functionality\n" "Disable the MPLS-TE functionality\n"
"Enable the MPLS-TE functionality\n") "Disable the MPLS-TE functionality\n")
{ {
nb_cli_enqueue_change(vty, "/frr-isisd:isis/mpls-te", NB_OP_DESTROY, nb_cli_enqueue_change(vty, "./mpls-te", NB_OP_DESTROY,
NULL); NULL);
return nb_cli_apply_changes(vty, NULL); return nb_cli_apply_changes(vty, NULL);
@ -961,7 +961,7 @@ void cli_show_isis_mpls_te(struct vty *vty, struct lyd_node *dnode,
} }
/* /*
* XPath: /frr-isisd:isis/mpls-te/router-address * XPath: /frr-isisd:isis/instance/mpls-te/router-address
*/ */
DEFPY(isis_mpls_te_router_addr, isis_mpls_te_router_addr_cmd, DEFPY(isis_mpls_te_router_addr, isis_mpls_te_router_addr_cmd,
"mpls-te router-address A.B.C.D", "mpls-te router-address A.B.C.D",
@ -969,12 +969,24 @@ DEFPY(isis_mpls_te_router_addr, isis_mpls_te_router_addr_cmd,
"Stable IP address of the advertising router\n" "Stable IP address of the advertising router\n"
"MPLS-TE router address in IPv4 address format\n") "MPLS-TE router address in IPv4 address format\n")
{ {
nb_cli_enqueue_change(vty, "/frr-isisd:isis/mpls-te/router-address", nb_cli_enqueue_change(vty, "./mpls-te/router-address",
NB_OP_MODIFY, router_address_str); NB_OP_MODIFY, router_address_str);
return nb_cli_apply_changes(vty, NULL); return nb_cli_apply_changes(vty, NULL);
} }
DEFPY(no_isis_mpls_te_router_addr, no_isis_mpls_te_router_addr_cmd,
"no mpls-te router-address [A.B.C.D]",
NO_STR MPLS_TE_STR
"Delete IP address of the advertising router\n"
"MPLS-TE router address in IPv4 address format\n")
{
nb_cli_enqueue_change(vty, "./mpls-te/router-address",
NB_OP_DESTROY, NULL);
return nb_cli_apply_changes(vty, NULL);
}
void cli_show_isis_mpls_te_router_addr(struct vty *vty, struct lyd_node *dnode, void cli_show_isis_mpls_te_router_addr(struct vty *vty, struct lyd_node *dnode,
bool show_defaults) bool show_defaults)
{ {
@ -990,7 +1002,7 @@ DEFPY(isis_mpls_te_inter_as, isis_mpls_te_inter_as_cmd,
"AREA native mode self originate INTER-AS LSP with L1 and L2 flooding scope\n" "AREA native mode self originate INTER-AS LSP with L1 and L2 flooding scope\n"
"AS native mode self originate INTER-AS LSP with L2 only flooding scope\n") "AS native mode self originate INTER-AS LSP with L2 only flooding scope\n")
{ {
vty_out(vty, "MPLS-TE Inter-AS is not yet supported."); vty_out(vty, "MPLS-TE Inter-AS is not yet supported\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1978,6 +1990,7 @@ void isis_cli_init(void)
install_element(ISIS_NODE, &isis_mpls_te_on_cmd); install_element(ISIS_NODE, &isis_mpls_te_on_cmd);
install_element(ISIS_NODE, &no_isis_mpls_te_on_cmd); install_element(ISIS_NODE, &no_isis_mpls_te_on_cmd);
install_element(ISIS_NODE, &isis_mpls_te_router_addr_cmd); install_element(ISIS_NODE, &isis_mpls_te_router_addr_cmd);
install_element(ISIS_NODE, &no_isis_mpls_te_router_addr_cmd);
install_element(ISIS_NODE, &isis_mpls_te_inter_as_cmd); install_element(ISIS_NODE, &isis_mpls_te_inter_as_cmd);
install_element(ISIS_NODE, &isis_default_originate_cmd); install_element(ISIS_NODE, &isis_default_originate_cmd);

4
isisd/isis_lsp.c
View File

@ -1070,7 +1070,7 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area)
uint8_t subtlvs[256]; uint8_t subtlvs[256];
uint8_t subtlv_len; uint8_t subtlv_len;
if (IS_MPLS_TE(isisMplsTE) if (IS_MPLS_TE(area->mta)
&& circuit->interface && circuit->interface
&& HAS_LINK_PARAMS( && HAS_LINK_PARAMS(
circuit->interface)) circuit->interface))
@ -1112,7 +1112,7 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area)
uint8_t subtlvs[256]; uint8_t subtlvs[256];
uint8_t subtlv_len; uint8_t subtlv_len;
if (IS_MPLS_TE(isisMplsTE) if (IS_MPLS_TE(area->mta)
&& circuit->interface != NULL && circuit->interface != NULL
&& HAS_LINK_PARAMS( && HAS_LINK_PARAMS(
circuit->interface)) circuit->interface))

92
isisd/isis_northbound.c
View File

@ -1395,19 +1395,40 @@ isis_instance_log_adjacency_changes_modify(enum nb_event event,
} }
/* /*
* XPath: /frr-isisd:isis/mpls-te * XPath: /frr-isisd:isis/instance/mpls-te
*/ */
static int isis_mpls_te_create(enum nb_event event, static int isis_instance_mpls_te_create(enum nb_event event,
const struct lyd_node *dnode, const struct lyd_node *dnode,
union nb_resource *resource) union nb_resource *resource)
{ {
struct listnode *node; struct listnode *node;
struct isis_area *area;
struct isis_circuit *circuit; struct isis_circuit *circuit;
if (event != NB_EV_APPLY) if (event != NB_EV_APPLY)
return NB_OK; return NB_OK;
isisMplsTE.status = enable; area = yang_dnode_get_entry(dnode, true);
if (area->mta == NULL) {
struct mpls_te_area *new;
zlog_debug("ISIS MPLS-TE: Initialize area %s",
area->area_tag);
new = XCALLOC(MTYPE_ISIS_MPLS_TE, sizeof(struct mpls_te_area));
/* Initialize MPLS_TE structure */
new->status = enable;
new->level = 0;
new->inter_as = off;
new->interas_areaid.s_addr = 0;
new->router_id.s_addr = 0;
area->mta = new;
} else {
area->mta->status = enable;
}
/* /*
* Following code is intended to handle two cases; * Following code is intended to handle two cases;
@ -1417,11 +1438,11 @@ static int isis_mpls_te_create(enum nb_event event,
* MPLS_TE flag * MPLS_TE flag
* 2) MPLS-TE was once enabled then disabled, and now enabled again. * 2) MPLS-TE was once enabled then disabled, and now enabled again.
*/ */
for (ALL_LIST_ELEMENTS_RO(isisMplsTE.cir_list, node, circuit)) { for (ALL_LIST_ELEMENTS_RO(area->circuit_list, node, circuit)) {
if (circuit->mtc == NULL || IS_FLOOD_AS(circuit->mtc->type)) if (circuit->mtc == NULL || IS_FLOOD_AS(circuit->mtc->type))
continue; continue;
if ((circuit->mtc->status == disable) if (!IS_MPLS_TE(circuit->mtc)
&& HAS_LINK_PARAMS(circuit->interface)) && HAS_LINK_PARAMS(circuit->interface))
circuit->mtc->status = enable; circuit->mtc->status = enable;
else else
@ -1436,19 +1457,24 @@ static int isis_mpls_te_create(enum nb_event event,
return NB_OK; return NB_OK;
} }
static int isis_mpls_te_destroy(enum nb_event event, static int isis_instance_mpls_te_destroy(enum nb_event event,
const struct lyd_node *dnode) const struct lyd_node *dnode)
{ {
struct listnode *node; struct listnode *node;
struct isis_area *area;
struct isis_circuit *circuit; struct isis_circuit *circuit;
if (event != NB_EV_APPLY) if (event != NB_EV_APPLY)
return NB_OK; return NB_OK;
isisMplsTE.status = disable; area = yang_dnode_get_entry(dnode, true);
if (IS_MPLS_TE(area->mta))
area->mta->status = disable;
else
return NB_OK;
/* Flush LSP if circuit engage */ /* Flush LSP if circuit engage */
for (ALL_LIST_ELEMENTS_RO(isisMplsTE.cir_list, node, circuit)) { for (ALL_LIST_ELEMENTS_RO(area->circuit_list, node, circuit)) {
if (circuit->mtc == NULL || (circuit->mtc->status == disable)) if (circuit->mtc == NULL || (circuit->mtc->status == disable))
continue; continue;
@ -1465,55 +1491,53 @@ static int isis_mpls_te_destroy(enum nb_event event,
} }
/* /*
* XPath: /frr-isisd:isis/mpls-te/router-address * XPath: /frr-isisd:isis/instance/mpls-te/router-address
*/ */
static int isis_mpls_te_router_address_modify(enum nb_event event, static int isis_instance_mpls_te_router_address_modify(enum nb_event event,
const struct lyd_node *dnode, const struct lyd_node *dnode,
union nb_resource *resource) union nb_resource *resource)
{ {
struct in_addr value; struct in_addr value;
struct listnode *node;
struct isis_area *area; struct isis_area *area;
if (event != NB_EV_APPLY) if (event != NB_EV_APPLY)
return NB_OK; return NB_OK;
yang_dnode_get_ipv4(&value, dnode, NULL); area = yang_dnode_get_entry(dnode, true);
isisMplsTE.router_id.s_addr = value.s_addr;
/* only proceed if MPLS-TE is enabled */ /* only proceed if MPLS-TE is enabled */
if (isisMplsTE.status == disable) if (!IS_MPLS_TE(area->mta))
return NB_OK; return NB_OK;
/* Update main Router ID in isis global structure */ /* Update Area Router ID */
isis->router_id = value.s_addr; yang_dnode_get_ipv4(&value, dnode, NULL);
area->mta->router_id.s_addr = value.s_addr;
/* And re-schedule LSP update */ /* And re-schedule LSP update */
for (ALL_LIST_ELEMENTS_RO(isis->area_list, node, area)) if (listcount(area->area_addrs) > 0)
if (listcount(area->area_addrs) > 0) lsp_regenerate_schedule(area, area->is_type, 0);
lsp_regenerate_schedule(area, area->is_type, 0);
return NB_OK; return NB_OK;
} }
static int isis_mpls_te_router_address_destroy(enum nb_event event, static int isis_instance_mpls_te_router_address_destroy(enum nb_event event,
const struct lyd_node *dnode) const struct lyd_node *dnode)
{ {
struct listnode *node;
struct isis_area *area; struct isis_area *area;
if (event != NB_EV_APPLY) if (event != NB_EV_APPLY)
return NB_OK; return NB_OK;
isisMplsTE.router_id.s_addr = INADDR_ANY; area = yang_dnode_get_entry(dnode, true);
/* only proceed if MPLS-TE is enabled */ /* only proceed if MPLS-TE is enabled */
if (isisMplsTE.status == disable) if (!IS_MPLS_TE(area->mta))
return NB_OK; return NB_OK;
/* Update main Router ID in isis global structure */ /* Reset Area Router ID */
isis->router_id = 0; area->mta->router_id.s_addr = INADDR_ANY;
/* And re-schedule LSP update */ /* And re-schedule LSP update */
for (ALL_LIST_ELEMENTS_RO(isis->area_list, node, area)) if (listcount(area->area_addrs) > 0)
if (listcount(area->area_addrs) > 0) lsp_regenerate_schedule(area, area->is_type, 0);
lsp_regenerate_schedule(area, area->is_type, 0);
return NB_OK; return NB_OK;
} }
@ -3049,15 +3073,15 @@ const struct frr_yang_module_info frr_isisd_info = {
.cbs.cli_show = cli_show_isis_log_adjacency, .cbs.cli_show = cli_show_isis_log_adjacency,
}, },
{ {
.xpath = "/frr-isisd:isis/mpls-te", .xpath = "/frr-isisd:isis/instance/mpls-te",
.cbs.create = isis_mpls_te_create, .cbs.create = isis_instance_mpls_te_create,
.cbs.destroy = isis_mpls_te_destroy, .cbs.destroy = isis_instance_mpls_te_destroy,
.cbs.cli_show = cli_show_isis_mpls_te, .cbs.cli_show = cli_show_isis_mpls_te,
}, },
{ {
.xpath = "/frr-isisd:isis/mpls-te/router-address", .xpath = "/frr-isisd:isis/instance/mpls-te/router-address",
.cbs.modify = isis_mpls_te_router_address_modify, .cbs.modify = isis_instance_mpls_te_router_address_modify,
.cbs.destroy = isis_mpls_te_router_address_destroy, .cbs.destroy = isis_instance_mpls_te_router_address_destroy,
.cbs.cli_show = cli_show_isis_mpls_te_router_addr, .cbs.cli_show = cli_show_isis_mpls_te_router_addr,
}, },
{ {

5
isisd/isis_pdu.c
View File

@ -201,8 +201,9 @@ static int process_p2p_hello(struct iih_info *iih)
adj); adj);
/* Update MPLS TE Remote IP address parameter if possible */ /* Update MPLS TE Remote IP address parameter if possible */
if (IS_MPLS_TE(isisMplsTE) && iih->circuit->mtc if (adj->ipv4_address_count && iih->circuit->area
&& IS_CIRCUIT_TE(iih->circuit->mtc) && adj->ipv4_address_count) && IS_MPLS_TE(iih->circuit->area->mta)
&& IS_MPLS_TE(iih->circuit->mtc))
set_circuitparams_rmt_ipaddr(iih->circuit->mtc, set_circuitparams_rmt_ipaddr(iih->circuit->mtc,
adj->ipv4_addresses[0]); adj->ipv4_addresses[0]);

198
isisd/isis_te.c
View File

@ -58,9 +58,6 @@
#include "isisd/isis_spf.h" #include "isisd/isis_spf.h"
#include "isisd/isis_te.h" #include "isisd/isis_te.h"
/* Global varial for MPLS TE management */
struct isis_mpls_te isisMplsTE;
const char *mode2text[] = {"Disable", "Area", "AS", "Emulate"}; const char *mode2text[] = {"Disable", "Area", "AS", "Emulate"};
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
@ -624,7 +621,7 @@ void isis_link_params_update(struct isis_circuit *circuit,
/* Finally Update LSP */ /* Finally Update LSP */
#if 0 #if 0
if (IS_MPLS_TE(isisMplsTE) && circuit->area) if (circuit->area && IS_MPLS_TE(circuit->area->mta))
lsp_regenerate_schedule (circuit->area, circuit->is_type, 0); lsp_regenerate_schedule (circuit->area, circuit->is_type, 0);
#endif #endif
return; return;
@ -646,7 +643,7 @@ void isis_mpls_te_update(struct interface *ifp)
isis_link_params_update(circuit, ifp); isis_link_params_update(circuit, ifp);
/* ... and LSP */ /* ... and LSP */
if (IS_MPLS_TE(isisMplsTE) && circuit->area) if (circuit->area && IS_MPLS_TE(circuit->area->mta))
lsp_regenerate_schedule(circuit->area, circuit->is_type, 0); lsp_regenerate_schedule(circuit->area, circuit->is_type, 0);
return; return;
@ -1058,35 +1055,11 @@ void mpls_te_print_detail(struct sbuf *buf, int indent,
return; return;
} }
/* Specific MPLS TE router parameters write function */
void isis_mpls_te_config_write_router(struct vty *vty)
{
if (IS_MPLS_TE(isisMplsTE)) {
vty_out(vty, " mpls-te on\n");
vty_out(vty, " mpls-te router-address %s\n",
inet_ntoa(isisMplsTE.router_id));
}
return;
}
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* Followings are vty command functions. * Followings are vty command functions.
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
#ifndef FABRICD #ifndef FABRICD
/* Search MPLS TE Circuit context from Interface */
static struct mpls_te_circuit *lookup_mpls_params_by_ifp(struct interface *ifp)
{
struct isis_circuit *circuit;
if ((circuit = circuit_scan_by_ifp(ifp)) == NULL)
return NULL;
return circuit->mtc;
}
DEFUN (show_isis_mpls_te_router, DEFUN (show_isis_mpls_te_router,
show_isis_mpls_te_router_cmd, show_isis_mpls_te_router_cmd,
"show " PROTO_NAME " mpls-te router", "show " PROTO_NAME " mpls-te router",
@ -1095,85 +1068,74 @@ DEFUN (show_isis_mpls_te_router,
MPLS_TE_STR MPLS_TE_STR
"Router information\n") "Router information\n")
{ {
if (IS_MPLS_TE(isisMplsTE)) {
vty_out(vty, "--- MPLS-TE router parameters ---\n");
if (ntohs(isisMplsTE.router_id.s_addr) != 0) struct listnode *anode;
vty_out(vty, " Router-Address: %s\n", struct isis_area *area;
inet_ntoa(isisMplsTE.router_id));
if (!isis) {
vty_out(vty, "IS-IS Routing Process not enabled\n");
return CMD_SUCCESS;
}
for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, area)) {
if (!IS_MPLS_TE(area->mta))
continue;
vty_out(vty, "Area %s:\n", area->area_tag);
if (ntohs(area->mta->router_id.s_addr) != 0)
vty_out(vty, " MPLS-TE Router-Address: %s\n",
inet_ntoa(area->mta->router_id));
else else
vty_out(vty, " N/A\n"); vty_out(vty, " N/A\n");
} else }
vty_out(vty, " MPLS-TE is disable on this router\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
static void show_mpls_te_sub(struct vty *vty, struct interface *ifp) static void show_mpls_te_sub(struct vty *vty, char *name,
struct mpls_te_circuit *mtc)
{ {
struct mpls_te_circuit *mtc;
struct sbuf buf; struct sbuf buf;
sbuf_init(&buf, NULL, 0); sbuf_init(&buf, NULL, 0);
if ((IS_MPLS_TE(isisMplsTE)) if (mtc->status != enable)
&& ((mtc = lookup_mpls_params_by_ifp(ifp)) != NULL)) { return;
/* Continue only if interface is not passive or support Inter-AS
* TEv2 */
if (mtc->status != enable) {
if (IS_INTER_AS(mtc->type)) {
vty_out(vty,
"-- Inter-AS TEv2 link parameters for %s --\n",
ifp->name);
} else {
/* MPLS-TE is not activate on this interface */
/* or this interface is passive and Inter-AS
* TEv2 is not activate */
vty_out(vty,
" %s: MPLS-TE is disabled on this interface\n",
ifp->name);
return;
}
} else {
vty_out(vty, "-- MPLS-TE link parameters for %s --\n",
ifp->name);
}
sbuf_reset(&buf); vty_out(vty, "-- MPLS-TE link parameters for %s --\n", name);
print_subtlv_admin_grp(&buf, 4, &mtc->admin_grp);
if (SUBTLV_TYPE(mtc->local_ipaddr) != 0) sbuf_reset(&buf);
print_subtlv_local_ipaddr(&buf, 4, &mtc->local_ipaddr); print_subtlv_admin_grp(&buf, 4, &mtc->admin_grp);
if (SUBTLV_TYPE(mtc->rmt_ipaddr) != 0)
print_subtlv_rmt_ipaddr(&buf, 4, &mtc->rmt_ipaddr);
print_subtlv_max_bw(&buf, 4, &mtc->max_bw); if (SUBTLV_TYPE(mtc->local_ipaddr) != 0)
print_subtlv_max_rsv_bw(&buf, 4, &mtc->max_rsv_bw); print_subtlv_local_ipaddr(&buf, 4, &mtc->local_ipaddr);
print_subtlv_unrsv_bw(&buf, 4, &mtc->unrsv_bw); if (SUBTLV_TYPE(mtc->rmt_ipaddr) != 0)
print_subtlv_te_metric(&buf, 4, &mtc->te_metric); print_subtlv_rmt_ipaddr(&buf, 4, &mtc->rmt_ipaddr);
if (IS_INTER_AS(mtc->type)) { print_subtlv_max_bw(&buf, 4, &mtc->max_bw);
if (SUBTLV_TYPE(mtc->ras) != 0) print_subtlv_max_rsv_bw(&buf, 4, &mtc->max_rsv_bw);
print_subtlv_ras(&buf, 4, &mtc->ras); print_subtlv_unrsv_bw(&buf, 4, &mtc->unrsv_bw);
if (SUBTLV_TYPE(mtc->rip) != 0) print_subtlv_te_metric(&buf, 4, &mtc->te_metric);
print_subtlv_rip(&buf, 4, &mtc->rip);
}
print_subtlv_av_delay(&buf, 4, &mtc->av_delay); if (IS_INTER_AS(mtc->type)) {
print_subtlv_mm_delay(&buf, 4, &mtc->mm_delay); if (SUBTLV_TYPE(mtc->ras) != 0)
print_subtlv_delay_var(&buf, 4, &mtc->delay_var); print_subtlv_ras(&buf, 4, &mtc->ras);
print_subtlv_pkt_loss(&buf, 4, &mtc->pkt_loss); if (SUBTLV_TYPE(mtc->rip) != 0)
print_subtlv_res_bw(&buf, 4, &mtc->res_bw); print_subtlv_rip(&buf, 4, &mtc->rip);
print_subtlv_ava_bw(&buf, 4, &mtc->ava_bw);
print_subtlv_use_bw(&buf, 4, &mtc->use_bw);
vty_multiline(vty, "", "%s", sbuf_buf(&buf));
vty_out(vty, "---------------\n\n");
} else {
vty_out(vty, " %s: MPLS-TE is disabled on this interface\n",
ifp->name);
} }
print_subtlv_av_delay(&buf, 4, &mtc->av_delay);
print_subtlv_mm_delay(&buf, 4, &mtc->mm_delay);
print_subtlv_delay_var(&buf, 4, &mtc->delay_var);
print_subtlv_pkt_loss(&buf, 4, &mtc->pkt_loss);
print_subtlv_res_bw(&buf, 4, &mtc->res_bw);
print_subtlv_ava_bw(&buf, 4, &mtc->ava_bw);
print_subtlv_use_bw(&buf, 4, &mtc->use_bw);
vty_multiline(vty, "", "%s", sbuf_buf(&buf));
vty_out(vty, "---------------\n\n");
sbuf_free(&buf); sbuf_free(&buf);
return; return;
} }
@ -1187,23 +1149,45 @@ DEFUN (show_isis_mpls_te_interface,
"Interface information\n" "Interface information\n"
"Interface name\n") "Interface name\n")
{ {
struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); struct listnode *anode, *cnode;
int idx_interface = 4; struct isis_area *area;
struct isis_circuit *circuit;
struct interface *ifp; struct interface *ifp;
int idx_interface = 4;
/* Show All Interfaces. */ if (!isis) {
if (argc == 4) { vty_out(vty, "IS-IS Routing Process not enabled\n");
FOR_ALL_INTERFACES (vrf, ifp) return CMD_SUCCESS;
show_mpls_te_sub(vty, ifp);
} }
/* Interface name is specified. */
else { if (argc == idx_interface) {
if ((ifp = if_lookup_by_name(argv[idx_interface]->arg, /* Show All Interfaces. */
VRF_DEFAULT)) for (ALL_LIST_ELEMENTS_RO(isis->area_list, anode, area)) {
== NULL)
if (!IS_MPLS_TE(area->mta))
continue;
vty_out(vty, "Area %s:\n", area->area_tag);
for (ALL_LIST_ELEMENTS_RO(area->circuit_list, cnode,
circuit))
show_mpls_te_sub(vty, circuit->interface->name,
circuit->mtc);
}
} else {
/* Interface name is specified. */
ifp = if_lookup_by_name(argv[idx_interface]->arg, VRF_DEFAULT);
if (ifp == NULL)
vty_out(vty, "No such interface name\n"); vty_out(vty, "No such interface name\n");
else else {
show_mpls_te_sub(vty, ifp); circuit = circuit_scan_by_ifp(ifp);
if (!circuit)
vty_out(vty,
"ISIS is not enabled on circuit %s\n",
ifp->name);
else
show_mpls_te_sub(vty, ifp->name, circuit->mtc);
}
} }
return CMD_SUCCESS; return CMD_SUCCESS;
@ -1214,16 +1198,6 @@ DEFUN (show_isis_mpls_te_interface,
void isis_mpls_te_init(void) void isis_mpls_te_init(void)
{ {
zlog_debug("ISIS MPLS-TE: Initialize");
/* Initialize MPLS_TE structure */
isisMplsTE.status = disable;
isisMplsTE.level = 0;
isisMplsTE.inter_as = off;
isisMplsTE.interas_areaid.s_addr = 0;
isisMplsTE.cir_list = list_new();
isisMplsTE.router_id.s_addr = 0;
#ifndef FABRICD #ifndef FABRICD
/* Register new VTY commands */ /* Register new VTY commands */
install_element(VIEW_NODE, &show_isis_mpls_te_router_cmd); install_element(VIEW_NODE, &show_isis_mpls_te_router_cmd);

14
isisd/isis_te.h
View File

@ -244,11 +244,10 @@ typedef enum _status_t { disable, enable, learn } status_t;
/* Mode for Inter-AS LSP */ /* TODO: Check how if LSP is flooded in RFC5316 */ /* Mode for Inter-AS LSP */ /* TODO: Check how if LSP is flooded in RFC5316 */
typedef enum _interas_mode_t { off, region, as, emulate } interas_mode_t; typedef enum _interas_mode_t { off, region, as, emulate } interas_mode_t;
#define IS_MPLS_TE(m) (m.status == enable) #define IS_MPLS_TE(m) (m && m->status == enable)
#define IS_CIRCUIT_TE(c) (c->status == enable)
/* Following structure are internal use only. */ /* Per area MPLS-TE parameters */
struct isis_mpls_te { struct mpls_te_area {
/* Status of MPLS-TE: enable or disable */ /* Status of MPLS-TE: enable or disable */
status_t status; status_t status;
@ -259,15 +258,11 @@ struct isis_mpls_te {
interas_mode_t inter_as; interas_mode_t inter_as;
struct in_addr interas_areaid; struct in_addr interas_areaid;
/* Circuit list on which TE are enable */
struct list *cir_list;
/* MPLS_TE router ID */ /* MPLS_TE router ID */
struct in_addr router_id; struct in_addr router_id;
}; };
extern struct isis_mpls_te isisMplsTE; /* Per Circuit MPLS-TE parameters */
struct mpls_te_circuit { struct mpls_te_circuit {
/* Status of MPLS-TE on this interface */ /* Status of MPLS-TE on this interface */
@ -318,6 +313,5 @@ uint8_t add_te_subtlvs(uint8_t *, struct mpls_te_circuit *);
uint8_t build_te_subtlvs(uint8_t *, struct isis_circuit *); uint8_t build_te_subtlvs(uint8_t *, struct isis_circuit *);
void isis_link_params_update(struct isis_circuit *, struct interface *); void isis_link_params_update(struct isis_circuit *, struct interface *);
void isis_mpls_te_update(struct interface *); void isis_mpls_te_update(struct interface *);
void isis_mpls_te_config_write_router(struct vty *);
#endif /* _ZEBRA_ISIS_MPLS_TE_H */ #endif /* _ZEBRA_ISIS_MPLS_TE_H */

7
isisd/isis_zebra.c
View File

@ -61,13 +61,6 @@ static int isis_router_id_update_zebra(int command, struct zclient *zclient,
struct listnode *node; struct listnode *node;
struct prefix router_id; struct prefix router_id;
/*
* If ISIS TE is enable, TE Router ID is set through specific command.
* See mpls_te_router_addr() command in isis_te.c
*/
if (IS_MPLS_TE(isisMplsTE))
return 0;
zebra_router_id_update_read(zclient->ibuf, &router_id); zebra_router_id_update_read(zclient->ibuf, &router_id);
if (isis->router_id == router_id.u.prefix4.s_addr) if (isis->router_id == router_id.u.prefix4.s_addr)
return 0; return 0;

6
isisd/isisd.c
View File

@ -95,7 +95,6 @@ void isis_new(unsigned long process_id)
* uncomment the next line for full debugs * uncomment the next line for full debugs
*/ */
/* isis->debugs = 0xFFFF; */ /* isis->debugs = 0xFFFF; */
isisMplsTE.status = disable; /* Only support TE metric */
QOBJ_REG(isis, isis); QOBJ_REG(isis, isis);
} }
@ -258,6 +257,10 @@ int isis_area_destroy(const char *area_tag)
if (fabricd) if (fabricd)
fabricd_finish(area->fabricd); fabricd_finish(area->fabricd);
/* Disable MPLS if necessary before flooding LSP */
if (IS_MPLS_TE(area->mta))
area->mta->status = disable;
if (area->circuit_list) { if (area->circuit_list) {
for (ALL_LIST_ELEMENTS(area->circuit_list, node, nnode, for (ALL_LIST_ELEMENTS(area->circuit_list, node, nnode,
circuit)) { circuit)) {
@ -2137,7 +2140,6 @@ int isis_config_write(struct vty *vty)
write += area_write_mt_settings(area, vty); write += area_write_mt_settings(area, vty);
write += fabricd_write_settings(area, vty); write += fabricd_write_settings(area, vty);
} }
isis_mpls_te_config_write_router(vty);
} }
return write; return write;

2
isisd/isisd.h
View File

@ -165,6 +165,8 @@ struct isis_area {
uint8_t log_adj_changes; uint8_t log_adj_changes;
/* multi topology settings */ /* multi topology settings */
struct list *mt_settings; struct list *mt_settings;
/* MPLS-TE settings */
struct mpls_te_area *mta;
int ipv6_circuits; int ipv6_circuits;
bool purge_originator; bool purge_originator;
/* Counters */ /* Counters */

16
yang/frr-isisd.yang
View File

@ -709,16 +709,16 @@ module frr-isisd {
description description
"Log changes to the IS-IS adjacencies in this area."; "Log changes to the IS-IS adjacencies in this area.";
} }
}
container mpls-te { container mpls-te {
presence "Present if MPLS-TE is enabled."; presence "Present if MPLS-TE is enabled.";
description
"Enable MPLS-TE functionality.";
leaf router-address {
type inet:ipv4-address;
description description
"Stable IP address of the advertising router."; "Enable MPLS-TE functionality.";
leaf router-address {
type inet:ipv4-address;
description
"Stable IP address of the advertising router.";
}
} }
} }
} }