From 6816f25a943496d0dff17d667d76c4682ff2466c Mon Sep 17 00:00:00 2001 From: Flavio Castro Date: Thu, 14 Jan 2016 14:53:33 -0800 Subject: [PATCH] Added debug info to ArpHandler and priorities to RoutingPopulator Change-Id: I079c5d50b12602ef620dbc6c5812d4508fa0b58d --- .../java/org/onosproject/segmentrouting/ArpHandler.java | 8 +++----- .../onosproject/segmentrouting/RoutingRulePopulator.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java index 7f4bcb15da..6d9171b3d8 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java @@ -227,13 +227,11 @@ public class ArpHandler { .setSourceMACAddress(targetMac.toBytes()) .setEtherType(Ethernet.TYPE_ARP).setPayload(arpReply); - - HostId dstId = HostId.hostId( - MacAddress.valueOf(arpReply.getTargetHardwareAddress()), - vlanId); + MacAddress hostMac = MacAddress.valueOf(arpReply.getTargetHardwareAddress()); + HostId dstId = HostId.hostId(hostMac, vlanId); Host dst = srManager.hostService.getHost(dstId); if (dst == null) { - log.warn("Cannot send ARP response to unknown device"); + log.warn("Cannot send ARP response to host {}", dstId); return; } diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java index 8543c86e36..03b29a5e5b 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java @@ -260,7 +260,7 @@ public class RoutingRulePopulator { .makePermanent() .nextStep(nextId) .withSelector(selector) - .withPriority(100) + .withPriority(2000 * ipPrefix.prefixLength()) .withFlag(ForwardingObjective.Flag.SPECIFIC); if (treatment != null) { fwdBuilder.withTreatment(treatment);