diff --git a/src/bgpls_speaker/service/java/bgp_ls.jar b/src/bgpls_speaker/service/java/bgp_ls.jar index c0dc2454b3b977bce716ade9605b438ef8730b65..3fc18e6dfe38de90ec7625b66012c65637ee64e9 100644 Binary files a/src/bgpls_speaker/service/java/bgp_ls.jar and b/src/bgpls_speaker/service/java/bgp_ls.jar differ diff --git a/src/bgpls_speaker/service/java/netphony-topology/src/main/java/eu/teraflow/tid/bgp4Peer/models/NodeNLRIMsg.java b/src/bgpls_speaker/service/java/netphony-topology/src/main/java/eu/teraflow/tid/bgp4Peer/models/NodeNLRIMsg.java index d31dd4103c7848b1183a13df12569aef17c14978..7f6863e18c1bf5682f69ec0019a6092acfcc0dea 100644 --- a/src/bgpls_speaker/service/java/netphony-topology/src/main/java/eu/teraflow/tid/bgp4Peer/models/NodeNLRIMsg.java +++ b/src/bgpls_speaker/service/java/netphony-topology/src/main/java/eu/teraflow/tid/bgp4Peer/models/NodeNLRIMsg.java @@ -37,7 +37,7 @@ public class NodeNLRIMsg { private Logger log; private String nodeName; private String ISIS_ID_str; - private String router_id; + private String router_id="-"; private String learntFrom; @@ -69,7 +69,11 @@ public class NodeNLRIMsg { router_id=ISIS_ID_str; case 3: IGPID = nodeNLRI.getLocalNodeDescriptors().getIGPRouterID().getIpv4AddressOSPF(); - router_id=IGPID.toString(); + if(IGPID!=null){ + router_id=IGPID.toString(); + }else{ + System.out.println("Null IGPID (type OSPF)"); + } break; default: log.info("añadir este tipo de IGP Identifier por implementar "); @@ -85,7 +89,7 @@ public class NodeNLRIMsg { if (nodeName != null) { this.nodeName = nodeName; }else{ - this.nodeName= this.IGPID.toString(); + this.nodeName= this.router_id; } log.info("End node processing"); } @@ -94,8 +98,8 @@ public class NodeNLRIMsg { // TODO: concatenate with stringBuffer String out = ""; - if (this.localBgplsID != null) - out = out + "ID: " + this.localBgplsID + " ";// esto es id router?? + if (this.router_id != null) + out = out + "ID: " + this.router_id + " ";// esto es id router?? if (this.iPv4RouterIDLocalNodeLATLV != null) out = out + this.iPv4RouterIDLocalNodeLATLV.toString(); if (this.iPv4RouterIDNeighborNodeLATLV != null) diff --git a/src/webui/service/templates/bgpls/home.html b/src/webui/service/templates/bgpls/home.html index c4ff3f2da818921e2c58e7f94e9675d8032895e5..cbf618e1c56ae259b3c07c2fb566eba670f71708 100644 --- a/src/webui/service/templates/bgpls/home.html +++ b/src/webui/service/templates/bgpls/home.html @@ -77,7 +77,7 @@ </tr> {% endif %} </tbody> - <tbody> + <!-- <tbody> {% if dislink %} {% for link in dislink %} <tr> @@ -92,8 +92,6 @@ Add Link </a> </div> - - </td> </tr> {% endfor %} @@ -102,7 +100,7 @@ <td colspan="3">No devices found</td> </tr> {% endif %} - </tbody> + </tbody> --> </table> <script src="https://d3js.org/d3.v4.min.js"></script>