lib, zebra: rename LSP type used for OSPF SR

SR support for IS-IS is coming so we need to be able to distinguish
OSPF and IS-IS LSPs.

While here, add missing case statement for LDP on
lsp_type_from_re_type().

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

7 files changed, 36 insertions, 32 deletions

diff --git a/lib/mpls.h b/lib/mpls.h
index d7b56c47bd..472ee9bc46 100644
--- a/lib/mpls.h
+++ b/lib/mpls.h
@@ -125,7 +125,7 @@ enum lsp_types_t {
 	ZEBRA_LSP_STATIC = 1, /* Static LSP. */
 	ZEBRA_LSP_LDP = 2,    /* LDP LSP. */
 	ZEBRA_LSP_BGP = 3,    /* BGP LSP. */
-	ZEBRA_LSP_SR = 4,     /* Segment Routing LSP. */
+	ZEBRA_LSP_OSPF_SR = 4,/* OSPF Segment Routing LSP. */
 	ZEBRA_LSP_SHARP = 5,  /* Identifier for test protocol */
 };
 
diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
index 9029eca2b2..70a4d93958 100644
--- a/ospfd/ospf_sr.c
+++ b/ospfd/ospf_sr.c
@@ -617,7 +617,7 @@ static int ospf_zebra_send_mpls_labels(int cmd, struct sr_nhlfe nhlfe)
 			   inet_ntoa(nhlfe.prefv4.prefix),
 			   nhlfe.prefv4.prefixlen, nhlfe.ifindex);
 
-	zl.type = ZEBRA_LSP_SR;
+	zl.type = ZEBRA_LSP_OSPF_SR;
 	zl.prefix.family = nhlfe.prefv4.family;
 	zl.prefix.prefixlen = nhlfe.prefv4.prefixlen;
 	zl.prefix.u.prefix4 = nhlfe.prefv4.prefix;
diff --git a/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json
index 254c137acd..6b1fe76b6e 100644
--- a/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json
+++ b/tests/topotests/ospf-sr-topo1/r1/zebra_mpls.json
@@ -4,7 +4,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -17,7 +17,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -30,7 +30,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":8300,
         "distance":150,
         "installed":true,
@@ -43,7 +43,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":8400,
         "distance":150,
         "installed":true,
@@ -56,7 +56,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -69,7 +69,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
diff --git a/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json
index 0d73a409ed..79965d280a 100644
--- a/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json
+++ b/tests/topotests/ospf-sr-topo1/r2/zebra_mpls.json
@@ -4,7 +4,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":20100,
         "distance":150,
         "installed":true,
@@ -17,7 +17,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -30,7 +30,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":10400,
         "distance":150,
         "installed":true,
@@ -43,7 +43,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -56,7 +56,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -69,7 +69,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -82,7 +82,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -95,7 +95,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -108,7 +108,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
diff --git a/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json
index b15f90afd1..ceb2f7a0e5 100644
--- a/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json
+++ b/tests/topotests/ospf-sr-topo1/r3/zebra_mpls.json
@@ -4,7 +4,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":8100,
         "distance":150,
         "installed":true,
@@ -17,7 +17,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -30,7 +30,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":8400,
         "distance":150,
         "installed":true,
@@ -43,7 +43,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -56,7 +56,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
diff --git a/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json b/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json
index d1238517f5..d7f54b224d 100644
--- a/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json
+++ b/tests/topotests/ospf-sr-topo1/r4/zebra_mpls.json
@@ -4,7 +4,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":8100,
         "distance":150,
         "installed":true,
@@ -17,7 +17,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -30,7 +30,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":8300,
         "distance":150,
         "installed":true,
@@ -43,7 +43,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -56,7 +56,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
@@ -69,7 +69,7 @@
     "installed":true,
     "nexthops":[
       {
-        "type":"SR",
+        "type":"SR (OSPF)",
         "outLabel":3,
         "distance":150,
         "installed":true,
diff --git a/zebra/zebra_mpls.h b/zebra/zebra_mpls.h
index 506b51a536..1b2849f81c 100644
--- a/zebra/zebra_mpls.h
+++ b/zebra/zebra_mpls.h
@@ -426,7 +426,7 @@ static inline uint8_t lsp_distance(enum lsp_types_t type)
 		return (route_distance(ZEBRA_ROUTE_BGP));
 	case ZEBRA_LSP_NONE:
 	case ZEBRA_LSP_SHARP:
-	case ZEBRA_LSP_SR:
+	case ZEBRA_LSP_OSPF_SR:
 		return 150;
 	}
 
@@ -448,8 +448,12 @@ static inline enum lsp_types_t lsp_type_from_re_type(int re_type)
 	switch (re_type) {
 	case ZEBRA_ROUTE_STATIC:
 		return ZEBRA_LSP_STATIC;
+	case ZEBRA_ROUTE_LDP:
+		return ZEBRA_LSP_LDP;
 	case ZEBRA_ROUTE_BGP:
 		return ZEBRA_LSP_BGP;
+	case ZEBRA_ROUTE_OSPF:
+		return ZEBRA_LSP_OSPF_SR;
 	case ZEBRA_ROUTE_SHARP:
 		return ZEBRA_LSP_SHARP;
 	default:
@@ -469,7 +473,7 @@ static inline int re_type_from_lsp_type(enum lsp_types_t lsp_type)
 		return ZEBRA_ROUTE_LDP;
 	case ZEBRA_LSP_BGP:
 		return ZEBRA_ROUTE_BGP;
-	case ZEBRA_LSP_SR:
+	case ZEBRA_LSP_OSPF_SR:
 		return ZEBRA_ROUTE_OSPF;
 	case ZEBRA_LSP_NONE:
 		return ZEBRA_ROUTE_KERNEL;
@@ -496,8 +500,8 @@ static inline const char *nhlfe_type2str(enum lsp_types_t lsp_type)
 		return "LDP";
 	case ZEBRA_LSP_BGP:
 		return "BGP";
-	case ZEBRA_LSP_SR:
-		return "SR";
+	case ZEBRA_LSP_OSPF_SR:
+		return "SR (OSPF)";
 	case ZEBRA_LSP_SHARP:
 		return "SHARP";
 	case ZEBRA_LSP_NONE: