commit 670ac5dd95ed3928aa9e23157bdf7f2241904ad9
author Luca Prete <luca@onlab.us> Fri Feb 03 15:55:43 2017 -0800
committer Ray Milkey <ray@onlab.us> Thu Feb 16 21:14:05 2017 +0000
tree 51be5eca21aa7cfd5fc32f5dbc7865c448e8b2c6
parent fb6009d21591a324b4b0a1ccc1262ad31be9c8c8

Resource group to share resources between intents

Change-Id: I5bf7d4261197449924d07dabac841cf8ccbe9389

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 c3fc348..94fe6ed 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
@@ -259,7 +259,8 @@
                                                          intent.key(),
                                                          createFailoverFlowRules(intent),
                                                          asList(ingressPoint.deviceId()),
-                                                         PathIntent.ProtectionType.FAILOVER);
+                                                         PathIntent.ProtectionType.FAILOVER,
+                                                         intent.resourceGroup());
             intentList.add(frIntent);
         } else {
             updateFailoverGroup(intent, links);
@@ -320,6 +321,7 @@
                 .constraints(intent.constraints())
                 .priority(intent.priority())
                 .setType(type)
+                .resourceGroup(intent.resourceGroup())
                 .build();
     }
 
@@ -353,6 +355,7 @@
                 .constraints(intent.constraints())
                 .priority(intent.priority())
                 .cost(cost)
+                .resourceGroup(intent.resourceGroup())
                 .build();
     }