commit 50eb95beae37a1fcf307038e711962476289f393
author weibit <weibit@gmail.com> Sat Oct 25 21:47:54 2014 -0700
committer weibit <weibit@gmail.com> Sat Oct 25 21:47:54 2014 -0700
tree 3b2d60bdbd03cadf0f25dda4b89712da31bab809
parent 8e6dba2982d548e47062de7b4cf6563b209b1d19

packet-intent fail event will trigger the creation of lightpaths

Change-Id: I54b3b039dee3350eaa0f3b4c7d3f0131966ea6bc

core/net/src/main/java/org/onlab/onos/net/intent/impl/PointToPointIntentCompiler.java

diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PointToPointIntentCompiler.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PointToPointIntentCompiler.java
index 25d50cc..8cd0e14 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PointToPointIntentCompiler.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PointToPointIntentCompiler.java
@@ -17,10 +17,19 @@
 import org.onlab.onos.net.intent.PathIntent;
 import org.onlab.onos.net.intent.PointToPointIntent;
 import org.onlab.onos.net.provider.ProviderId;
+import org.onlab.onos.net.topology.LinkWeight;
+//import org.onlab.onos.net.topology.LinkWeight;
 import org.onlab.onos.net.topology.PathService;
+import org.onlab.onos.net.topology.Topology;
+import org.onlab.onos.net.topology.TopologyEdge;
+//import org.onlab.onos.net.topology.Topology;
+//import org.onlab.onos.net.topology.TopologyEdge;
+import org.onlab.onos.net.topology.TopologyService;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
+//import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -41,6 +50,9 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected HostService hostService;
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected TopologyService topologyService;
+
     @Activate
     public void activate() {
         intentManager.registerCompiler(PointToPointIntent.class, this);
@@ -87,11 +99,39 @@
      * @throws PathNotFoundException if a path cannot be found
      */
     private Path getPath(ConnectPoint one, ConnectPoint two) {
-        Set<Path> paths = pathService.getPaths(one.deviceId(), two.deviceId());
-        if (paths.isEmpty()) {
-            throw new PathNotFoundException("No path from " + one + " to " + two);
+        // Set<Path> paths = pathService.getPaths(one.deviceId(), two.deviceId());
+       Topology topology = topologyService.currentTopology();
+        LinkWeight weight = new LinkWeight() {
+            @Override
+            public double weight(TopologyEdge edge) {
+                Link.Type lt = edge.link().type();
+                if (lt == Link.Type.OPTICAL) {
+                    return 1000.0;
+                } else {
+                    return 1.0;
+                }
+            }
+        };
+
+        Set<Path> paths = topologyService.getPaths(topology,
+                one.deviceId(),
+                two.deviceId(),
+                weight);
+
+        ArrayList<Path> localPaths = new ArrayList<>();
+        Iterator<Path> itr = paths.iterator();
+        while (itr.hasNext()) {
+            Path path = itr.next();
+            if (path.cost() >= 1000) {
+                continue;
+            }
+            localPaths.add(path);
+        }
+
+        if (localPaths.isEmpty()) {
+            throw new PathNotFoundException("No packet path from " + one + " to " + two);
         }
         // TODO: let's be more intelligent about this eventually
-        return paths.iterator().next();
+        return localPaths.iterator().next();
     }
 }