commit c1909e15f84fa8ffcc66d25503907be8eb5f1e2e
author Charles Chan <rascov@gmail.com> Tue Aug 08 15:13:37 2017 -0700
committer Charles Chan <rascov@gmail.com> Tue Aug 08 15:13:39 2017 -0700
tree 08bba0d32a7220dd006b4e1219cf259521040685
parent e6bda75e63902f96d5d297de99a7cab929186d09

Fix ARP/NDP issue in SR caused by the recent NRM move

NRM has been moved from incubator to core recently.
The config name needs to be updated as well.

Change-Id: I5288b15803bbb3a79d67a49de659bafa72377769

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 2f8c2ed..1f63502 100644
--- a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -360,7 +360,7 @@
                                       "purgeOnDisconnection", "true");
         compCfgService.preSetProperty("org.onosproject.provider.host.impl.HostLocationProvider",
                                       "requestInterceptsEnabled", "false");
-        compCfgService.preSetProperty("org.onosproject.incubator.net.neighbour.impl.NeighbourResolutionManager",
+        compCfgService.preSetProperty("org.onosproject.net.neighbour.impl.NeighbourResolutionManager",
                                       "requestInterceptsEnabled", "false");
         compCfgService.preSetProperty("org.onosproject.dhcprelay.DhcpRelayManager",
                                       "arpEnabled", "false");