Updated SDN-IP to use the Intent framework batch-based intents.
Also, created a local cache of IPv4-to-MAC address mapping,
to avoid relatively costly hostService.getHostsByIp() calls
per added route.
Change-Id: I8abed378985708e883fd99e85c54b01f38756515
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 0c39582..46824ca 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(null); //FIXME null
+ IntentOperations.Builder builder = IntentOperations.builder(APPID);
for (Intent intent : intentList) {
builder.addSubmitOperation(intent);
}
@@ -601,9 +601,8 @@
replay(configInfoService);
reset(intentService);
- IntentOperations.Builder builder = IntentOperations.builder(null); //FIXME null
- intentService.execute(TestIntentServiceHelper.eqExceptId(
- builder.build()));
+ IntentOperations.Builder builder = IntentOperations.builder(APPID);
+ intentService.execute(builder.build());
replay(intentService);
peerConnectivityManager.start();
verify(intentService);
@@ -627,9 +626,8 @@
replay(configInfoService);
reset(intentService);
- IntentOperations.Builder builder = IntentOperations.builder(null); //FIXME null
- intentService.execute(TestIntentServiceHelper.eqExceptId(
- builder.build()));
+ IntentOperations.Builder builder = IntentOperations.builder(APPID);
+ intentService.execute(builder.build());
replay(intentService);
peerConnectivityManager.start();
verify(intentService);