Initial implementation of async installers
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 0ca75c2..56214c6 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
@@ -5,7 +5,7 @@
import java.util.Iterator;
import java.util.List;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -15,6 +15,7 @@
import org.onlab.onos.ApplicationId;
import org.onlab.onos.net.ConnectPoint;
import org.onlab.onos.net.Link;
+import org.onlab.onos.net.flow.CompletedBatchOperation;
import org.onlab.onos.net.flow.DefaultFlowRule;
import org.onlab.onos.net.flow.DefaultTrafficSelector;
import org.onlab.onos.net.flow.FlowRule;
@@ -57,8 +58,26 @@
intentManager.unregisterInstaller(PathIntent.class);
}
+ /**
+ * Apply a list of FlowRules.
+ *
+ * @param rules rules to apply
+ */
+ private Future<CompletedBatchOperation> applyBatch(List<FlowRuleBatchEntry> rules) {
+ FlowRuleBatchOperation batch = new FlowRuleBatchOperation(rules);
+ Future<CompletedBatchOperation> future = flowRuleService.applyBatch(batch);
+ return future;
+// try {
+// //FIXME don't do this here
+// future.get();
+// } catch (InterruptedException | ExecutionException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+ }
+
@Override
- public void install(PathIntent intent) {
+ public Future<CompletedBatchOperation> install(PathIntent intent) {
TrafficSelector.Builder builder =
DefaultTrafficSelector.builder(intent.selector());
Iterator<Link> links = intent.path().links().iterator();
@@ -74,20 +93,14 @@
builder.build(), treatment,
123, appId, 600);
rules.add(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule));
- //flowRuleService.applyFlowRules(rule);
prev = link.dst();
}
- FlowRuleBatchOperation batch = new FlowRuleBatchOperation(rules);
- try {
- flowRuleService.applyBatch(batch).get();
- } catch (InterruptedException | ExecutionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+
+ return applyBatch(rules);
}
@Override
- public void uninstall(PathIntent intent) {
+ public Future<CompletedBatchOperation> uninstall(PathIntent intent) {
TrafficSelector.Builder builder =
DefaultTrafficSelector.builder(intent.selector());
Iterator<Link> links = intent.path().links().iterator();
@@ -103,15 +116,131 @@
builder.build(), treatment,
123, appId, 600);
rules.add(new FlowRuleBatchEntry(FlowRuleOperation.REMOVE, rule));
- //flowRuleService.removeFlowRules(rule);
prev = link.dst();
}
- FlowRuleBatchOperation batch = new FlowRuleBatchOperation(rules);
- try {
- flowRuleService.applyBatch(batch).get();
- } catch (InterruptedException | ExecutionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ return applyBatch(rules);
+ }
+
+ // TODO refactor below this line... ----------------------------
+
+ /**
+ * Generates the series of MatchActionOperations from the
+ * {@link FlowBatchOperation}.
+ * <p>
+ * FIXME: Currently supporting PacketPathFlow and SingleDstTreeFlow only.
+ * <p>
+ * FIXME: MatchActionOperations should have dependency field to the other
+ * match action operations, and this method should use this.
+ *
+ * @param op the {@link FlowBatchOperation} object
+ * @return the list of {@link MatchActionOperations} objects
+ */
+ /*
+ private List<MatchActionOperations>
+ generateMatchActionOperationsList(FlowBatchOperation op) {
+
+ // MatchAction operations at head (ingress) switches.
+ MatchActionOperations headOps = matchActionService.createOperationsList();
+
+ // MatchAction operations at rest of the switches.
+ MatchActionOperations tailOps = matchActionService.createOperationsList();
+
+ MatchActionOperations removeOps = matchActionService.createOperationsList();
+
+ for (BatchOperationEntry<Operator, ?> e : op.getOperations()) {
+
+ if (e.getOperator() == FlowBatchOperation.Operator.ADD) {
+ generateInstallMatchActionOperations(e, tailOps, headOps);
+ } else if (e.getOperator() == FlowBatchOperation.Operator.REMOVE) {
+ generateRemoveMatchActionOperations(e, removeOps);
+ } else {
+ throw new UnsupportedOperationException(
+ "FlowManager supports ADD and REMOVE operations only.");
+ }
+
+ }
+
+ return Arrays.asList(tailOps, headOps, removeOps);
+ }
+ */
+
+ /**
+ * Generates MatchActionOperations for an INSTALL FlowBatchOperation.
+ * <p/>
+ * FIXME: Currently only supports flows that generate exactly two match
+ * action operation sets.
+ *
+ * @param e Flow BatchOperationEntry
+ * @param tailOps MatchActionOperation set that the tail
+ * MatchActionOperations will be placed in
+ * @param headOps MatchActionOperation set that the head
+ * MatchActionOperations will be placed in
+ */
+ /*
+ private void generateInstallMatchActionOperations(
+ BatchOperationEntry<Operator, ?> e,
+ MatchActionOperations tailOps,
+ MatchActionOperations headOps) {
+
+ if (!(e.getTarget() instanceof Flow)) {
+ throw new IllegalStateException(
+ "The target is not Flow object: " + e.getTarget());
+ }
+
+ // Compile flows to match-actions
+ Flow flow = (Flow) e.getTarget();
+ List<MatchActionOperations> maOps = flow.compile(
+ e.getOperator(), matchActionService);
+ verifyNotNull(maOps, "Could not compile the flow: " + flow);
+ verify(maOps.size() == 2,
+ "The flow generates unspported match-action operations.");
+
+ // Map FlowId to MatchActionIds
+ for (MatchActionOperations maOp : maOps) {
+ for (MatchActionOperationEntry entry : maOp.getOperations()) {
+ flowMatchActionsMap.put(
+ KryoFactory.serialize(flow.getId()),
+ KryoFactory.serialize(entry.getTarget()));
+ }
+ }
+
+ // Merge match-action operations
+ for (MatchActionOperationEntry mae : maOps.get(0).getOperations()) {
+ verify(mae.getOperator() == MatchActionOperations.Operator.INSTALL);
+ tailOps.addOperation(mae);
+ }
+ for (MatchActionOperationEntry mae : maOps.get(1).getOperations()) {
+ verify(mae.getOperator() == MatchActionOperations.Operator.INSTALL);
+ headOps.addOperation(mae);
}
}
+ */
+ /**
+ * Generates MatchActionOperations for a REMOVE FlowBatchOperation.
+ *
+ * @param e Flow BatchOperationEntry
+ * @param removeOps MatchActionOperation set that the remove
+ * MatchActionOperations will be placed in
+ */
+ /*
+ private void generateRemoveMatchActionOperations(
+ BatchOperationEntry<Operator, ?> e,
+ MatchActionOperations removeOps) {
+
+ if (!(e.getTarget() instanceof FlowId)) {
+ throw new IllegalStateException(
+ "The target is not a FlowId object: " + e.getTarget());
+ }
+
+ // Compile flows to match-actions
+ FlowId flowId = (FlowId) e.getTarget();
+
+ for (byte[] matchActionIdBytes :
+ flowMatchActionsMap.remove(KryoFactory.serialize(flowId))) {
+ MatchActionId matchActionId = KryoFactory.deserialize(matchActionIdBytes);
+ removeOps.addOperation(new MatchActionOperationEntry(
+ MatchActionOperations.Operator.REMOVE, matchActionId));
+ }
+ }
+ */
}