proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 11:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6182 from Orange-OpenSource/dev_ospf_sr

Browse Source 
OSPF: Add ECMP support to Segment Routing
This commit is contained in:
Renato Westphal 2020-06-06 21:29:43 -03:00 committed by GitHub
commit 993db04388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 1259 additions and 803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

251
ospfd/ospf_ext.c
View File

@ -443,6 +443,32 @@ static void set_rmt_itf_addr(struct ext_itf *exti, struct in_addr rmtif)
exti->rmt_itf_addr.value = rmtif; exti->rmt_itf_addr.value = rmtif;
} }
/* Delete Extended LSA */
static void ospf_extended_lsa_delete(struct ext_itf *exti)
{
/* Process only Active Extended Prefix/Link LSA */
if (!CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE))
return;
osr_debug("EXT (%s): Disable %s%s%s-SID on interface %s", __func__,
exti->stype == PREF_SID ? "Prefix" : "",
exti->stype == ADJ_SID ? "Adjacency" : "",
exti->stype == LAN_ADJ_SID ? "LAN-Adjacency" : "",
exti->ifp->name);
/* Flush LSA if already engaged */
if (CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ENGAGED)) {
ospf_ext_lsa_schedule(exti, FLUSH_THIS_LSA);
UNSET_FLAG(exti->flags, EXT_LPFLG_LSA_ENGAGED);
}
/* De-activate this Extended Prefix/Link and remove corresponding
* Segment-Routing Prefix-SID or (LAN)-ADJ-SID */
exti->flags = EXT_LPFLG_LSA_INACTIVE;
ospf_sr_ext_itf_delete(exti);
}
/* /*
* Update Extended prefix SID index for Loopback interface type * Update Extended prefix SID index for Loopback interface type
* *
@ -465,12 +491,8 @@ uint32_t ospf_ext_schedule_prefix_index(struct interface *ifp, uint32_t index,
return rc; return rc;
if (p != NULL) { if (p != NULL) {
if (IS_DEBUG_OSPF_SR) osr_debug("EXT (%s): Schedule new prefix %pFX with index %u "
zlog_debug( "on interface %s", __func__, p, index, ifp->name);
"EXT (%s): Schedule new prefix %s/%u with "
"index %u on interface %s",
__func__, inet_ntoa(p->prefix), p->prefixlen,
index, ifp->name);
/* Set first Extended Prefix then the Prefix SID information */ /* Set first Extended Prefix then the Prefix SID information */
set_ext_prefix(exti, OSPF_PATH_INTRA_AREA, EXT_TLV_PREF_NFLG, set_ext_prefix(exti, OSPF_PATH_INTRA_AREA, EXT_TLV_PREF_NFLG,
@ -488,9 +510,8 @@ uint32_t ospf_ext_schedule_prefix_index(struct interface *ifp, uint32_t index,
exti, REORIGINATE_THIS_LSA); exti, REORIGINATE_THIS_LSA);
} }
} else { } else {
if (IS_DEBUG_OSPF_SR) osr_debug("EXT (%s): Remove prefix for interface %s", __func__,
zlog_debug("EXT (%s): Remove prefix for interface %s", ifp->name);
__func__, ifp->name);
if (CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ENGAGED)) { if (CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ENGAGED)) {
ospf_ext_pref_lsa_schedule(exti, FLUSH_THIS_LSA); ospf_ext_pref_lsa_schedule(exti, FLUSH_THIS_LSA);
@ -513,15 +534,15 @@ void ospf_ext_update_sr(bool enable)
struct listnode *node; struct listnode *node;
struct ext_itf *exti; struct ext_itf *exti;
if (IS_DEBUG_OSPF_SR) osr_debug("EXT (%s): %s Extended LSAs for Segment Routing ", __func__,
zlog_debug("EXT (%s): %s Extended LSAs for Segment Routing ", enable ? "Enable" : "Disable");
__func__, enable ? "Enable" : "Disable");
if (enable) { if (enable) {
OspfEXT.enabled = true; OspfEXT.enabled = true;
/* Refresh LSAs if already engaged or originate */ /* Refresh LSAs if already engaged or originate */
for (ALL_LIST_ELEMENTS_RO(OspfEXT.iflist, node, exti)) { for (ALL_LIST_ELEMENTS_RO(OspfEXT.iflist, node, exti)) {
/* Skip inactive Extended Link */
if (!CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE)) if (!CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE))
continue; continue;
@ -532,17 +553,15 @@ void ospf_ext_update_sr(bool enable)
REORIGINATE_THIS_LSA); REORIGINATE_THIS_LSA);
} }
} else { } else {
/* Start by Flushing engaged LSAs */ /* Start by Removing Extended LSA */
for (ALL_LIST_ELEMENTS_RO(OspfEXT.iflist, node, exti)) { for (ALL_LIST_ELEMENTS_RO(OspfEXT.iflist, node, exti))
if (CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ENGAGED)) ospf_extended_lsa_delete(exti);
ospf_ext_lsa_schedule(exti, FLUSH_THIS_LSA);
exti->flags = EXT_LPFLG_LSA_INACTIVE;
}
/* And then disable Extended Link/Prefix */ /* And then disable Extended Link/Prefix */
OspfEXT.enabled = false; OspfEXT.enabled = false;
} }
} }
/* /*
* ----------------------------------------------------------------------- * -----------------------------------------------------------------------
* Followings are callback functions against generic Opaque-LSAs handling * Followings are callback functions against generic Opaque-LSAs handling
@ -580,10 +599,11 @@ static int ospf_ext_link_del_if(struct interface *ifp)
exti = lookup_ext_by_ifp(ifp); exti = lookup_ext_by_ifp(ifp);
if (exti != NULL) { if (exti != NULL) {
struct list *iflist = OspfEXT.iflist; /* Flush LSA and remove Adjacency SID */
ospf_extended_lsa_delete(exti);
/* Dequeue listnode entry from the list. */ /* Dequeue listnode entry from the list. */
listnode_delete(iflist, exti); listnode_delete(OspfEXT.iflist, exti);
XFREE(MTYPE_OSPF_EXT_PARAMS, exti); XFREE(MTYPE_OSPF_EXT_PARAMS, exti);
@ -616,6 +636,7 @@ static void ospf_ext_ism_change(struct ospf_interface *oi, int old_status)
/* Reset Extended information if ospf interface goes Down */ /* Reset Extended information if ospf interface goes Down */
if (oi->state == ISM_Down) { if (oi->state == ISM_Down) {
ospf_extended_lsa_delete(exti);
exti->area = NULL; exti->area = NULL;
exti->flags = EXT_LPFLG_LSA_INACTIVE; exti->flags = EXT_LPFLG_LSA_INACTIVE;
return; return;
@ -629,12 +650,12 @@ static void ospf_ext_ism_change(struct ospf_interface *oi, int old_status)
exti->instance = get_ext_pref_instance_value(); exti->instance = get_ext_pref_instance_value();
exti->area = oi->area; exti->area = oi->area;
zlog_debug("EXT (%s): Set Prefix SID to interface %s ", osr_debug("EXT (%s): Set Prefix SID to interface %s ",
__func__, oi->ifp->name); __func__, oi->ifp->name);
/* Complete SRDB if the interface belongs to a Prefix */ /* Complete SRDB if the interface belongs to a Prefix */
if (OspfEXT.enabled) if (OspfEXT.enabled)
ospf_sr_update_prefix(oi->ifp, oi->address); ospf_sr_update_local_prefix(oi->ifp, oi->address);
} else { } else {
/* Determine if interface is related to Adj. or LAN Adj. SID */ /* Determine if interface is related to Adj. or LAN Adj. SID */
if (oi->state == ISM_DR) if (oi->state == ISM_DR)
@ -650,9 +671,9 @@ static void ospf_ext_ism_change(struct ospf_interface *oi, int old_status)
* Note: Adjacency SID information are completed when ospf * Note: Adjacency SID information are completed when ospf
* adjacency become up see ospf_ext_link_nsm_change() * adjacency become up see ospf_ext_link_nsm_change()
*/ */
zlog_debug("EXT (%s): Set %sAdjacency SID for interface %s ", osr_debug("EXT (%s): Set %sAdjacency SID for interface %s ",
__func__, exti->stype == ADJ_SID ? "" : "LAN-", __func__, exti->stype == ADJ_SID ? "" : "LAN-",
oi->ifp->name); oi->ifp->name);
} }
} }
@ -666,8 +687,8 @@ static void ospf_ext_link_nsm_change(struct ospf_neighbor *nbr, int old_status)
struct ext_itf *exti; struct ext_itf *exti;
uint32_t label; uint32_t label;
/* Process Neighbor only when its state is NSM Full */ /* Process Link only when neighbor old or new state is NSM Full */
if (nbr->state != NSM_Full) if (nbr->state != NSM_Full && old_status != NSM_Full)
return; return;
/* Get interface information for Segment Routing */ /* Get interface information for Segment Routing */
@ -679,6 +700,23 @@ static void ospf_ext_link_nsm_change(struct ospf_neighbor *nbr, int old_status)
return; return;
} }
/* Check that we have a valid area and ospf context */
if (oi->area == NULL || oi->area->ospf == NULL) {
flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
"EXT (%s): Cannot refer to OSPF from OI(%s)",
__func__, IF_NAME(oi));
return;
}
/* Remove Extended Link if Neighbor State goes Down or Deleted */
if (nbr->state == NSM_Down || nbr->state == NSM_Deleted) {
ospf_extended_lsa_delete(exti);
return;
}
/* Keep Area information in combination with SR info. */
exti->area = oi->area;
/* Process only Adjacency/LAN SID */ /* Process only Adjacency/LAN SID */
if (exti->stype == PREF_SID) if (exti->stype == PREF_SID)
return; return;
@ -742,11 +780,9 @@ static void ospf_ext_link_nsm_change(struct ospf_neighbor *nbr, int old_status)
return; return;
} }
if (IS_DEBUG_OSPF_SR) osr_debug("EXT (%s): Complete %sAdjacency SID for interface %s ",
zlog_debug( __func__, exti->stype == ADJ_SID ? "" : "LAN-",
"EXT (%s): Complete %sAdjacency SID for interface %s ", oi->ifp->name);
__func__, exti->stype == ADJ_SID ? "" : "LAN-",
oi->ifp->name);
/* flood this links params if everything is ok */ /* flood this links params if everything is ok */
SET_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE); SET_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE);
@ -756,6 +792,9 @@ static void ospf_ext_link_nsm_change(struct ospf_neighbor *nbr, int old_status)
else else
ospf_ext_link_lsa_schedule(exti, REORIGINATE_THIS_LSA); ospf_ext_link_lsa_schedule(exti, REORIGINATE_THIS_LSA);
} }
/* Finally install (LAN)Adjacency-SID in the SRDB */
ospf_sr_ext_itf_add(exti);
} }
/* Callbacks to handle Extended Link Segment Routing LSA information */ /* Callbacks to handle Extended Link Segment Routing LSA information */
@ -778,6 +817,10 @@ static int ospf_ext_link_lsa_update(struct ospf_lsa *lsa)
!= OPAQUE_TYPE_EXTENDED_LINK_LSA) != OPAQUE_TYPE_EXTENDED_LINK_LSA)
return 0; return 0;
/* Check if it is not my LSA */
if (IS_LSA_SELF(lsa))
return 0;
/* Check if Extended is enable */ /* Check if Extended is enable */
if (!OspfEXT.enabled) if (!OspfEXT.enabled)
return 0; return 0;
@ -962,12 +1005,10 @@ static struct ospf_lsa *ospf_ext_pref_lsa_new(struct ospf_area *area,
/* Set opaque-LSA header fields. */ /* Set opaque-LSA header fields. */
lsa_header_set(s, options, lsa_type, lsa_id, router_id); lsa_header_set(s, options, lsa_type, lsa_id, router_id);
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) osr_debug(
zlog_debug( "EXT (%s): LSA[Type%u:%pI4]: Create an Opaque-LSA Extended "
"EXT (%s): LSA[Type%u:%s]: Create an Opaque-LSA " "Prefix Opaque LSA instance",
"Extended Prefix Opaque LSA instance", __func__, lsa_type, &lsa_id);
__func__, lsa_type, inet_ntoa(lsa_id));
/* Set opaque-LSA body fields. */ /* Set opaque-LSA body fields. */
ospf_ext_pref_lsa_body_set(s, exti); ospf_ext_pref_lsa_body_set(s, exti);
@ -1022,11 +1063,10 @@ static struct ospf_lsa *ospf_ext_link_lsa_new(struct ospf_area *area,
tmp = SET_OPAQUE_LSID(OPAQUE_TYPE_EXTENDED_LINK_LSA, exti->instance); tmp = SET_OPAQUE_LSID(OPAQUE_TYPE_EXTENDED_LINK_LSA, exti->instance);
lsa_id.s_addr = htonl(tmp); lsa_id.s_addr = htonl(tmp);
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) osr_debug(
zlog_debug( "EXT (%s) LSA[Type%u:%pI4]: Create an Opaque-LSA Extended "
"EXT (%s) LSA[Type%u:%s]: Create an Opaque-LSA " "Link Opaque LSA instance",
"Extended Link Opaque LSA instance", __func__, lsa_type, &lsa_id);
__func__, lsa_type, inet_ntoa(lsa_id));
/* Set opaque-LSA header fields. */ /* Set opaque-LSA header fields. */
lsa_header_set(s, options, lsa_type, lsa_id, area->ospf->router_id); lsa_header_set(s, options, lsa_type, lsa_id, area->ospf->router_id);
@ -1089,17 +1129,13 @@ static int ospf_ext_pref_lsa_originate1(struct ospf_area *area,
/* Flood new LSA through area. */ /* Flood new LSA through area. */
ospf_flood_through_area(area, NULL /*nbr */, new); ospf_flood_through_area(area, NULL /*nbr */, new);
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) { osr_debug(
char area_id[INET_ADDRSTRLEN]; "EXT (%s): LSA[Type%u:%pI4]: Originate Opaque-LSA"
"Extended Prefix Opaque LSA: Area(%pI4), Link(%s)",
inet_ntop(AF_INET, &area->area_id, area_id, sizeof(area_id)); __func__, new->data->type, &new->data->id,
zlog_debug( &area->area_id, exti->ifp->name);
"EXT (%s): LSA[Type%u:%s]: Originate Opaque-LSA " if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
"Extended Prefix Opaque LSA: Area(%s), Link(%s)",
__func__, new->data->type, inet_ntoa(new->data->id),
area_id, exti->ifp->name);
ospf_lsa_header_dump(new->data); ospf_lsa_header_dump(new->data);
}
rc = 0; rc = 0;
@ -1141,17 +1177,13 @@ static int ospf_ext_link_lsa_originate1(struct ospf_area *area,
/* Flood new LSA through area. */ /* Flood new LSA through area. */
ospf_flood_through_area(area, NULL /*nbr */, new); ospf_flood_through_area(area, NULL /*nbr */, new);
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) { osr_debug(
char area_id[INET_ADDRSTRLEN]; "EXT (%s): LSA[Type%u:%pI4]: Originate Opaque-LSA "
"Extended Link Opaque LSA: Area(%pI4), Link(%s)",
inet_ntop(AF_INET, &area->area_id, area_id, sizeof(area_id)); __func__, new->data->type, &new->data->id,
zlog_debug( &area->area_id, exti->ifp->name);
"EXT (%s): LSA[Type%u:%s]: Originate Opaque-LSA " if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
"Extended Link Opaque LSA: Area(%s), Link(%s)",
__func__, new->data->type, inet_ntoa(new->data->id),
area_id, exti->ifp->name);
ospf_lsa_header_dump(new->data); ospf_lsa_header_dump(new->data);
}
rc = 0; rc = 0;
@ -1168,15 +1200,13 @@ static int ospf_ext_pref_lsa_originate(void *arg)
if (!OspfEXT.enabled) { if (!OspfEXT.enabled) {
zlog_info( zlog_info(
"EXT (%s): Segment Routing " "EXT (%s): Segment Routing functionality is Disabled now",
"functionality is Disabled now",
__func__); __func__);
rc = 0; /* This is not an error case. */ rc = 0; /* This is not an error case. */
return rc; return rc;
} }
if (IS_DEBUG_OSPF_SR) osr_debug("EXT (%s): Start Originate Prefix LSA for area %pI4",
zlog_debug("EXT (%s): Start Originate Prefix LSA for area %s", __func__, &area->area_id);
__func__, inet_ntoa(area->area_id));
/* Check if Extended Prefix Opaque LSA is already engaged */ /* Check if Extended Prefix Opaque LSA is already engaged */
for (ALL_LIST_ELEMENTS_RO(OspfEXT.iflist, node, exti)) { for (ALL_LIST_ELEMENTS_RO(OspfEXT.iflist, node, exti)) {
@ -1206,12 +1236,10 @@ static int ospf_ext_pref_lsa_originate(void *arg)
} }
/* Ok, let's try to originate an LSA */ /* Ok, let's try to originate an LSA */
if (IS_DEBUG_OSPF_SR) osr_debug(
zlog_debug( "EXT (%s): Let's finally re-originate the LSA 7.0.0.%u "
"EXT (%s): Let's finally reoriginate the " "for Itf %s", __func__, exti->instance,
"LSA 7.0.0.%u for Itf %s", exti->ifp ? exti->ifp->name : "");
__func__, exti->instance,
exti->ifp ? exti->ifp->name : "");
ospf_ext_pref_lsa_originate1(area, exti); ospf_ext_pref_lsa_originate1(area, exti);
} }
@ -1229,8 +1257,7 @@ static int ospf_ext_link_lsa_originate(void *arg)
if (!OspfEXT.enabled) { if (!OspfEXT.enabled) {
zlog_info( zlog_info(
"EXT (%s): Segment Routing " "EXT (%s): Segment Routing functionality is Disabled now",
"functionality is Disabled now",
__func__); __func__);
rc = 0; /* This is not an error case. */ rc = 0; /* This is not an error case. */
return rc; return rc;
@ -1242,6 +1269,10 @@ static int ospf_ext_link_lsa_originate(void *arg)
if (exti->stype == PREF_SID) if (exti->stype == PREF_SID)
continue; continue;
/* Skip Inactive Extended Link */
if (!CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE))
continue;
/* Process only Extended Link with valid Area ID */ /* Process only Extended Link with valid Area ID */
if ((exti->area == NULL) if ((exti->area == NULL)
|| (!IPV4_ADDR_SAME(&exti->area->area_id, &area->area_id))) || (!IPV4_ADDR_SAME(&exti->area->area_id, &area->area_id)))
@ -1268,13 +1299,11 @@ static int ospf_ext_link_lsa_originate(void *arg)
} }
/* Ok, let's try to originate an LSA */ /* Ok, let's try to originate an LSA */
if (IS_DEBUG_OSPF_SR) osr_debug(
zlog_debug( "EXT (%s): Let's finally reoriginate the LSA 8.0.0.%u "
"EXT (%s): Let's finally reoriginate the " "for Itf %s through the Area %pI4", __func__,
"LSA 8.0.0.%u for Itf %s through the Area %s", exti->instance, exti->ifp ? exti->ifp->name : "-",
__func__, exti->instance, &area->area_id);
exti->ifp ? exti->ifp->name : "-",
inet_ntoa(area->area_id));
ospf_ext_link_lsa_originate1(area, exti); ospf_ext_link_lsa_originate1(area, exti);
} }
@ -1297,8 +1326,7 @@ static struct ospf_lsa *ospf_ext_pref_lsa_refresh(struct ospf_lsa *lsa)
* It seems a slip among routers in the routing domain. * It seems a slip among routers in the routing domain.
*/ */
zlog_info( zlog_info(
"EXT (%s): Segment Routing functionality is " "EXT (%s): Segment Routing functionality is Disabled",
"Disabled",
__func__); __func__);
/* Flush it anyway. */ /* Flush it anyway. */
lsa->data->ls_age = htons(OSPF_LSA_MAXAGE); lsa->data->ls_age = htons(OSPF_LSA_MAXAGE);
@ -1362,12 +1390,11 @@ static struct ospf_lsa *ospf_ext_pref_lsa_refresh(struct ospf_lsa *lsa)
ospf_flood_through_area(area, NULL /*nbr */, new); ospf_flood_through_area(area, NULL /*nbr */, new);
/* Debug logging. */ /* Debug logging. */
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) { osr_debug("EXT (%s): LSA[Type%u:%pI4] Refresh Extended Prefix LSA",
zlog_debug( __func__, new->data->type, &new->data->id);
"EXT (%s): LSA[Type%u:%s] Refresh Extended Prefix LSA", if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
__func__, new->data->type, inet_ntoa(new->data->id));
ospf_lsa_header_dump(new->data); ospf_lsa_header_dump(new->data);
}
return new; return new;
} }
@ -1438,12 +1465,10 @@ static struct ospf_lsa *ospf_ext_link_lsa_refresh(struct ospf_lsa *lsa)
ospf_flood_through_area(area, NULL /*nbr */, new); ospf_flood_through_area(area, NULL /*nbr */, new);
/* Debug logging. */ /* Debug logging. */
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) { osr_debug("EXT (%s): LSA[Type%u:%pI4]: Refresh Extended Link LSA",
zlog_debug( __func__, new->data->type, &new->data->id);
"EXT (%s): LSA[Type%u:%s]: Refresh Extended Link LSA", if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
__func__, new->data->type, inet_ntoa(new->data->id));
ospf_lsa_header_dump(new->data); ospf_lsa_header_dump(new->data);
}
return new; return new;
} }
@ -1468,18 +1493,17 @@ static void ospf_ext_pref_lsa_schedule(struct ext_itf *exti,
if (!(CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE))) if (!(CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE)))
return; return;
zlog_debug("EXT (%s): Schedule %s%s%s LSA for interface %s", __func__, osr_debug("EXT (%s): Schedule %s%s%s LSA for interface %s", __func__,
opcode == REORIGINATE_THIS_LSA ? "Re-Originate" : "", opcode == REORIGINATE_THIS_LSA ? "Re-Originate" : "",
opcode == REFRESH_THIS_LSA ? "Refresh" : "", opcode == REFRESH_THIS_LSA ? "Refresh" : "",
opcode == FLUSH_THIS_LSA ? "Flush" : "", opcode == FLUSH_THIS_LSA ? "Flush" : "",
exti->ifp ? exti->ifp->name : "-"); exti->ifp ? exti->ifp->name : "-");
/* Verify Area */ /* Verify Area */
if (exti->area == NULL) { if (exti->area == NULL) {
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) osr_debug(
zlog_debug( "EXT (%s): Area is not yet set. Try to use Backbone Area",
"EXT (%s): Area is not yet set. Try to use Backbone Area", __func__);
__func__);
top = ospf_lookup_by_vrf_id(VRF_DEFAULT); top = ospf_lookup_by_vrf_id(VRF_DEFAULT);
struct in_addr backbone = {.s_addr = INADDR_ANY}; struct in_addr backbone = {.s_addr = INADDR_ANY};
@ -1533,18 +1557,17 @@ static void ospf_ext_link_lsa_schedule(struct ext_itf *exti,
if (!(CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE))) if (!(CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE)))
return; return;
zlog_debug("EXT (%s): Schedule %s%s%s LSA for interface %s", __func__, osr_debug("EXT (%s): Schedule %s%s%s LSA for interface %s", __func__,
opcode == REORIGINATE_THIS_LSA ? "Re-Originate" : "", opcode == REORIGINATE_THIS_LSA ? "Re-Originate" : "",
opcode == REFRESH_THIS_LSA ? "Refresh" : "", opcode == REFRESH_THIS_LSA ? "Refresh" : "",
opcode == FLUSH_THIS_LSA ? "Flush" : "", opcode == FLUSH_THIS_LSA ? "Flush" : "",
exti->ifp ? exti->ifp->name : "-"); exti->ifp ? exti->ifp->name : "-");
/* Verify Area */ /* Verify Area */
if (exti->area == NULL) { if (exti->area == NULL) {
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) osr_debug(
zlog_debug( "EXT (%s): Area is not yet set. Try to use Backbone Area",
"EXT (%s): Area is not yet set. Try to use Backbone Area", __func__);
__func__);
top = ospf_lookup_by_vrf_id(VRF_DEFAULT); top = ospf_lookup_by_vrf_id(VRF_DEFAULT);
struct in_addr backbone = {.s_addr = INADDR_ANY}; struct in_addr backbone = {.s_addr = INADDR_ANY};

12
ospfd/ospf_route.h
View File

@ -33,12 +33,24 @@
#define OSPF_PATH_TYPE2_EXTERNAL 4 #define OSPF_PATH_TYPE2_EXTERNAL 4
#define OSPF_PATH_MAX 5 #define OSPF_PATH_MAX 5
/* Segment Routing information to complement ospf_path structure */
struct sr_nexthop_info {
/* Output label associated to this route */
mpls_label_t label_out;
/*
* Pointer to SR Node which is the next hop for this route
* or NULL if next hop is the destination of the prefix
*/
struct sr_node *nexthop;
};
/* OSPF Path. */ /* OSPF Path. */
struct ospf_path { struct ospf_path {
struct in_addr nexthop; struct in_addr nexthop;
struct in_addr adv_router; struct in_addr adv_router;
ifindex_t ifindex; ifindex_t ifindex;
unsigned char unnumbered; unsigned char unnumbered;
struct sr_nexthop_info srni;
}; };
/* Below is the structure linked to every /* Below is the structure linked to every

2
ospfd/ospf_spf.c
View File

@ -1369,7 +1369,7 @@ static int ospf_spf_calculate_timer(struct thread *thread)
abr_time = monotime_since(&start_time, NULL); abr_time = monotime_since(&start_time, NULL);
/* Schedule Segment Routing update */ /* Schedule Segment Routing update */
ospf_sr_update_timer_add(ospf); ospf_sr_update_task(ospf);
total_spf_time = total_spf_time =
monotime_since(&spf_start_time, &ospf->ts_spf_duration); monotime_since(&spf_start_time, &ospf->ts_spf_duration);

1103
ospfd/ospf_sr.c
View File

File diff suppressed because it is too large Load Diff

48
ospfd/ospf_sr.h
View File

@ -51,6 +51,17 @@
#define SID_INDEX 4 #define SID_INDEX 4
#define SID_INDEX_SIZE(U) (U) #define SID_INDEX_SIZE(U) (U)
/* Macro to log debug message */
#define osr_debug(...) \
do { \
if (IS_DEBUG_OSPF_SR) \
zlog_debug(__VA_ARGS__); \
} while (0)
/* Macro to check if SR Prefix has no valid route */
#define IS_NO_ROUTE(srp) ((srp->route == NULL) || (srp->route->paths == NULL) \
|| list_isempty(srp->route->paths))
/* SID/Label Sub TLV - section 2.1 */ /* SID/Label Sub TLV - section 2.1 */
#define SUBTLV_SID_LABEL 1 #define SUBTLV_SID_LABEL 1
#define SUBTLV_SID_LABEL_SIZE 8 #define SUBTLV_SID_LABEL_SIZE 8
@ -180,16 +191,13 @@ struct sr_srgb {
}; };
/* SID type to make difference between loopback interfaces and others */ /* SID type to make difference between loopback interfaces and others */
enum sid_type { PREF_SID, ADJ_SID, LAN_ADJ_SID }; enum sid_type { PREF_SID, LOCAL_SID, ADJ_SID, LAN_ADJ_SID };
/* Structure aggregating all OSPF Segment Routing information for the node */ /* Structure aggregating all OSPF Segment Routing information for the node */
struct ospf_sr_db { struct ospf_sr_db {
/* Status of Segment Routing: enable or disable */ /* Status of Segment Routing: enable or disable */
bool enabled; bool enabled;
/* Ongoing Update following an OSPF SPF */
bool update;
/* Flooding Scope: Area = 10 or AS = 11 */ /* Flooding Scope: Area = 10 or AS = 11 */
uint8_t scope; uint8_t scope;
@ -237,7 +245,6 @@ struct sr_node {
/* Segment Routing - NHLFE info: support IPv4 Only */ /* Segment Routing - NHLFE info: support IPv4 Only */
struct sr_nhlfe { struct sr_nhlfe {
struct prefix_ipv4 prefv4;
struct in_addr nexthop; struct in_addr nexthop;
ifindex_t ifindex; ifindex_t ifindex;
mpls_label_t label_in; mpls_label_t label_in;
@ -251,6 +258,9 @@ struct sr_link {
/* 24-bit Opaque-ID field value according to RFC 7684 specification */ /* 24-bit Opaque-ID field value according to RFC 7684 specification */
uint32_t instance; uint32_t instance;
/* Interface address */
struct in_addr itf_addr;
/* Flags to manage this link parameters. */ /* Flags to manage this link parameters. */
uint8_t flags[2]; uint8_t flags[2];
@ -258,7 +268,7 @@ struct sr_link {
uint32_t sid[2]; uint32_t sid[2];
enum sid_type type; enum sid_type type;
/* SR NHLFE for this link */ /* SR NHLFE (Primary + Backup) for this link */
struct sr_nhlfe nhlfe[2]; struct sr_nhlfe nhlfe[2];
/* Back pointer to SR Node which advertise this Link */ /* Back pointer to SR Node which advertise this Link */
@ -271,6 +281,9 @@ struct sr_prefix {
/* 24-bit Opaque-ID field value according to RFC 7684 specification */ /* 24-bit Opaque-ID field value according to RFC 7684 specification */
uint32_t instance; uint32_t instance;
/* Prefix itself */
struct prefix_ipv4 prefv4;
/* Flags to manage this prefix parameters. */ /* Flags to manage this prefix parameters. */
uint8_t flags; uint8_t flags;
@ -278,17 +291,17 @@ struct sr_prefix {
uint32_t sid; uint32_t sid;
enum sid_type type; enum sid_type type;
/* SR NHLFE for this prefix */ /* Incoming label for this prefix */
mpls_label_t label_in;
/* Back pointer to OSPF Route for remote prefix */
struct ospf_route *route;
/* NHLFE for local prefix */
struct sr_nhlfe nhlfe; struct sr_nhlfe nhlfe;
/* Back pointer to SR Node which advertise this Prefix */ /* Back pointer to SR Node which advertise this Prefix */
struct sr_node *srn; struct sr_node *srn;
/*
* Pointer to SR Node which is the next hop for this Prefix
* or NULL if next hop is the destination of the prefix
*/
struct sr_node *nexthop;
}; };
/* Prototypes definition */ /* Prototypes definition */
@ -303,10 +316,15 @@ extern void ospf_sr_ext_link_lsa_update(struct ospf_lsa *lsa);
extern void ospf_sr_ext_link_lsa_delete(struct ospf_lsa *lsa); extern void ospf_sr_ext_link_lsa_delete(struct ospf_lsa *lsa);
extern void ospf_sr_ext_prefix_lsa_update(struct ospf_lsa *lsa); extern void ospf_sr_ext_prefix_lsa_update(struct ospf_lsa *lsa);
extern void ospf_sr_ext_prefix_lsa_delete(struct ospf_lsa *lsa); extern void ospf_sr_ext_prefix_lsa_delete(struct ospf_lsa *lsa);
/* Segment Routing Extending Link management */
struct ext_itf;
extern void ospf_sr_ext_itf_add(struct ext_itf *exti);
extern void ospf_sr_ext_itf_delete(struct ext_itf *exti);
/* Segment Routing configuration functions */ /* Segment Routing configuration functions */
extern uint32_t get_ext_link_label_value(void); extern uint32_t get_ext_link_label_value(void);
extern void ospf_sr_config_write_router(struct vty *vty); extern void ospf_sr_config_write_router(struct vty *vty);
extern void ospf_sr_update_prefix(struct interface *ifp, struct prefix *p); extern void ospf_sr_update_local_prefix(struct interface *ifp,
struct prefix *p);
/* Segment Routing re-routing function */ /* Segment Routing re-routing function */
extern void ospf_sr_update_timer_add(struct ospf *ospf); extern void ospf_sr_update_task(struct ospf *ospf);
#endif /* _FRR_OSPF_SR_H */ #endif /* _FRR_OSPF_SR_H */

115
ospfd/ospf_zebra.c
View File

@ -50,6 +50,7 @@
#include "ospfd/ospf_nsm.h" #include "ospfd/ospf_nsm.h"
#include "ospfd/ospf_zebra.h" #include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_te.h" #include "ospfd/ospf_te.h"
#include "ospfd/ospf_sr.h"
DEFINE_MTYPE_STATIC(OSPFD, OSPF_EXTERNAL, "OSPF External route table") DEFINE_MTYPE_STATIC(OSPFD, OSPF_EXTERNAL, "OSPF External route table")
DEFINE_MTYPE_STATIC(OSPFD, OSPF_REDISTRIBUTE, "OSPF Redistriute") DEFINE_MTYPE_STATIC(OSPFD, OSPF_REDISTRIBUTE, "OSPF Redistriute")
@ -415,6 +416,119 @@ void ospf_external_del(struct ospf *ospf, uint8_t type, unsigned short instance)
} }
} }
/* Update NHLFE for Prefix SID */
void ospf_zebra_update_prefix_sid(const struct sr_prefix *srp)
{
struct zapi_labels zl;
struct zapi_nexthop *znh;
struct listnode *node;
struct ospf_path *path;
osr_debug("SR (%s): Update Labels %u for Prefix %pFX", __func__,
srp->label_in, (struct prefix *)&srp->prefv4);
/* Prepare message. */
memset(&zl, 0, sizeof(zl));
zl.type = ZEBRA_LSP_OSPF_SR;
zl.local_label = srp->label_in;
switch (srp->type) {
case LOCAL_SID:
/* Set Label for local Prefix */
znh = &zl.nexthops[zl.nexthop_num++];
znh->type = NEXTHOP_TYPE_IFINDEX;
znh->ifindex = srp->nhlfe.ifindex;
znh->label_num = 1;
znh->labels[0] = srp->nhlfe.label_out;
break;
case PREF_SID:
/* Update route in the RIB too. */
SET_FLAG(zl.message, ZAPI_LABELS_FTN);
zl.route.prefix.u.prefix4 = srp->prefv4.prefix;
zl.route.prefix.prefixlen = srp->prefv4.prefixlen;
zl.route.prefix.family = srp->prefv4.family;
zl.route.type = ZEBRA_ROUTE_OSPF;
zl.route.instance = 0;
/* Check that SRP contains at least one valid path */
if (srp->route == NULL) {
return;
}
for (ALL_LIST_ELEMENTS_RO(srp->route->paths, node, path)) {
if (path->srni.label_out == MPLS_INVALID_LABEL)
continue;
if (zl.nexthop_num >= MULTIPATH_NUM)
break;
znh = &zl.nexthops[zl.nexthop_num++];
znh->type = NEXTHOP_TYPE_IPV4_IFINDEX;
znh->gate.ipv4 = path->nexthop;
znh->ifindex = path->ifindex;
znh->label_num = 1;
znh->labels[0] = path->srni.label_out;
}
break;
default:
return;
}
/* Finally, send message to zebra. */
(void)zebra_send_mpls_labels(zclient, ZEBRA_MPLS_LABELS_REPLACE, &zl);
}
/* Remove NHLFE for Prefix-SID */
void ospf_zebra_delete_prefix_sid(const struct sr_prefix *srp)
{
struct zapi_labels zl;
osr_debug("SR (%s): Delete Labels %u for Prefix %pFX", __func__,
srp->label_in, (struct prefix *)&srp->prefv4);
/* Prepare message. */
memset(&zl, 0, sizeof(zl));
zl.type = ZEBRA_LSP_OSPF_SR;
zl.local_label = srp->label_in;
if (srp->type == PREF_SID) {
/* Update route in the RIB too */
SET_FLAG(zl.message, ZAPI_LABELS_FTN);
zl.route.prefix.u.prefix4 = srp->prefv4.prefix;
zl.route.prefix.prefixlen = srp->prefv4.prefixlen;
zl.route.prefix.family = srp->prefv4.family;
zl.route.type = ZEBRA_ROUTE_OSPF;
zl.route.instance = 0;
}
/* Send message to zebra. */
(void)zebra_send_mpls_labels(zclient, ZEBRA_MPLS_LABELS_DELETE, &zl);
}
/* Send MPLS Label entry to Zebra for installation or deletion */
void ospf_zebra_send_adjacency_sid(int cmd, struct sr_nhlfe nhlfe)
{
struct zapi_labels zl;
struct zapi_nexthop *znh;
osr_debug("SR (%s): %s Labels %u/%u for Adjacency via %u", __func__,
cmd == ZEBRA_MPLS_LABELS_ADD ? "Add" : "Delete",
nhlfe.label_in, nhlfe.label_out, nhlfe.ifindex);
memset(&zl, 0, sizeof(zl));
zl.type = ZEBRA_LSP_OSPF_SR;
zl.local_label = nhlfe.label_in;
zl.nexthop_num = 1;
znh = &zl.nexthops[0];
znh->type = NEXTHOP_TYPE_IPV4_IFINDEX;
znh->gate.ipv4 = nhlfe.nexthop;
znh->ifindex = nhlfe.ifindex;
znh->label_num = 1;
znh->labels[0] = nhlfe.label_out;
(void)zebra_send_mpls_labels(zclient, cmd, &zl);
}
struct ospf_redist *ospf_redist_lookup(struct ospf *ospf, uint8_t type, struct ospf_redist *ospf_redist_lookup(struct ospf *ospf, uint8_t type,
unsigned short instance) unsigned short instance)
{ {
@ -1351,6 +1465,7 @@ void ospf_zebra_vrf_deregister(struct ospf *ospf)
zclient_send_dereg_requests(zclient, ospf->vrf_id); zclient_send_dereg_requests(zclient, ospf->vrf_id);
} }
} }
static void ospf_zebra_connected(struct zclient *zclient) static void ospf_zebra_connected(struct zclient *zclient)
{ {
/* Send the client registration */ /* Send the client registration */

8
ospfd/ospf_zebra.h
View File

@ -63,6 +63,13 @@ extern struct ospf_external *ospf_external_lookup(struct ospf *, uint8_t,
unsigned short); unsigned short);
extern struct ospf_external *ospf_external_add(struct ospf *, uint8_t, extern struct ospf_external *ospf_external_add(struct ospf *, uint8_t,
unsigned short); unsigned short);
struct sr_prefix;
struct sr_nhlfe;
extern void ospf_zebra_update_prefix_sid(const struct sr_prefix *srp);
extern void ospf_zebra_delete_prefix_sid(const struct sr_prefix *srp);
extern void ospf_zebra_send_adjacency_sid(int cmd, struct sr_nhlfe nhlfe);
extern void ospf_external_del(struct ospf *, uint8_t, unsigned short); extern void ospf_external_del(struct ospf *, uint8_t, unsigned short);
extern struct ospf_redist *ospf_redist_lookup(struct ospf *, uint8_t, extern struct ospf_redist *ospf_redist_lookup(struct ospf *, uint8_t,
unsigned short); unsigned short);
@ -70,7 +77,6 @@ extern struct ospf_redist *ospf_redist_add(struct ospf *, uint8_t,
unsigned short); unsigned short);
extern void ospf_redist_del(struct ospf *, uint8_t, unsigned short); extern void ospf_redist_del(struct ospf *, uint8_t, unsigned short);
extern int ospf_redistribute_set(struct ospf *, int, unsigned short, int, int); extern int ospf_redistribute_set(struct ospf *, int, unsigned short, int, int);
extern int ospf_redistribute_unset(struct ospf *, int, unsigned short); extern int ospf_redistribute_unset(struct ospf *, int, unsigned short);
extern int ospf_redistribute_default_set(struct ospf *, int, int, int); extern int ospf_redistribute_default_set(struct ospf *, int, int, int);

91
tests/topotests/ospf-sr-topo1/r1/ospf_srdb.json
View File

@ -15,9 +15,18 @@
"prefix":"10.0.255.2\/32", "prefix":"10.0.255.2\/32",
"sid":200, "sid":200,
"inputLabel":20200, "inputLabel":20200,
"outputLabel":"pop", "prefixRoute":[
"interface":"r1-eth0", {
"nexthop":"10.0.1.2" "outputLabel":3,
"interface":"r1-eth0",
"nexthop":"10.0.0.2"
},
{
"outputLabel":3,
"interface":"r1-eth1",
"nexthop":"10.0.1.2"
}
]
} }
] ]
}, },
@ -36,9 +45,18 @@
"prefix":"10.0.255.4\/32", "prefix":"10.0.255.4\/32",
"sid":400, "sid":400,
"inputLabel":20400, "inputLabel":20400,
"outputLabel":"8400", "prefixRoute":[
"interface":"r1-eth0", {
"nexthop":"10.0.1.2" "outputLabel":8400,
"interface":"r1-eth0",
"nexthop":"10.0.0.2"
},
{
"outputLabel":8400,
"interface":"r1-eth1",
"nexthop":"10.0.1.2"
}
]
} }
] ]
}, },
@ -47,19 +65,24 @@
"srgbSize":10000, "srgbSize":10000,
"srgbLabel":10000, "srgbLabel":10000,
"algorithms":[ "algorithms":[
{
"0":"SPF"
}
], ],
"nodeMsd":8,
"extendedPrefix":[ "extendedPrefix":[
{ {
"prefix":"10.0.255.3\/32", "prefix":"10.0.255.3\/32",
"sid":300, "sid":300,
"inputLabel":20300, "inputLabel":20300,
"outputLabel":"8300", "prefixRoute":[
"interface":"r1-eth0", {
"nexthop":"10.0.1.2" "outputLabel":8300,
"interface":"r1-eth0",
"nexthop":"10.0.0.2"
},
{
"outputLabel":8300,
"interface":"r1-eth1",
"nexthop":"10.0.1.2"
}
]
} }
] ]
}, },
@ -78,26 +101,46 @@
"prefix":"10.0.255.1\/32", "prefix":"10.0.255.1\/32",
"sid":100, "sid":100,
"inputLabel":20100, "inputLabel":20100,
"outputLabel":"pop", "prefixRoute":[
"interface":"lo", {
"nexthop":"10.0.255.1" "outputLabel":3,
"interface":"lo",
"nexthop":"10.0.255.1"
}
]
} }
], ],
"extendedLink":[ "extendedLink":[
{ {
"prefix":"10.0.1.1\/32", "prefix":"10.0.0.1\/32",
"sid":50001, "sid":"XX",
"inputLabel":50001, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r1-eth0", "interface":"r1-eth0",
"nexthop":"10.0.0.2"
},
{
"prefix":"10.0.0.1\/32",
"sid":"XX",
"inputLabel":"XX",
"outputLabel":3,
"interface":"r1-eth0",
"nexthop":"10.0.0.2"
},
{
"prefix":"10.0.1.1\/32",
"sid":"XX",
"inputLabel":"XX",
"outputLabel":3,
"interface":"r1-eth1",
"nexthop":"10.0.1.2" "nexthop":"10.0.1.2"
}, },
{ {
"prefix":"10.0.1.1\/32", "prefix":"10.0.1.1\/32",
"sid":50000, "sid":"XX",
"inputLabel":50000, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r1-eth0", "interface":"r1-eth1",
"nexthop":"10.0.1.2" "nexthop":"10.0.1.2"
} }
] ]

5
tests/topotests/ospf-sr-topo1/r1/ospfd.conf
View File

@ -3,6 +3,11 @@ interface lo
ip ospf area 0.0.0.0 ip ospf area 0.0.0.0
! !
interface r1-eth0 interface r1-eth0
ip ospf network point-to-point
ip ospf area 0.0.0.0
!
interface r1-eth1
ip ospf network point-to-point
ip ospf area 0.0.0.0 ip ospf area 0.0.0.0
! !
router ospf router ospf

3
tests/topotests/ospf-sr-topo1/r1/zebra.conf
View File

@ -3,6 +3,9 @@ interface lo
ip address 10.0.255.1/32 ip address 10.0.255.1/32
! !
interface r1-eth0 interface r1-eth0
ip address 10.0.0.1/24
!
interface r1-eth1
ip address 10.0.1.1/24 ip address 10.0.1.1/24
! !
ip forwarding ip forwarding

58
tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json
View File

@ -7,8 +7,7 @@
"type":"SR (OSPF)", "type":"SR (OSPF)",
"outLabel":3, "outLabel":3,
"distance":150, "distance":150,
"installed":true, "installed":true
"nexthop":"10.0.255.1"
} }
] ]
}, },
@ -22,6 +21,13 @@
"distance":150, "distance":150,
"installed":true, "installed":true,
"nexthop":"10.0.1.2" "nexthop":"10.0.1.2"
},
{
"type":"SR (OSPF)",
"outLabel":3,
"distance":150,
"installed":true,
"nexthop":"10.0.0.2"
} }
] ]
}, },
@ -35,6 +41,13 @@
"distance":150, "distance":150,
"installed":true, "installed":true,
"nexthop":"10.0.1.2" "nexthop":"10.0.1.2"
},
{
"type":"SR (OSPF)",
"outLabel":8300,
"distance":150,
"installed":true,
"nexthop":"10.0.0.2"
} }
] ]
}, },
@ -48,11 +61,44 @@
"distance":150, "distance":150,
"installed":true, "installed":true,
"nexthop":"10.0.1.2" "nexthop":"10.0.1.2"
},
{
"type":"SR (OSPF)",
"outLabel":8400,
"distance":150,
"installed":true,
"nexthop":"10.0.0.2"
} }
] ]
}, },
"50000":{ "XX":{
"inLabel":50000, "inLabel":"XX",
"installed":true,
"nexthops":[
{
"type":"SR (OSPF)",
"outLabel":3,
"distance":150,
"installed":true,
"nexthop":"10.0.0.2"
}
]
},
"XX":{
"inLabel":"XX",
"installed":true,
"nexthops":[
{
"type":"SR (OSPF)",
"outLabel":3,
"distance":150,
"installed":true,
"nexthop":"10.0.0.2"
}
]
},
"XX":{
"inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {
@ -64,8 +110,8 @@
} }
] ]
}, },
"50001":{ "XX":{
"inLabel":50001, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {

129
tests/topotests/ospf-sr-topo1/r2/ospf_srdb.json
View File

@ -15,59 +15,79 @@
"prefix":"10.0.255.2\/32", "prefix":"10.0.255.2\/32",
"sid":200, "sid":200,
"inputLabel":0, "inputLabel":0,
"outputLabel":"0", "prefixRoute":[
"interface":"lo", {
"nexthop":"10.0.255.2" "outputLabel":0,
"interface":"lo",
"nexthop":"10.0.255.2"
}
]
} }
], ],
"extendedLink":[ "extendedLink":[
{ {
"prefix":"10.0.4.2\/32", "prefix":"10.0.4.2\/32",
"sid":50001, "sid":"XX",
"inputLabel":50001, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r2-eth2", "interface":"r2-eth3",
"nexthop":"10.0.4.1" "nexthop":"10.0.4.1"
}, },
{ {
"prefix":"10.0.4.2\/32", "prefix":"10.0.4.2\/32",
"sid":50000, "sid":"XX",
"inputLabel":50000, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r2-eth2", "interface":"r2-eth3",
"nexthop":"10.0.4.1" "nexthop":"10.0.4.1"
}, },
{ {
"prefix":"10.0.3.2\/32", "prefix":"10.0.0.2\/32",
"sid":50003, "sid":"XX",
"inputLabel":50003, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r2-eth1", "interface":"r2-eth0",
"nexthop":"10.0.3.1" "nexthop":"10.0.0.1"
}, },
{ {
"prefix":"10.0.3.2\/32", "prefix":"10.0.0.2\/32",
"sid":50002, "sid":"XX",
"inputLabel":50002, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r2-eth1", "interface":"r2-eth0",
"nexthop":"10.0.3.1" "nexthop":"10.0.0.1"
}, },
{ {
"prefix":"10.0.1.2\/32", "prefix":"10.0.1.2\/32",
"sid":50005, "sid":"XX",
"inputLabel":50005, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r2-eth0", "interface":"r2-eth1",
"nexthop":"10.0.1.1" "nexthop":"10.0.1.1"
}, },
{ {
"prefix":"10.0.1.2\/32", "prefix":"10.0.1.2\/32",
"sid":50004, "sid":"XX",
"inputLabel":50004, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r2-eth0", "interface":"r2-eth1",
"nexthop":"10.0.1.1" "nexthop":"10.0.1.1"
},
{
"prefix":"10.0.3.2\/32",
"sid":"XX",
"inputLabel":"XX",
"outputLabel":3,
"interface":"r2-eth2",
"nexthop":"10.0.3.1"
},
{
"prefix":"10.0.3.2\/32",
"sid":"XX",
"inputLabel":"XX",
"outputLabel":3,
"interface":"r2-eth2",
"nexthop":"10.0.3.1"
} }
] ]
}, },
@ -76,19 +96,19 @@
"srgbSize":10000, "srgbSize":10000,
"srgbLabel":10000, "srgbLabel":10000,
"algorithms":[ "algorithms":[
{
"0":"SPF"
}
], ],
"nodeMsd":12,
"extendedPrefix":[ "extendedPrefix":[
{ {
"prefix":"10.0.255.4\/32", "prefix":"10.0.255.4\/32",
"sid":400, "sid":400,
"inputLabel":8400, "inputLabel":8400,
"outputLabel":"10400", "prefixRoute":[
"interface":"r2-eth2", {
"nexthop":"10.0.4.1" "outputLabel":10400,
"interface":"r2-eth3",
"nexthop":"10.0.4.1"
}
]
} }
] ]
}, },
@ -97,19 +117,19 @@
"srgbSize":10000, "srgbSize":10000,
"srgbLabel":10000, "srgbLabel":10000,
"algorithms":[ "algorithms":[
{
"0":"SPF"
}
], ],
"nodeMsd":8,
"extendedPrefix":[ "extendedPrefix":[
{ {
"prefix":"10.0.255.3\/32", "prefix":"10.0.255.3\/32",
"sid":300, "sid":300,
"inputLabel":8300, "inputLabel":8300,
"outputLabel":"pop", "prefixRoute":[
"interface":"r2-eth1", {
"nexthop":"10.0.3.1" "outputLabel":3,
"interface":"r2-eth2",
"nexthop":"10.0.3.1"
}
]
} }
] ]
}, },
@ -118,19 +138,24 @@
"srgbSize":10000, "srgbSize":10000,
"srgbLabel":20000, "srgbLabel":20000,
"algorithms":[ "algorithms":[
{
"0":"SPF"
}
], ],
"nodeMsd":16,
"extendedPrefix":[ "extendedPrefix":[
{ {
"prefix":"10.0.255.1\/32", "prefix":"10.0.255.1\/32",
"sid":100, "sid":100,
"inputLabel":8100, "inputLabel":8100,
"outputLabel":"20100", "prefixRoute":[
"interface":"r2-eth0", {
"nexthop":"10.0.1.1" "outputLabel":20100,
"interface":"r2-eth0",
"nexthop":"10.0.0.1"
},
{
"outputLabel":20100,
"interface":"r2-eth1",
"nexthop":"10.0.1.1"
}
]
} }
] ]
} }

4
tests/topotests/ospf-sr-topo1/r2/ospfd.conf
View File

@ -5,6 +5,7 @@ interface lo
ip ospf area 0.0.0.0 ip ospf area 0.0.0.0
! !
interface r2-eth0 interface r2-eth0
ip ospf network point-to-point
ip ospf area 0.0.0.0 ip ospf area 0.0.0.0
! !
interface r2-eth1 interface r2-eth1
@ -12,6 +13,9 @@ interface r2-eth1
ip ospf area 0.0.0.0 ip ospf area 0.0.0.0
! !
interface r2-eth2 interface r2-eth2
ip ospf area 0.0.0.0
!
interface r2-eth3
ip ospf network point-to-point ip ospf network point-to-point
ip ospf area 0.0.0.0 ip ospf area 0.0.0.0
! !

7
tests/topotests/ospf-sr-topo1/r2/zebra.conf
View File

@ -3,12 +3,15 @@ interface lo
ip address 10.0.255.2/32 ip address 10.0.255.2/32
! !
interface r2-eth0 interface r2-eth0
ip address 10.0.1.2/24 ip address 10.0.0.2/24
! !
interface r2-eth1 interface r2-eth1
ip address 10.0.3.2/24 ip address 10.0.1.2/24
! !
interface r2-eth2 interface r2-eth2
ip address 10.0.3.2/24
!
interface r2-eth3
ip address 10.0.4.2/24 ip address 10.0.4.2/24
! !
ip forwarding ip forwarding

61
tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json
View File

@ -9,6 +9,13 @@
"distance":150, "distance":150,
"installed":true, "installed":true,
"nexthop":"10.0.1.1" "nexthop":"10.0.1.1"
},
{
"type":"SR (OSPF)",
"outLabel":20100,
"distance":150,
"installed":true,
"nexthop":"10.0.0.1"
} }
] ]
}, },
@ -38,8 +45,8 @@
} }
] ]
}, },
"50000":{ "XX":{
"inLabel":50000, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {
@ -51,8 +58,8 @@
} }
] ]
}, },
"50001":{ "XX":{
"inLabel":50001, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {
@ -64,8 +71,8 @@
} }
] ]
}, },
"50002":{ "XX":{
"inLabel":50002, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {
@ -73,12 +80,12 @@
"outLabel":3, "outLabel":3,
"distance":150, "distance":150,
"installed":true, "installed":true,
"nexthop":"10.0.3.1" "nexthop":"10.0.0.1"
} }
] ]
}, },
"50003":{ "XX":{
"inLabel":50003, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {
@ -86,12 +93,12 @@
"outLabel":3, "outLabel":3,
"distance":150, "distance":150,
"installed":true, "installed":true,
"nexthop":"10.0.3.1" "nexthop":"10.0.0.1"
} }
] ]
}, },
"50004":{ "XX":{
"inLabel":50004, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {
@ -103,8 +110,8 @@
} }
] ]
}, },
"50005":{ "XX":{
"inLabel":50005, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {
@ -115,5 +122,31 @@
"nexthop":"10.0.1.1" "nexthop":"10.0.1.1"
} }
] ]
},
"XX":{
"inLabel":"XX",
"installed":true,
"nexthops":[
{
"type":"SR (OSPF)",
"outLabel":3,
"distance":150,
"installed":true,
"nexthop":"10.0.3.1"
}
]
},
"XX":{
"inLabel":"XX",
"installed":true,
"nexthops":[
{
"type":"SR (OSPF)",
"outLabel":3,
"distance":150,
"installed":true,
"nexthop":"10.0.3.1"
}
]
} }
} }

52
tests/topotests/ospf-sr-topo1/r3/ospf_srdb.json
View File

@ -15,9 +15,13 @@
"prefix":"10.0.255.2\/32", "prefix":"10.0.255.2\/32",
"sid":200, "sid":200,
"inputLabel":10200, "inputLabel":10200,
"outputLabel":"pop", "prefixRoute":[
"interface":"r3-eth0", {
"nexthop":"10.0.3.2" "outputLabel":3,
"interface":"r3-eth0",
"nexthop":"10.0.3.2"
}
]
} }
] ]
}, },
@ -36,9 +40,13 @@
"prefix":"10.0.255.4\/32", "prefix":"10.0.255.4\/32",
"sid":400, "sid":400,
"inputLabel":10400, "inputLabel":10400,
"outputLabel":"8400", "prefixRoute":[
"interface":"r3-eth0", {
"nexthop":"10.0.3.2" "outputLabel":8400,
"interface":"r3-eth0",
"nexthop":"10.0.3.2"
}
]
} }
] ]
}, },
@ -57,25 +65,29 @@
"prefix":"10.0.255.3\/32", "prefix":"10.0.255.3\/32",
"sid":300, "sid":300,
"inputLabel":0, "inputLabel":0,
"outputLabel":"0", "prefixRoute":[
"interface":"lo", {
"nexthop":"10.0.255.3" "outputLabel":0,
"interface":"lo",
"nexthop":"10.0.255.3"
}
]
} }
], ],
"extendedLink":[ "extendedLink":[
{ {
"prefix":"10.0.3.1\/32", "prefix":"10.0.3.1\/32",
"sid":50001, "sid":"XX",
"inputLabel":50001, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r3-eth0", "interface":"r3-eth0",
"nexthop":"10.0.3.2" "nexthop":"10.0.3.2"
}, },
{ {
"prefix":"10.0.3.1\/32", "prefix":"10.0.3.1\/32",
"sid":50000, "sid":"XX",
"inputLabel":50000, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r3-eth0", "interface":"r3-eth0",
"nexthop":"10.0.3.2" "nexthop":"10.0.3.2"
} }
@ -96,9 +108,13 @@
"prefix":"10.0.255.1\/32", "prefix":"10.0.255.1\/32",
"sid":100, "sid":100,
"inputLabel":10100, "inputLabel":10100,
"outputLabel":"8100", "prefixRoute":[
"interface":"r3-eth0", {
"nexthop":"10.0.3.2" "outputLabel":8100,
"interface":"r3-eth0",
"nexthop":"10.0.3.2"
}
]
} }
] ]
} }

1
tests/topotests/ospf-sr-topo1/r3/ospfd.conf
View File

@ -3,7 +3,6 @@ interface lo
ip ospf area 0.0.0.0 ip ospf area 0.0.0.0
! !
interface r3-eth0 interface r3-eth0
ip ospf network point-to-point
ip ospf area 0.0.0.0 ip ospf area 0.0.0.0
! !
! !

8
tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json
View File

@ -38,8 +38,8 @@
} }
] ]
}, },
"50000":{ "XX":{
"inLabel":50000, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {
@ -51,8 +51,8 @@
} }
] ]
}, },
"50001":{ "XX":{
"inLabel":50001, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {

63
tests/topotests/ospf-sr-topo1/r4/ospf_srdb.json
View File

@ -6,18 +6,19 @@
"srgbSize":20000, "srgbSize":20000,
"srgbLabel":8000, "srgbLabel":8000,
"algorithms":[ "algorithms":[
{
"0":"SPF"
}
], ],
"extendedPrefix":[ "extendedPrefix":[
{ {
"prefix":"10.0.255.2\/32", "prefix":"10.0.255.2\/32",
"sid":200, "sid":200,
"inputLabel":10200, "inputLabel":10200,
"outputLabel":"pop", "prefixRoute":[
"interface":"r4-eth0", {
"nexthop":"10.0.4.2" "outputLabel":3,
"interface":"r4-eth0",
"nexthop":"10.0.4.2"
}
]
} }
] ]
}, },
@ -36,25 +37,29 @@
"prefix":"10.0.255.4\/32", "prefix":"10.0.255.4\/32",
"sid":400, "sid":400,
"inputLabel":10400, "inputLabel":10400,
"outputLabel":"pop", "prefixRoute":[
"interface":"lo", {
"nexthop":"10.0.255.4" "outputLabel":3,
"interface":"lo",
"nexthop":"10.0.255.4"
}
]
} }
], ],
"extendedLink":[ "extendedLink":[
{ {
"prefix":"10.0.4.1\/32", "prefix":"10.0.4.1\/32",
"sid":50001, "sid":"XX",
"inputLabel":50001, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r4-eth0", "interface":"r4-eth0",
"nexthop":"10.0.4.2" "nexthop":"10.0.4.2"
}, },
{ {
"prefix":"10.0.4.1\/32", "prefix":"10.0.4.1\/32",
"sid":50000, "sid":"XX",
"inputLabel":50000, "inputLabel":"XX",
"outputLabel":"pop", "outputLabel":3,
"interface":"r4-eth0", "interface":"r4-eth0",
"nexthop":"10.0.4.2" "nexthop":"10.0.4.2"
} }
@ -65,19 +70,19 @@
"srgbSize":10000, "srgbSize":10000,
"srgbLabel":10000, "srgbLabel":10000,
"algorithms":[ "algorithms":[
{
"0":"SPF"
}
], ],
"nodeMsd":8,
"extendedPrefix":[ "extendedPrefix":[
{ {
"prefix":"10.0.255.3\/32", "prefix":"10.0.255.3\/32",
"sid":300, "sid":300,
"inputLabel":10300, "inputLabel":10300,
"outputLabel":"8300", "prefixRoute":[
"interface":"r4-eth0", {
"nexthop":"10.0.4.2" "outputLabel":8300,
"interface":"r4-eth0",
"nexthop":"10.0.4.2"
}
]
} }
] ]
}, },
@ -86,19 +91,19 @@
"srgbSize":10000, "srgbSize":10000,
"srgbLabel":20000, "srgbLabel":20000,
"algorithms":[ "algorithms":[
{
"0":"SPF"
}
], ],
"nodeMsd":16,
"extendedPrefix":[ "extendedPrefix":[
{ {
"prefix":"10.0.255.1\/32", "prefix":"10.0.255.1\/32",
"sid":100, "sid":100,
"inputLabel":10100, "inputLabel":10100,
"outputLabel":"8100", "prefixRoute":[
"interface":"r4-eth0", {
"nexthop":"10.0.4.2" "outputLabel":8100,
"interface":"r4-eth0",
"nexthop":"10.0.4.2"
}
]
} }
] ]
} }

11
tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json
View File

@ -46,13 +46,12 @@
"type":"SR (OSPF)", "type":"SR (OSPF)",
"outLabel":3, "outLabel":3,
"distance":150, "distance":150,
"installed":true, "installed":true
"nexthop":"10.0.255.4"
} }
] ]
}, },
"50000":{ "XX":{
"inLabel":50000, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {
@ -64,8 +63,8 @@
} }
] ]
}, },
"50001":{ "XX":{
"inLabel":50001, "inLabel":"XX",
"installed":true, "installed":true,
"nexthops":[ "nexthops":[
{ {

30
tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py
View File

@ -27,6 +27,7 @@ test_ospf_sr_topo1.py: Test the FRR OSPF routing daemon with Segment Routing.
""" """
import os import os
import re
import sys import sys
from functools import partial from functools import partial
@ -62,20 +63,23 @@ class OspfSrTopo(Topo):
for routern in range(1, 5): for routern in range(1, 5):
tgen.add_router("r{}".format(routern)) tgen.add_router("r{}".format(routern))
# Interconect router 1 and 2 # Interconect router 1 and 2 with 2 links
switch = tgen.add_switch("s1") switch = tgen.add_switch('s1')
switch.add_link(tgen.gears["r1"]) switch.add_link(tgen.gears['r1'])
switch.add_link(tgen.gears["r2"]) switch.add_link(tgen.gears['r2'])
switch = tgen.add_switch('s2')
switch.add_link(tgen.gears['r1'])
switch.add_link(tgen.gears['r2'])
# Interconect router 3 and 2 # Interconect router 3 and 2
switch = tgen.add_switch("s2") switch = tgen.add_switch('s3')
switch.add_link(tgen.gears["r3"]) switch.add_link(tgen.gears['r3'])
switch.add_link(tgen.gears["r2"]) switch.add_link(tgen.gears['r2'])
# Interconect router 4 and 2 # Interconect router 4 and 2
switch = tgen.add_switch("s3") switch = tgen.add_switch('s4')
switch.add_link(tgen.gears["r4"]) switch.add_link(tgen.gears['r4'])
switch.add_link(tgen.gears["r2"]) switch.add_link(tgen.gears['r2'])
def setup_module(mod): def setup_module(mod):
@ -130,6 +134,9 @@ def compare_ospf_srdb(rname, expected):
""" """
tgen = get_topogen() tgen = get_topogen()
current = tgen.gears[rname].vtysh_cmd("show ip ospf database segment-routing json") current = tgen.gears[rname].vtysh_cmd("show ip ospf database segment-routing json")
# Filter Adjacency SID allocation
current = re.sub(r'"sid":5000[0-9],', '"sid":"XX",', current)
current = re.sub(r'"inputLabel":5000[0-9],', '"inputLabel":"XX",', current)
return topotest.difflines( return topotest.difflines(
current, expected, title1="Current output", title2="Expected output" current, expected, title1="Current output", title2="Expected output"
) )
@ -142,6 +149,9 @@ def compare_mpls_table(rname, expected):
""" """
tgen = get_topogen() tgen = get_topogen()
current = tgen.gears[rname].vtysh_cmd("show mpls table json") current = tgen.gears[rname].vtysh_cmd("show mpls table json")
# Filter Adjacency SID allocation
current = re.sub(r'"5000[0-9]":', '"XX":', current)
current = re.sub(r'"inLabel":5000[0-9],', '"inLabel":"XX",', current)
return topotest.difflines( return topotest.difflines(
current, expected, title1="Current output", title2="Expected output" current, expected, title1="Current output", title2="Expected output"
) )