summaryrefslogtreecommitdiffstats
path: root/ospfd
diff options
context:
space:
mode:
authorOlivier Dugeon <olivier.dugeon@orange.com>2018-01-22 19:18:10 +0100
committerOlivier Dugeon <olivier.dugeon@orange.com>2018-01-22 19:18:10 +0100
commit7726c479644269fc573dd6aad72ea9c163599fd6 (patch)
tree853938dafc94ab1976050588655031704a4de7b7 /ospfd
parentOSPFD: Update Segment Routing implementation (diff)
downloadfrr-7726c479644269fc573dd6aad72ea9c163599fd6.tar.xz
frr-7726c479644269fc573dd6aad72ea9c163599fd6.zip
OSPFD: Update Segment Routing following reviews
- Remove OSPD_SR route type - Check that Segment Routing is enable only in default VRF - Add comment for SRGB in lib/mpls.h - Update documentation Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ospf_sr.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
index 8ac151546..3c30a337d 100644
--- a/ospfd/ospf_sr.c
+++ b/ospfd/ospf_sr.c
@@ -1702,6 +1702,12 @@ DEFUN(ospf_sr_enable,
if (OspfSR.enabled)
return CMD_SUCCESS;
+ if (ospf->vrf_id != VRF_DEFAULT) {
+ vty_out(vty, "Segment Routing is only supported in default "
+ "VRF\n");
+ return CMD_WARNING_CONFIG_FAILED;
+ }
+
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("SR: Segment Routing: OFF -> ON");
@@ -2135,7 +2141,7 @@ DEFUN (show_ip_opsf_srdb,
if (!OspfSR.enabled) {
vty_out(vty, "Segment Routing is disabled on this router\n");
- return CMD_WARNING_CONFIG_FAILED;
+ return CMD_WARNING;
}
vty_out(vty, "\n OSPF Segment Routing database for ID %s\n\n",