commit d26ea65e8412bcb5ee8167e0eb0c17aa996846ba
author Luca Prete <luca@onlab.us> Tue Jan 03 15:59:30 2017 -0800
committer Jonathan Hart <jono@onlab.us> Fri Jan 20 16:41:06 2017 +0000
tree 91de72f316b0320558b02e678bcd4e099e824b42
parent 61bb7f4d6ae8b77de96e8eea1dbc99a60c3b6d3d

ONOS-5799: Make SP2MP compiler partial failure constraint aware

Change-Id: I741c3a22916e7e51e5882bd3993d425e78f18bda

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

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java
index a6fac6f..c3fc348 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java
@@ -161,8 +161,8 @@
                                                  ConnectPoint egressPoint,
                                                  PointToPointIntent intent) {
         List<Link> links = new ArrayList<>();
-        Path path = getPath(intent, ingressPoint.deviceId(),
-                            egressPoint.deviceId());
+        Path path = getPathOrException(intent, ingressPoint.deviceId(),
+                                       egressPoint.deviceId());
 
         links.add(createEdgeLink(ingressPoint, true));
         links.addAll(path.links());
@@ -174,8 +174,8 @@
     }
 
     private List<Intent> createUnprotectedLinkCollectionIntent(PointToPointIntent intent) {
-        Path path = getPath(intent, intent.filteredIngressPoint().connectPoint().deviceId(),
-                            intent.filteredEgressPoint().connectPoint().deviceId());
+        Path path = getPathOrException(intent, intent.filteredIngressPoint().connectPoint().deviceId(),
+                                       intent.filteredEgressPoint().connectPoint().deviceId());
 
         return asList(createLinkCollectionIntent(ImmutableSet.copyOf(path.links()),
                                                  path.cost(),
@@ -274,8 +274,8 @@
                                                 PointToPointIntent intent,
                                                 List<Intent> installable) {
         List<Link> links = new ArrayList<>();
-        Path onlyPath = getPath(intent, ingressPoint.deviceId(),
-                                egressPoint.deviceId());
+        Path onlyPath = getPathOrException(intent, ingressPoint.deviceId(),
+                                           egressPoint.deviceId());
 
         List<Intent> reusableIntents = null;
         if (installable != null) {