removed extra square brackets from label stack
diff --git a/cli/cli/c_actions.py b/cli/cli/c_actions.py
index 6852f57..a767492 100755
--- a/cli/cli/c_actions.py
+++ b/cli/cli/c_actions.py
@@ -2201,8 +2201,16 @@
combResult = []
tunnelList = entries
for tunnel in tunnelList:
- labelStack = str(tunnel.get('labelStack')) if tunnel.get('labelStack') else ''
- labelStack = remove_unicodes(labelStack)
+ labelStackList = (tunnel.get('labelStack'))
+ labelStackString ='['
+ for labelSack in labelStackList:
+ for label in labelSack:
+ labelStackString += (label + ',')
+ if labelStackString == '[':
+ labelStackString = ''
+ else:
+ labelStackString = labelStackString[:-1]
+ labelStackString += ']'
tunnelId = tunnel.get('tunnelId')
tunnelPath = tunnel.get('tunnelPath')
dpidGroup = str(tunnel.get('dpidGroup'))
@@ -2210,7 +2218,7 @@
policies = tunnel.get('policies')
combResult.append({
'tunnelId' : tunnelId,
- 'labelStack' : labelStack,
+ 'labelStack' : labelStackString,
'dpidGroup' : dpidGroup,
'tunnelPath' : tunnelPath,
'policies' : policies,
diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRoutingWebRoutable.java b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRoutingWebRoutable.java
index f06473c..6c9db02 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRoutingWebRoutable.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRoutingWebRoutable.java
@@ -1,9 +1,6 @@
package net.onrc.onos.apps.segmentrouting.web;
-import java.util.Iterator;
-
import net.floodlightcontroller.restserver.RestletRoutable;
-import net.onrc.onos.apps.segmentrouting.SegmentRoutingManager;
import org.restlet.Context;
import org.restlet.Restlet;
@@ -23,7 +20,6 @@
router.attach("/router/{routerId}/{statsType}", SegmentRouterResource.class);
router.attach("/tunnel", SegmentRouterTunnelResource.class);
router.attach("/policy", SegmentRouterPolicyResource.class);
- // SegmentRouterTunnelResource.class);
return router;
}