Fixes bug where driver gets initialized only when device is available.
More explict handling of versatile forwarding flows in corsa driver.
Moving TunnelConnectivityManager to use flowObjectives instead of flowRules.
Change-Id: If43023f30a6e7a028dfdefbe1ffbcc710a1c7be3
diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
index e196fe5..1c1a74a 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
@@ -161,7 +161,7 @@
connectivityManager = new TunnellingConnectivityManager(appId,
configService,
packetService,
- flowService);
+ flowObjectiveService);
icmpHandler = new IcmpHandler(configService, packetService);
@@ -252,7 +252,7 @@
flowObjectiveService.forward(deviceId,
generateRibFlowRule(fibEntry.prefix(), nextId).add());
- log.trace("Sending flow forwarding objective {}->{}", fibEntry, nextId);
+ log.trace("Sending forwarding objective {} -> nextId:{}", fibEntry, nextId);
}
}
@@ -282,8 +282,6 @@
.matchIPDst(prefix)
.build();
-
-
int priority = prefix.prefixLength() * PRIORITY_MULTIPLIER + PRIORITY_OFFSET;
ForwardingObjective.Builder fwdBuilder = DefaultForwardingObjective.builder()