commit fe4fe5629fc5cbf4d2a3fc073e541f6baf879245
author Ray Milkey <ray@onlab.us> Tue Jan 05 13:14:43 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Jan 07 00:15:03 2016 +0000
tree 22b1376ecf1a278409403670e8337407acf894b7
parent b34b496c1c49583b4f1d0aaf64a64ff9528d568f

Attempt to fix ONOS-3460

Restart UDP listener thread and create a new RADIUS server socket
when the AAA app configuration changes.

Change-Id: If81479ee54609f56cf86e21aa5c5d83732c6a9fe

src/main/java/org/onosproject/aaa/AaaManager.java

diff --git a/src/main/java/org/onosproject/aaa/AaaManager.java b/src/main/java/org/onosproject/aaa/AaaManager.java
index 4567f01..afacff2 100755
--- a/src/main/java/org/onosproject/aaa/AaaManager.java
+++ b/src/main/java/org/onosproject/aaa/AaaManager.java
@@ -166,6 +166,19 @@
         return eth;
     }
 
+    private void initializeLocalState() {
+        try {
+            radiusSocket = new DatagramSocket(radiusServerPort);
+        } catch (Exception ex) {
+            log.error("Can't open RADIUS socket", ex);
+        }
+
+        executor = Executors.newSingleThreadExecutor(
+                new ThreadFactoryBuilder()
+                        .setNameFormat("AAA-radius-%d").build());
+        executor.execute(radiusListener);
+    }
+
     @Activate
     public void activate() {
         netCfgService.addListener(cfgListener);
@@ -182,16 +195,7 @@
 
         StateMachine.initializeMaps();
 
-        try {
-            radiusSocket = new DatagramSocket(radiusServerPort);
-        } catch (Exception ex) {
-            log.error("Can't open RADIUS socket", ex);
-        }
-
-        executor = Executors.newSingleThreadExecutor(
-                new ThreadFactoryBuilder()
-                        .setNameFormat("AAA-radius-%d").build());
-        executor.execute(radiusListener);
+        initializeLocalState();
         log.info("Started");
     }
 
@@ -568,6 +572,9 @@
 
                 AaaConfig cfg = netCfgService.getConfig(appId, AaaConfig.class);
                 reconfigureNetwork(cfg);
+                radiusSocket.close();
+                executor.shutdownNow();
+                initializeLocalState();
                 log.info("Reconfigured");
             }
         }