Extract a method to create a list of FlowRuleBatchOperation
- Define FlowRuleBatchOperationConvertionException, which is a
new IntentException sub-class
Change-Id: I798303fa986f573c885b8712ac1dfee1bcaadf95
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 77ddcd9..511086f 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -502,30 +502,31 @@
@Override
public Optional<IntentUpdate> execute() {
- Exception exception = null;
-
- List<FlowRuleBatchOperation> batches = Lists.newArrayList();
- for (Intent installable : installables) {
- registerSubclassInstallerIfNeeded(installable);
- trackerService.addTrackedResources(intent.id(), installable.resources());
- try {
- batches.addAll(getInstaller(installable).install(installable));
- } catch (Exception e) { // TODO this should be IntentException
- log.warn("Unable to install intent {} due to:", intent.id(), e);
- trackerService.removeTrackedResources(intent.id(), installable.resources());
- //TODO we failed; intent should be recompiled
- exception = e;
- }
+ try {
+ List<FlowRuleBatchOperation> converted = convert(installables);
+ // TODO: call FlowRuleService API to push FlowRules and track resources,
+ // which the submitted intent will use.
+ return Optional.of(new Installed(intent, installables, converted));
+ } catch (FlowRuleBatchOperationConvertionException e) {
+ log.warn("Unable to install intent {} due to:", intent.id(), e.getCause());
+ return Optional.of(new InstallingFailed(intent, installables, e.converted()));
}
-
- if (exception != null) {
- return Optional.of(new InstallingFailed(intent, installables, batches));
- }
-
- return Optional.of(new Installed(intent, installables, batches));
}
}
+ private List<FlowRuleBatchOperation> convert(List<Intent> installables) {
+ List<FlowRuleBatchOperation> batches = new ArrayList<>(installables.size());
+ for (Intent installable : installables) {
+ try {
+ registerSubclassInstallerIfNeeded(installable);
+ batches.addAll(getInstaller(installable).install(installable));
+ } catch (Exception e) { // TODO this should be IntentException
+ throw new FlowRuleBatchOperationConvertionException(batches, e);
+ }
+ }
+ return batches;
+ }
+
private class Withdrawing implements IntentUpdate {
private final Intent intent;