홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
392619e5 1 parent 1d3494ec

adding group id for intent flows 

Change-Id: I256e15fe53834b2604fe3466fc0bf415abb46872
Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
...@@ -141,7 +141,8 @@ public class LinkCollectionIntentInstaller implements IntentInstaller<LinkCollec ...@@ -141,7 +141,8 @@ public class LinkCollectionIntentInstaller implements IntentInstaller<LinkCollec
141 .build(); 141 .build();
142 142
143 FlowRule rule = new DefaultFlowRule(deviceId, 143 FlowRule rule = new DefaultFlowRule(deviceId,
144 - selector, treatment, 123, appId, 0, true); 144 + selector, treatment, 123,
145 + appId, (short) (intent.id().fingerprint() & 0xffff), 0, true);
145 146
146 return new FlowRuleBatchEntry(operation, rule); 147 return new FlowRuleBatchEntry(operation, rule);
147 } 148 }
......
...@@ -99,8 +99,8 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> { ...@@ -99,8 +99,8 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> {
99 .setOutput(link.src().port()).build(); 99 .setOutput(link.src().port()).build();
100 100
101 FlowRule rule = new DefaultFlowRule(link.src().deviceId(), 101 FlowRule rule = new DefaultFlowRule(link.src().deviceId(),
102 - builder.build(), treatment, 102 + builder.build(), treatment, 123, //FIXME 123
103 - 123, appId, 0, true); 103 + appId, (short) (intent.id().fingerprint() & 0xffff), 0, true);
104 rules.add(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule)); 104 rules.add(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule));
105 prev = link.dst(); 105 prev = link.dst();
106 } 106 }
...@@ -126,7 +126,7 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> { ...@@ -126,7 +126,7 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> {
126 .setOutput(link.src().port()).build(); 126 .setOutput(link.src().port()).build();
127 FlowRule rule = new DefaultFlowRule(link.src().deviceId(), 127 FlowRule rule = new DefaultFlowRule(link.src().deviceId(),
128 builder.build(), treatment, 128 builder.build(), treatment,
129 - 123, appId, 0, true); 129 + 123, appId, (short) (intent.id().fingerprint() & 0xffff), 0, true);
130 rules.add(new FlowRuleBatchEntry(FlowRuleOperation.REMOVE, rule)); 130 rules.add(new FlowRuleBatchEntry(FlowRuleOperation.REMOVE, rule));
131 prev = link.dst(); 131 prev = link.dst();
132 } 132 }
......