commit 3908fde0c599db735f3c4c04b223e540e6ff7907
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Nov 19 16:30:22 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Nov 21 14:52:45 2014 -0800
tree a8424c7f610ab2cbd8d01a44162b2f281c5384f5
parent 2b6ca91b59c81f16bfd915bb9a92a72758b23300

Fix ONOS-151 to support installation of PointToPointIntent

- Now support installation of PointToPointIntent that specifies the same
  switches as source element ID and destination element ID

Change-Id: If206f3fde77ca198fe1df078e7292a05e5bd7424

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 a4c8d58..b124602 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
@@ -19,8 +19,6 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultEdgeLink;
-import org.onlab.onos.net.DefaultLink;
 import org.onlab.onos.net.DefaultPath;
 import org.onlab.onos.net.Link;
 import org.onlab.onos.net.Path;
@@ -35,7 +33,7 @@
 import java.util.Set;
 
 import static java.util.Arrays.asList;
-import static org.onlab.onos.net.Link.Type.DIRECT;
+import static org.onlab.onos.net.DefaultEdgeLink.createEdgeLink;
 
 /**
  * An intent compiler for {@link org.onlab.onos.net.intent.PointToPointIntent}.
@@ -47,6 +45,8 @@
     // TODO: use off-the-shell core provider ID
     private static final ProviderId PID =
             new ProviderId("core", "org.onlab.onos.core", true);
+    // TODO: consider whether the default cost is appropriate or not
+    public static final int DEFAULT_COST = 1;
 
     @Activate
     public void activate() {
@@ -66,17 +66,17 @@
         ConnectPoint egressPoint = intent.egressPoint();
 
         if (ingressPoint.deviceId().equals(egressPoint.deviceId())) {
-            List<Link> links = asList(new DefaultLink(PID, ingressPoint, egressPoint, DIRECT));
-            return asList(createPathIntent(new DefaultPath(PID, links, 1), intent));
+            List<Link> links = asList(createEdgeLink(ingressPoint, true), createEdgeLink(egressPoint, false));
+            return asList(createPathIntent(new DefaultPath(PID, links, DEFAULT_COST), intent));
         }
 
         List<Link> links = new ArrayList<>();
         Path path = getPath(intent, ingressPoint.deviceId(),
                 egressPoint.deviceId());
 
-        links.add(DefaultEdgeLink.createEdgeLink(ingressPoint, true));
+        links.add(createEdgeLink(ingressPoint, true));
         links.addAll(path.links());
-        links.add(DefaultEdgeLink.createEdgeLink(egressPoint, false));
+        links.add(createEdgeLink(egressPoint, false));
 
         return asList(createPathIntent(new DefaultPath(PID, links, path.cost(),
                                                        path.annotations()), intent));