Initial implementation of distributed intent batch queue
Change-Id: I7ffed03651569ade1be1e8dca905bfaf369b7e03
diff --git a/apps/demo/src/main/java/org/onlab/onos/demo/DemoInstaller.java b/apps/demo/src/main/java/org/onlab/onos/demo/DemoInstaller.java
index de66ee5..5f1ea29 100644
--- a/apps/demo/src/main/java/org/onlab/onos/demo/DemoInstaller.java
+++ b/apps/demo/src/main/java/org/onlab/onos/demo/DemoInstaller.java
@@ -308,7 +308,7 @@
}
private void installIntents(List<HostPair> toInstall) {
- IntentOperations.Builder builder = IntentOperations.builder();
+ IntentOperations.Builder builder = IntentOperations.builder(appId);
for (HostPair pair : toInstall) {
installed.add(pair);
uninstalledOrWithdrawn.remove(pair);
@@ -318,7 +318,7 @@
}
private void uninstallIntents(Collection<HostPair> toRemove) {
- IntentOperations.Builder builder = IntentOperations.builder();
+ IntentOperations.Builder builder = IntentOperations.builder(appId);
for (HostPair pair : toRemove) {
installed.remove(pair);
uninstalledOrWithdrawn.add(pair);
@@ -333,7 +333,7 @@
private void cleanUp() {
List<HostPair> allPairs = Lists.newArrayList(installed);
allPairs.addAll(uninstalledOrWithdrawn);
- IntentOperations.Builder builder = IntentOperations.builder();
+ IntentOperations.Builder builder = IntentOperations.builder(appId);
for (HostPair pair : allPairs) {
builder.addWithdrawOperation(pair.h2hIntent().id());
}
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java
index 5aaa359..e11298b 100644
--- a/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java
+++ b/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java
@@ -129,7 +129,7 @@
}
// Build the intent batch
- IntentOperations.Builder ops = IntentOperations.builder();
+ IntentOperations.Builder ops = IntentOperations.builder(appId);
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
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java
index 4ded55f..ac69faa 100644
--- a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java
+++ b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java
@@ -221,7 +221,7 @@
// Push the intents
if (isElectedLeader && isActivatedLeader) {
log.debug("SDN-IP Submitting all Peer Intents...");
- IntentOperations.Builder builder = IntentOperations.builder();
+ IntentOperations.Builder builder = IntentOperations.builder(appId);
for (Intent intent : intents) {
builder.addSubmitOperation(intent);
}
@@ -370,7 +370,7 @@
}
// Withdraw Intents
- IntentOperations.Builder builder = IntentOperations.builder();
+ IntentOperations.Builder builder = IntentOperations.builder(appId);
for (Intent intent : deleteIntents) {
builder.addWithdrawOperation(intent.id());
log.debug("SDN-IP Intent Synchronizer: withdrawing intent: {}",
@@ -386,7 +386,7 @@
intentService.execute(intentOperations);
// Add Intents
- builder = IntentOperations.builder();
+ builder = IntentOperations.builder(appId);
for (Intent intent : addIntents) {
builder.addSubmitOperation(intent);
log.debug("SDN-IP Intent Synchronizer: submitting intent: {}",
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/IntentSyncTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/IntentSyncTest.java
index 2ab2f68..2cb74f5 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/IntentSyncTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/IntentSyncTest.java
@@ -325,13 +325,13 @@
.andReturn(IntentState.WITHDRAWING).anyTimes();
expect(intentService.getIntents()).andReturn(intents).anyTimes();
- IntentOperations.Builder builder = IntentOperations.builder();
+ IntentOperations.Builder builder = IntentOperations.builder(null); //FIXME null
builder.addWithdrawOperation(intent2.id());
builder.addWithdrawOperation(intent4.id());
intentService.execute(TestIntentServiceHelper.eqExceptId(
builder.build()));
- builder = IntentOperations.builder();
+ builder = IntentOperations.builder(null); //FIXME null
builder.addSubmitOperation(intent3);
builder.addSubmitOperation(intent4Update);
builder.addSubmitOperation(intent6);
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java
index bd50cce..0c39582 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java
@@ -566,7 +566,7 @@
reset(intentService);
// Setup the expected intents
- IntentOperations.Builder builder = IntentOperations.builder();
+ IntentOperations.Builder builder = IntentOperations.builder(null); //FIXME null
for (Intent intent : intentList) {
builder.addSubmitOperation(intent);
}
@@ -601,9 +601,9 @@
replay(configInfoService);
reset(intentService);
- IntentOperations.Builder builder = IntentOperations.builder();
+ IntentOperations.Builder builder = IntentOperations.builder(null); //FIXME null
intentService.execute(TestIntentServiceHelper.eqExceptId(
- builder.build()));
+ builder.build()));
replay(intentService);
peerConnectivityManager.start();
verify(intentService);
@@ -627,9 +627,9 @@
replay(configInfoService);
reset(intentService);
- IntentOperations.Builder builder = IntentOperations.builder();
+ IntentOperations.Builder builder = IntentOperations.builder(null); //FIXME null
intentService.execute(TestIntentServiceHelper.eqExceptId(
- builder.build()));
+ builder.build()));
replay(intentService);
peerConnectivityManager.start();
verify(intentService);