diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index b493274..2b4c8ec 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -3444,19 +3444,18 @@ public class OvsdbDao { // radius_acct_interval security.put("radius_acct_interval", ssidConfig.getRadiusAcountingServiceInterval().toString()); - LOG.info( - "set Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}", - security.get("radius_acct_ip"), security.get("radius_acct_port"), - security.get("radius_acct_secret"), security.get("radius_acct_interval")); + } else { LOG.info( - "No radius_acct_interval defined for ssid {}, assume the RadiusServer {} to be providing Acct-Interim-Interval attribute in it's Access-Accept message", + "No radius_acct_interval defined for ssid {}, Setting radius_acct_interval to 0", ssidConfig.getSsid(), rServer); - LOG.info( - "set Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {}", - security.get("radius_acct_ip"), security.get("radius_acct_port"), - security.get("radius_acct_secret")); + security.put("radius_acct_interval", + "0"); } + LOG.info( + "set Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}", + security.get("radius_acct_ip"), security.get("radius_acct_port"), + security.get("radius_acct_secret"), security.get("radius_acct_interval")); } diff --git a/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java b/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java index a3af481..26ee67d 100644 --- a/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java +++ b/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java @@ -262,7 +262,7 @@ public class OvsdbDaoTest { location.setName("Ottawa"); apConfig.setEquipmentLocation(location); ovsdbDao.getRadiusAccountingConfiguration(apConfig, ssidConfig, security); - assert (security.containsKey("radius_acct_interval") == false); + assert (security.get("radius_acct_interval").equals("0")); assert (security.get("radius_acct_ip").equals("192.168.0.1")); assert (security.get("radius_acct_port").equals("1812")); assert (security.get("radius_acct_secret").equals("testing123"));