commit 1f6a574eae0b4a665eb33fdfbe66db22c066a674
author Srikanth Vavilapalli <srikanthvavila@gmail.com> Tue Oct 21 13:45:11 2014 -0700
committer Srikanth Vavilapalli <srikanthvavila@gmail.com> Tue Oct 21 13:45:31 2014 -0700
tree 6b51adc3e0584b0fad4e288e55b0d455cfe101d8
parent 5818267e16546c7e25dcaa4a2f24db7577819ce1

Changing from list of dpids to labels and accordingly show tunnel output

src/main/java/net/onrc/onos/apps/segmentrouting/web/SegmentRouterTunnelResource.java

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 3c19a21..bf3a084 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
@@ -2,10 +2,14 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import net.onrc.onos.apps.segmentrouting.ISegmentRoutingService;
-import net.onrc.onos.core.util.Dpid;
+import net.onrc.onos.apps.segmentrouting.SegmentRoutingManager.TunnelInfo;
+import net.onrc.onos.apps.segmentrouting.SegmentRoutingManager.TunnelRouteInfo;
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.restlet.resource.Delete;
@@ -14,17 +18,6 @@
 import org.restlet.resource.ServerResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import net.onrc.onos.apps.segmentrouting.ISegmentRoutingService;
-import net.onrc.onos.apps.segmentrouting.SegmentRoutingManager;
-import net.onrc.onos.apps.segmentrouting.SegmentRoutingManager.TunnelInfo;
-import net.onrc.onos.apps.segmentrouting.SegmentRoutingManager.TunnelRouteInfo;
 /**
  * Base class for return router statistics
  *
@@ -49,14 +42,10 @@
             log.error("Exception occurred parsing inbound JSON", ex);
             return "fail";
         }
-        log.debug("createTunnel with tunnelId {} tunnelPath{}",
-                createParams.getTunnel_id(), createParams.getTunnel_path());
-        List<Dpid> tunnelDpids = new ArrayList<Dpid>();
-        for (String dpid : createParams.getTunnel_path()) {
-            tunnelDpids.add(new Dpid(dpid));
-        }
+        log.debug("createTunnel with tunnelId {} Label Path{}",
+                createParams.getTunnel_id(), createParams.getLabel_path());
         boolean result = segmentRoutingService.createTunnel(createParams.getTunnel_id(),
-                tunnelDpids);
+                createParams.getLabel_path());
         return (result == true) ? "success" : "fail";
     }
 
@@ -99,10 +88,10 @@
                labelStack.add(label.getRoute());
            }
            SegmentRouterTunnelInfo info = new SegmentRouterTunnelInfo(tunnelInfo.getTunnelId(),
-                   tunnelInfo.getDpids(), labelStack );
+                    /*tunnelInfo.getDpids(),*/labelStack);
            infoList.add(info);
            //TODO Add Group/DPID
-           
+
         }
         log.debug("getTunnel with params");
         Map <String,List<SegmentRouterTunnelInfo>>result = new HashMap<String,List<SegmentRouterTunnelInfo>>();