commit 65a0ab3142d455c9d1b069ed03c5ee55a4f15b63
author Pier Luigi <pierventre@hotmail.com> Thu Jan 12 20:52:38 2017 -0800
committer Jonathan Hart <jono@onlab.us> Mon Jan 16 17:10:12 2017 +0000
tree 8ee1b446a05576d6542f1f089ca25b20a394a3f2
parent 6fd1ca95aa7a383acde3491a265fc23bb557b65c

Augments NRM

Changes:
- Adds useArp flag to disable the ARP handling;
- Adds requestInterceptsEnable to enable/disable the packet requests;

Change-Id: Icbd1e3b72fff5081916c66471cf527c6b7be9fab

incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java

diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java
index 4b786f7..09676b1 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java
@@ -96,10 +96,18 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ComponentConfigService componentConfigService;
 
+    @Property(name = "arpEnabled", boolValue = true,
+            label = "Enable Address resolution protocol")
+    protected boolean arpEnabled = true;
+
     @Property(name = "ndpEnabled", boolValue = false,
             label = "Enable IPv6 neighbour discovery")
     protected boolean ndpEnabled = false;
 
+    @Property(name = "requestInterceptsEnabled", boolValue = true,
+            label = "Enable requesting packet intercepts")
+    private boolean requestInterceptsEnabled = true;
+
     private static final String APP_NAME = "org.onosproject.neighbour";
     private ApplicationId appId;
 
@@ -140,15 +148,38 @@
                     ndpEnabled ? "enabled" : "disabled");
         }
 
+        flag = Tools.isPropertyEnabled(properties, "arpEnabled");
+        if (flag != null) {
+            arpEnabled = flag;
+            log.info("Address resolution protocol is {}",
+                     arpEnabled ? "enabled" : "disabled");
+        }
+
+        flag = Tools.isPropertyEnabled(properties, "requestInterceptsEnabled");
+        if (flag == null) {
+            log.info("Request intercepts is not configured, " +
+                             "using current value of {}", requestInterceptsEnabled);
+        } else {
+            requestInterceptsEnabled = flag;
+            log.info("Configured. Request intercepts is {}",
+                     requestInterceptsEnabled ? "enabled" : "disabled");
+        }
+
         synchronized (packetHandlers) {
-            if (!packetHandlers.isEmpty()) {
+            if (!packetHandlers.isEmpty() && requestInterceptsEnabled) {
                 requestPackets();
+            } else {
+                cancelPackets();
             }
         }
     }
 
     private void requestPackets() {
-        packetService.requestPackets(buildArpSelector(), CONTROL, appId);
+        if (arpEnabled) {
+            packetService.requestPackets(buildArpSelector(), CONTROL, appId);
+        } else {
+            packetService.cancelPackets(buildArpSelector(), CONTROL, appId);
+        }
 
         if (ndpEnabled) {
             packetService.requestPackets(buildNeighborSolicitationSelector(),