IntentStore interface changes
Change-Id: Ifa8728fb4c7edcc6d58a5e071f7252493ab2a578
diff --git a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
index 6d6caca..3c134fb 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
@@ -31,7 +31,6 @@
import org.onosproject.net.intent.Intent;
import org.onosproject.net.intent.IntentEvent;
import org.onosproject.net.intent.IntentListener;
-import org.onosproject.net.intent.IntentOperations;
import org.onosproject.net.intent.IntentService;
import org.onosproject.net.intent.IntentState;
import org.onosproject.net.intent.OpticalConnectivityIntent;
@@ -202,22 +201,20 @@
log.info("Unsupported intent type: {}", intent.getClass());
}
- // Build the intent batch
- IntentOperations.Builder ops = IntentOperations.builder(appId);
+ // Create the intents
for (Intent i : intents) {
// TODO: don't allow duplicate intents between the same points for now
// we may want to allow this carefully in future to increase capacity
if (i instanceof OpticalConnectivityIntent) {
OpticalConnectivityIntent oi = (OpticalConnectivityIntent) i;
if (addIntent(oi.getSrc(), oi.getDst(), oi)) {
- ops.addSubmitOperation(i);
+ intentService.submit(i);
reserveTport(i);
}
} else {
log.warn("Invalid intent type: {} for {}", i.getClass(), i);
}
}
- intentService.execute(ops.build());
}
private List<Intent> getOpticalPath(ConnectPoint ingress, ConnectPoint egress) {