commit 0c3c076b52be8b2bae2a7750af033bc5fdfc858b
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Sat Apr 25 08:37:34 2015 +0900
committer Gerrit Code Review <gerrit@onlab.us> Tue Apr 28 19:55:52 2015 +0000
tree f2c8f95c661b592aabb9e0222f90104dc15e26c3
parent d1f17ac9531fde5e01400e0f933054465f810b55

Inherit resources from a high level intent when creating a FlowRuleIntent

Make constructor without resources argument deprecated

Change-Id: I400cedfb2ec5f8ec3217e4729d95b075ceb0b025

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

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/LinkCollectionIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/LinkCollectionIntentCompiler.java
index 72077f9..e4f144d 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/LinkCollectionIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/LinkCollectionIntentCompiler.java
@@ -104,7 +104,7 @@
         for (DeviceId deviceId: outputPorts.keys()) {
             rules.addAll(createRules(intent, deviceId, inputPorts.get(deviceId), outputPorts.get(deviceId)));
         }
-        return Arrays.asList(new FlowRuleIntent(appId, rules));
+        return Arrays.asList(new FlowRuleIntent(appId, rules, intent.resources()));
     }
 
     private List<FlowRule> createRules(LinkCollectionIntent intent, DeviceId deviceId,