commit 392619e5aa28f248e9ff7962643ba048c6d03d82
author Brian O'Connor <bocon@onlab.us> Thu Nov 20 12:06:33 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Nov 20 14:49:30 2014 -0800
tree ca08e2ddcf20d2431330b04303e8a4d2ff957e13
parent 1d3494ec8f10d1ca6d2c4051f307d475613dfc19

adding group id for intent flows

Change-Id: I256e15fe53834b2604fe3466fc0bf415abb46872

core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java

diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java
index 0524d76..fb8e2d4 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java
@@ -141,7 +141,8 @@
                                    .build();
 
         FlowRule rule = new DefaultFlowRule(deviceId,
-                selector, treatment, 123, appId, 0, true);
+                selector, treatment, 123,
+                appId, (short) (intent.id().fingerprint() &  0xffff), 0, true);
 
         return new FlowRuleBatchEntry(operation, rule);
     }

core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java

diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java
index 8208c9c..a29cd0f 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java
@@ -99,8 +99,8 @@
                     .setOutput(link.src().port()).build();
 
             FlowRule rule = new DefaultFlowRule(link.src().deviceId(),
-                    builder.build(), treatment,
-                    123, appId, 0, true);
+                    builder.build(), treatment, 123, //FIXME 123
+                    appId, (short) (intent.id().fingerprint() & 0xffff), 0, true);
             rules.add(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule));
             prev = link.dst();
         }
@@ -126,7 +126,7 @@
                     .setOutput(link.src().port()).build();
             FlowRule rule = new DefaultFlowRule(link.src().deviceId(),
                     builder.build(), treatment,
-                    123, appId, 0, true);
+                    123, appId, (short) (intent.id().fingerprint() & 0xffff), 0, true);
             rules.add(new FlowRuleBatchEntry(FlowRuleOperation.REMOVE, rule));
             prev = link.dst();
         }