Bug fix: generate different next objectives for port with multiple vlans
Cleaning up some logs.
Change-Id: I0db119fdbc36ccbd25a382d54d3f9f731f8be1ec
diff --git a/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index 6b5aba7..8d757aa 100644
--- a/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -118,7 +118,7 @@
*/
public void populateRoute(DeviceId deviceId, IpPrefix prefix,
MacAddress hostMac, VlanId hostVlanId, PortNumber outPort) {
- log.debug("Populate IP table entry for route {} at {}:{}",
+ log.debug("Populate routing entry for route {} at {}:{}",
prefix, deviceId, outPort);
ForwardingObjective.Builder fwdBuilder;
try {
@@ -128,14 +128,15 @@
return;
}
if (fwdBuilder == null) {
- log.warn("Aborting host routing table entries due "
+ log.warn("Aborting host routing table entry due "
+ "to error for dev:{} route:{}", deviceId, prefix);
return;
}
ObjectiveContext context = new DefaultObjectiveContext(
- (objective) -> log.debug("IP rule for route {} populated", prefix),
+ (objective) -> log.debug("Routing rule for route {} populated", prefix),
(objective, error) ->
- log.warn("Failed to populate IP rule for route {}: {}", prefix, error));
+ log.warn("Failed to populate routing rule for route {}: {}",
+ prefix, error));
srManager.flowObjectiveService.forward(deviceId, fwdBuilder.add(context));
rulePopulationCounter.incrementAndGet();
}