commit f237e1b964af6d82107b5da75a4b6d81d2ddb5ee
author Charles Chan <rascov@gmail.com> Tue Jan 09 13:45:07 2018 -0800
committer Charles Chan <charles@opennetworking.org> Thu Jan 11 22:46:38 2018 +0000
tree 784f2c95d742e195c7c5c6d063a5204f5dd08450
parent 4a768c01f8c1b61577d486a57557c92afd70618b

Fix the path not found issue in pseudowire

- Use getPaths instead of getDisjointPaths
- Add more debug log that prints all paths obtained from topology service

Change-Id: Ic195633b99261baec39962f0e99bc7b7082755c4

apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java

diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 6d5d0b2..0725e1b 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -84,7 +84,6 @@
 import org.onosproject.net.packet.PacketContext;
 import org.onosproject.net.packet.PacketProcessor;
 import org.onosproject.net.packet.PacketService;
-import org.onosproject.net.topology.PathService;
 import org.onosproject.net.topology.TopologyService;
 import org.onosproject.routeservice.ResolvedRoute;
 import org.onosproject.routeservice.RouteEvent;
@@ -153,9 +152,6 @@
     private NeighbourResolutionService neighbourResolutionService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    public PathService pathService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     CoreService coreService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -186,7 +182,7 @@
     MulticastRouteService multicastRouteService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    TopologyService topologyService;
+    public TopologyService topologyService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     RouteService routeService;