commit 9fdeee7c5427684aad75be772253c9e0c12acdab
author Ilayda Ozdemir <ilayda.ozdemir@netsia.com> Fri Feb 26 12:24:27 2021 +0000
committer Ilayda Ozdemir <ilayda.ozdemir@netsia.com> Fri Mar 05 22:03:30 2021 +0300
tree ec39d8e2eebe14da19db774563930b084d012262
parent 888db7673cecc6d33e00e59b43d44c2a53a9cb09

SEBA-1010-Minor version upgrade

Change-Id: Ia4a30b505c8d7718c8dcc41ecbe5b408fd617f18

app/src/main/java/org/opencord/aaa/impl/PortBasedRadiusCommunicator.java

diff --git a/app/src/main/java/org/opencord/aaa/impl/PortBasedRadiusCommunicator.java b/app/src/main/java/org/opencord/aaa/impl/PortBasedRadiusCommunicator.java
index 8973a5f..831a8db 100755
--- a/app/src/main/java/org/opencord/aaa/impl/PortBasedRadiusCommunicator.java
+++ b/app/src/main/java/org/opencord/aaa/impl/PortBasedRadiusCommunicator.java
@@ -62,6 +62,7 @@
  * of the SDN switches.
  */
 public class PortBasedRadiusCommunicator implements RadiusCommunicator {
+    private static final String SADIS_NOT_RUNNING = "Sadis is not running.";
 
     // for verbose output
     private final Logger log = getLogger(getClass());
@@ -76,7 +77,7 @@
 
     MastershipService mastershipService;
 
-    BaseInformationService<SubscriberAndDeviceInformation> subsService;
+    protected BaseInformationService<SubscriberAndDeviceInformation> subsService;
 
     // to store local mapping of IP Address and Serial No of Device
     private Map<Ip4Address, String> ipToSnMap;
@@ -134,7 +135,7 @@
             radiusServerConnectPoint = null;
             if (radiusConnectPoints != null) {
                 // find a connect point through a device for which we are master
-                for (ConnectPoint cp: radiusConnectPoints) {
+                for (ConnectPoint cp : radiusConnectPoints) {
                     if (mastershipService.isLocalMaster(cp.deviceId())) {
                         if (deviceService.isAvailable(cp.deviceId())) {
                             radiusServerConnectPoint = cp;
@@ -152,6 +153,10 @@
         }
     }
 
+    public void updateSubsService(BaseInformationService<SubscriberAndDeviceInformation> subsService) {
+        this.subsService = subsService;
+    }
+
     @Override
     public void initializeLocalState(AaaConfig newCfg) {
         if (newCfg.nasIp() != null) {
@@ -252,6 +257,12 @@
         String serialNo = deviceService.getDevice(inPkt.
                 receivedFrom().deviceId()).serialNumber();
 
+        if (subsService == null) {
+            log.warn(SADIS_NOT_RUNNING);
+            aaaManager.radiusOperationalStatusService.setStatusServerReqSent(false);
+            return;
+        }
+
         SubscriberAndDeviceInformation deviceInfo = subsService.get(serialNo);
 
         if (deviceInfo == null) {
@@ -345,6 +356,12 @@
                     targetAddress);
             return;
         }
+
+        if (subsService == null) {
+            log.warn(SADIS_NOT_RUNNING);
+            return;
+        }
+
         MacAddress senderMac = subsService.get(serialNo).hardwareIdentifier();
         if (senderMac == null) {
             log.warn("ARP resolution, MAC address not found for SN {}", serialNo);