forgot to add few files
diff --git a/conf/onos.properties b/conf/onos.properties
index a3e1d19..89b4c80 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -23,4 +23,4 @@
# Uncomment and list all the ZooKeeper instances after localhost on multi-instance deployment.
#net.onrc.onos.core.registry.ZookeeperRegistry.connectionString = localhost:2181,otherhost:2181
# Specify a network configuration file to be used by the NetworkConfigManager
-net.onrc.onos.core.configmanager.NetworkConfigManager.networkConfigFile = conf/sr-ecmp.conf
+net.onrc.onos.core.configmanager.NetworkConfigManager.networkConfigFile = conf/sr-ecmp10.conf
diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/ISegmentRoutingService.java b/src/main/java/net/onrc/onos/apps/segmentrouting/ISegmentRoutingService.java
index 349aa40..e8b1b31 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/ISegmentRoutingService.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/ISegmentRoutingService.java
@@ -11,8 +11,8 @@
import net.onrc.onos.core.util.IPv4Net;
/**
- * The API exported by the main SDN-IP class. This is the interface between the
- * REST handlers and the SDN-IP module.
+ * The API exported by the main Segment Routing class. This is the interface between the
+ * REST handlers and the vs module.
*/
public interface ISegmentRoutingService extends IFloodlightService {
@@ -117,4 +117,11 @@
* @return Collection of Adjacency ID
*/
public Collection<Integer> getAdjacencyIds(int nodeSid);
+ /**
+ * Get MPLS label reading the config file
+ *
+ * @param dipid DPID of the switch
+ * @return MPLS label for the switch
+ */
+ public String getMplsLabel(String dpid);
}
diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterTunnelResource.java b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterTunnelResource.java
index 6c1a1d8..a56b59d 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterTunnelResource.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterTunnelResource.java
@@ -109,7 +109,10 @@
labelStack.add(label.getRoute());
Integer gId = segmentRoutingService.getTunnelGroupId(tunnelId,
label.getSrcSwDpid());
- dpidGroup.add(label.getSrcSwDpid() + "/"+ gId);
+ dpidGroup.add(label.getSrcSwDpid()+"("
+ + segmentRoutingService.getMplsLabel(label.getSrcSwDpid())+ ")"
+ + "/"+ gId
+ );
}
SegmentRouterTunnelInfo info = new SegmentRouterTunnelInfo(tunnelId,
labelStack, dpidGroup, tunnelPath, policiesId );