홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
812e8684 1 parent 5c5861c7

fixing ONOS-1034 

Change-Id: I0c3dac633dd7f3c1f618499debe97e3bf282895d
Inline Side-by-side
Showing 1 changed file with 6 additions and 4 deletions
...@@ -135,10 +135,12 @@ public class LinkCollectionIntentInstaller ...@@ -135,10 +135,12 @@ public class LinkCollectionIntentInstaller
135 } 135 }
136 136
137 @Override 137 @Override
138 - public List<FlowRuleBatchOperation> replace(LinkCollectionIntent intent, 138 + public List<FlowRuleBatchOperation> replace(LinkCollectionIntent oldIntent,
139 LinkCollectionIntent newIntent) { 139 LinkCollectionIntent newIntent) {
140 - // FIXME: implement 140 + List<FlowRuleBatchOperation> batches = Lists.newArrayList();
141 - return null; 141 + batches.addAll(uninstall(oldIntent));
142 + batches.addAll(install(newIntent));
143 + return batches;
142 } 144 }
143 145
144 /** 146 /**
...@@ -147,7 +149,7 @@ public class LinkCollectionIntentInstaller ...@@ -147,7 +149,7 @@ public class LinkCollectionIntentInstaller
147 * @param operation the FlowRuleOperation to use 149 * @param operation the FlowRuleOperation to use
148 * @param intent the link collection intent 150 * @param intent the link collection intent
149 * @param deviceId the device ID for the flow rule 151 * @param deviceId the device ID for the flow rule
150 - * @param outPort the output port of the flow rule 152 + * @param outPorts the output port of the flow rule
151 * @return the new flow rule batch entry 153 * @return the new flow rule batch entry
152 */ 154 */
153 private FlowRuleBatchEntry createBatchEntry(FlowRuleOperation operation, 155 private FlowRuleBatchEntry createBatchEntry(FlowRuleOperation operation,
......