commit f935b122059779fa43b393da5f48ce504ff12d4c
author Jonathan Hart <jono@opennetworking.org> Wed Jul 11 16:16:02 2018 -0700
committer Jonathan Hart <jono@opennetworking.org> Tue Jul 24 17:25:46 2018 -0700
tree 9bc84e9d0a7d91ff2748bd55239cd36c1464f45c
parent 932bedcb991516cee8fe969f6e1061272260d42c

SEBA-74: Allow connecting to RADIUS server via hostname instead of IP

Change-Id: I16dd38d0fc0da36bf4e9e9292abf51ca0bfc4d8a

src/main/java/org/opencord/aaa/AaaConfig.java

diff --git a/src/main/java/org/opencord/aaa/AaaConfig.java b/src/main/java/org/opencord/aaa/AaaConfig.java
index 8c7aa47..4124e80 100644
--- a/src/main/java/org/opencord/aaa/AaaConfig.java
+++ b/src/main/java/org/opencord/aaa/AaaConfig.java
@@ -37,6 +37,7 @@
  */
 public class AaaConfig extends Config<ApplicationId> {
 
+    private static final String RADIUS_HOST = "radiusHost";
     private static final String RADIUS_IP = "radiusIp";
     private static final String RADIUS_SERVER_PORT = "radiusServerPort";
     private static final String RADIUS_MAC = "radiusMac";
@@ -123,6 +124,10 @@
         return (BasicElementConfig) setOrClear(NAS_IP, ip);
     }
 
+    public String radiusHostName() {
+        return getStringProperty(RADIUS_HOST, null);
+    }
+
     /**
      * Returns the RADIUS server ip.
      *

src/main/java/org/opencord/aaa/SocketBasedRadiusCommunicator.java

diff --git a/src/main/java/org/opencord/aaa/SocketBasedRadiusCommunicator.java b/src/main/java/org/opencord/aaa/SocketBasedRadiusCommunicator.java
index 6b64a18..fd6e495 100755
--- a/src/main/java/org/opencord/aaa/SocketBasedRadiusCommunicator.java
+++ b/src/main/java/org/opencord/aaa/SocketBasedRadiusCommunicator.java
@@ -15,33 +15,31 @@
  */
 package org.opencord.aaa;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.onlab.packet.DeserializationException;
 import org.onlab.packet.EthType;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.RADIUS;
-
 import org.onosproject.core.ApplicationId;
 import org.onosproject.net.flow.DefaultTrafficSelector;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.packet.InboundPacket;
 import org.onosproject.net.packet.PacketContext;
 import org.onosproject.net.packet.PacketService;
-
 import org.slf4j.Logger;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import static org.onosproject.net.packet.PacketPriority.CONTROL;
-import static org.slf4j.LoggerFactory.getLogger;
-
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import static org.onosproject.net.packet.PacketPriority.CONTROL;
+import static org.slf4j.LoggerFactory.getLogger;
+
 /**
  * Handles Socket based communication with the RADIUS server.
  */
@@ -59,6 +57,8 @@
     // Socket used for UDP communications with RADIUS server
     private DatagramSocket radiusSocket;
 
+    private String radiusHost;
+
     // Parsed RADIUS server addresses
     protected InetAddress radiusIpAddress;
 
@@ -83,6 +83,7 @@
             radiusIpAddress = newCfg.radiusIp();
         }
         radiusServerPort = newCfg.radiusServerUdpPort();
+        radiusHost = newCfg.radiusHostName();
 
         try {
             radiusSocket = new DatagramSocket(null);
@@ -131,13 +132,22 @@
             final byte[] data = radiusPacket.serialize();
             final DatagramSocket socket = radiusSocket;
 
-            DatagramPacket packet =
-                    new DatagramPacket(data, data.length,
-                            radiusIpAddress, radiusServerPort);
+            try {
+                InetAddress address;
+                if (radiusHost != null) {
+                    address = InetAddress.getByName(radiusHost);
+                } else {
+                    address = radiusIpAddress;
+                }
+                DatagramPacket packet =
+                        new DatagramPacket(data, data.length, address, radiusServerPort);
 
-            socket.send(packet);
-            log.debug("Packet sent to Radius Server {}:{} using socket",
-                    radiusIpAddress, radiusServerPort);
+                socket.send(packet);
+                log.debug("Packet sent to Radius Server {}:{} using socket",
+                        address, radiusServerPort);
+            } catch (UnknownHostException uhe) {
+                log.warn("Unable to resolve host {}", radiusHost);
+            }
         } catch (IOException e) {
             log.info("Cannot send packet to RADIUS server", e);
         }