commit e148de80876de1eeef79ee4cf49e2a8dee3f9c3e
author Charles M.C. Chan <rascov@gmail.com> Wed May 06 12:38:21 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Wed May 06 17:55:40 2015 +0000
tree 22234b597d97f469db87cb9b9c6595da17a5e3f5
parent c14b2a2ceaa9a5cab37b7e3399f773226c316a9f

Request packet in when config being modified during runtime.

We can now enable features such as IPv6 via cfg command dynamically.
NOTE: We should remove unnecessary packet requests when app being deactivated
or modified once PacketService support the request revocation.

Change-Id: I7f239ce9db74456097675d03de99468db70a919f

providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java

diff --git a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
index 11888fd..b776280 100644
--- a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
+++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
@@ -128,17 +128,43 @@
     public void activate(ComponentContext context) {
         cfgService.registerProperties(getClass());
         appId = coreService.registerApplication("org.onosproject.provider.host");
-        readComponentConfiguration(context);
 
         providerService = providerRegistry.register(this);
         packetService.addProcessor(processor, 1);
         deviceService.addListener(deviceListener);
+        readComponentConfiguration(context);
+        requestPackests();
 
+        log.info("Started with Application ID {}", appId.id());
+    }
+
+    @Deactivate
+    public void deactivate() {
+        // TODO revoke all packet requests when deactivate
+        cfgService.unregisterProperties(getClass(), false);
+        providerRegistry.unregister(this);
+        packetService.removeProcessor(processor);
+        deviceService.removeListener(deviceListener);
+        providerService = null;
+        log.info("Stopped");
+    }
+
+    @Modified
+    public void modified(ComponentContext context) {
+        // TODO revoke unnecessary packet requests when config being modified
+        readComponentConfiguration(context);
+        requestPackests();
+    }
+
+    /**
+     * Request packet in via PacketService.
+     */
+    private void requestPackests() {
         TrafficSelector.Builder selectorBuilder =
                 DefaultTrafficSelector.builder();
         selectorBuilder.matchEthType(Ethernet.TYPE_ARP);
         packetService.requestPackets(selectorBuilder.build(),
-                                  PacketPriority.CONTROL, appId);
+                                     PacketPriority.CONTROL, appId);
 
         if (ipv6NeighborDiscovery) {
             // IPv6 Neighbor Solicitation packet.
@@ -157,23 +183,6 @@
             packetService.requestPackets(selectorBuilder.build(),
                                          PacketPriority.CONTROL, appId);
         }
-
-        log.info("Started with Application ID {}", appId.id());
-    }
-
-    @Deactivate
-    public void deactivate() {
-        cfgService.unregisterProperties(getClass(), false);
-        providerRegistry.unregister(this);
-        packetService.removeProcessor(processor);
-        deviceService.removeListener(deviceListener);
-        providerService = null;
-        log.info("Stopped");
-    }
-
-    @Modified
-    public void modified(ComponentContext context) {
-        readComponentConfiguration(context);
     }
 
     /**