commit 9597f8d51634a5015da58023d0c7fbc56d5246a6
author Charles Chan <rascov@gmail.com> Mon Jul 24 15:56:10 2017 -0700
committer Charles Chan <charles@opennetworking.org> Tue Jul 25 19:04:03 2017 +0000
tree df07c0a7ec64b4f035e239aca03683261ee805e4
parent 4c95c0d44245d27b841979cf1bc1f0a785644095

DHCP relay bug fixes

- DHCP relay doesn't set destination MAC properly when forwarding the reply
- SR doesn't properly turn off the arp handler in dhcp relay

Change-Id: I7f7660bfe70fee14abcfdd3abb750e4a88b6ec42

src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java

diff --git a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 5e50b83..ad3b6fc 100644
--- a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -358,7 +358,7 @@
                                       "requestInterceptsEnabled", "false");
         compCfgService.preSetProperty("org.onosproject.incubator.net.neighbour.impl.NeighbourResolutionManager",
                                       "requestInterceptsEnabled", "false");
-        compCfgService.preSetProperty("org.onosproject.dhcprelay.DhcpRelay",
+        compCfgService.preSetProperty("org.onosproject.dhcprelay.DhcpRelayManager",
                                       "arpEnabled", "false");
         compCfgService.preSetProperty("org.onosproject.net.host.impl.HostManager",
                                       "greedyLearningIpv6", "true");