commit ab753e1e9ce4c61cb23c919a437af5e70a9c747a
author Thomas Vachuska <tom@onlab.us> Mon Jun 13 19:41:05 2016 -0700
committer Brian O'Connor <bocon@onlab.us> Tue Jun 14 02:45:51 2016 +0000
tree 517a0a779c3e6def3ae51eb1a91b3c4831a68774
parent 783d3d24d6ad1360615efa773efb2f5675150543

Fixing host-to-host compiler not to produce any installables if one == two.

Change-Id: I369e747537ee140c4bb5d63169e516e9700a3361

core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java
index a9bee07..c3f46ef 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.net.intent.impl.compiler;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -35,6 +36,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import static org.onosproject.net.flow.DefaultTrafficSelector.builder;
 
@@ -60,6 +62,11 @@
 
     @Override
     public List<Intent> compile(HostToHostIntent intent, List<Intent> installable) {
+        // If source and destination are the same, there are never any installables.
+        if (Objects.equals(intent.one(), intent.two())) {
+            return ImmutableList.of();
+        }
+
         boolean isAsymmetric = intent.constraints().contains(new AsymmetricPathConstraint());
         Path pathOne = getPath(intent, intent.one(), intent.two());
         Path pathTwo = isAsymmetric ?