WIFI-1669: propagations

WIFI-1669: TIP 1.0 Update SDK components release 1.0 branch

opensync-ext-cloud/pom.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-ext-cloud</artifactId>
@@ -21,121 +19,121 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
  	 
         <dependency>
             <artifactId>base-client</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
       <dependency>
         <artifactId>equipment-gateway-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>
      
       <dependency>
         <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>profile-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>portal-user-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>service-metric-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>status-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
  
        <dependency>
         <artifactId>firmware-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>manufacturer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
  
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>     
 
 	</dependencies>

opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/RealtimeEventPublisher.java

@@ -257,7 +257,7 @@ public class RealtimeEventPublisher {
                 LOG.error("Invalid Ip Address for client {}", clientConnectEvent.getIpAddr(), e1);
             }
         }
-        clientEvent.setEventTimestamp(clientConnectEvent.getTimestampMs());
+
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -307,7 +307,7 @@ public class RealtimeEventPublisher {
         if (clientDisconnectEvent.hasRssi()) {
             clientEvent.setRssi(clientDisconnectEvent.getRssi());
         }
-        clientEvent.setEventTimestamp(clientDisconnectEvent.getTimestampMs());
+
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -331,7 +331,6 @@ public class RealtimeEventPublisher {
         if (clientAuthEvent.hasAuthStatus()) {
             clientEvent.setAuthStatus(WlanStatusCode.getById(clientAuthEvent.getAuthStatus()));
         }
-        clientEvent.setEventTimestamp(clientAuthEvent.getTimestampMs());
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -380,8 +379,7 @@ public class RealtimeEventPublisher {
         if (clientAssocEvent.hasUsing11V()) {
             clientEvent.setUsing11v(clientAssocEvent.getUsing11V());
         }
-        
-        clientEvent.setEventTimestamp(clientAssocEvent.getTimestampMs());
+
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -409,7 +407,7 @@ public class RealtimeEventPublisher {
         if (clientFailureEvent.hasReasonCode()) {
             clientEvent.setReasonCode(WlanReasonCode.getById(clientFailureEvent.getReasonCode()));
         }
-        clientEvent.setEventTimestamp(clientFailureEvent.getTimestampMs());
+
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -435,7 +433,7 @@ public class RealtimeEventPublisher {
         if (clientFirstDataEvent.hasFdataRxUpTsInUs()) {
             clientEvent.setFirstDataRcvdTs(clientFirstDataEvent.getFdataRxUpTsInUs());
         }
-        clientEvent.setEventTimestamp(clientFirstDataEvent.getTimestampMs());
+
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -457,7 +455,7 @@ public class RealtimeEventPublisher {
         if (clientIdEvent.hasCltId()) {
             clientEvent.setUserId(clientIdEvent.getCltId());
         }
-        clientEvent.setEventTimestamp(clientIdEvent.getTimestampMs());
+
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -478,7 +476,7 @@ public class RealtimeEventPublisher {
         if (clientIpEvent.hasIpAddr()) {
             clientEvent.setIpAddr(clientIpEvent.getIpAddr().toByteArray());
         }
-        clientEvent.setEventTimestamp(clientIpEvent.getTimestampMs());
+
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -508,7 +506,7 @@ public class RealtimeEventPublisher {
         if (clientTimeoutEvent.hasLastSentUpTsInUs()) {
             clientEvent.setLastSentTime(clientTimeoutEvent.getLastSentUpTsInUs());
         }
-        clientEvent.setEventTimestamp(clientTimeoutEvent.getTimestampMs());
+
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);

opensync-ext-cloud/src/test/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloudTest.java

@@ -5,7 +5,6 @@ import static org.junit.Assert.assertNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
-import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -76,7 +75,6 @@ import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
 import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
 import com.telecominfraproject.wlan.routing.RoutingServiceInterface;
 import com.telecominfraproject.wlan.status.StatusServiceInterface;
-import com.telecominfraproject.wlan.status.equipment.models.EquipmentChannelStatusData;
 import com.telecominfraproject.wlan.status.equipment.models.EquipmentProtocolStatusData;
 import com.telecominfraproject.wlan.status.equipment.models.EquipmentUpgradeStatusData;
 import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSID;
@@ -680,19 +678,7 @@ public class OpensyncExternalIntegrationCloudTest {
         protocolStatus.setStatusDataType(StatusDataType.PROTOCOL);
 
         Mockito.when(statusServiceInterface.getOrNull(2, 1L, StatusDataType.PROTOCOL)).thenReturn(protocolStatus);
-        
-        Status channelStatus = new Status();
-        channelStatus.setCustomerId(2);
-        channelStatus.setEquipmentId(1L);
-        EquipmentChannelStatusData channelStatusData = new EquipmentChannelStatusData();
-        Map<RadioType, Integer> channelStatusDataMap = new EnumMap<>(RadioType.class);
-        channelStatusDataMap.put(RadioType.is2dot4GHz, 6);
-        channelStatusDataMap.put(RadioType.is5GHzL, 36);
-        channelStatusDataMap.put(RadioType.is5GHzU, 157);
-        channelStatusData.setChannelNumberStatusDataMap(channelStatusDataMap);
-        channelStatus.setDetails(channelStatusData);
 
-        Mockito.when(statusServiceInterface.getOrNull(2, 1L, StatusDataType.RADIO_CHANNEL)).thenReturn(channelStatus);
         Status bssidStatus = new Status();
         bssidStatus.setStatusDataType(StatusDataType.ACTIVE_BSSIDS);
         bssidStatus.setCustomerId(2);
@@ -703,6 +689,8 @@ public class OpensyncExternalIntegrationCloudTest {
 
         Mockito.when(statusServiceInterface.getOrNull(2, 1L, StatusDataType.ACTIVE_BSSIDS)).thenReturn(bssidStatus);
 
+        Mockito.when(statusServiceInterface.update(bssidStatus)).thenReturn(bssidStatus);
+
         Status clientStatus = new Status();
         clientStatus.setCustomerId(2);
         clientStatus.setEquipmentId(1L);
@@ -714,7 +702,7 @@ public class OpensyncExternalIntegrationCloudTest {
         clientStatus.setDetails(clientConnectionDetails);
 
         Mockito.when(statusServiceInterface.getOrNull(2, 1L, StatusDataType.CLIENT_DETAILS)).thenReturn(clientStatus);
-        Mockito.when(statusServiceInterface.update(Mockito.any(Status.class))).thenReturn(channelStatus).thenReturn(bssidStatus).thenReturn(clientStatus);
+        Mockito.when(statusServiceInterface.update(clientStatus)).thenReturn(clientStatus);
 
         OvsdbSession session = Mockito.mock(OvsdbSession.class);
         Mockito.when(session.getEquipmentId()).thenReturn(1L);

opensync-ext-interface/pom.xml

@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-ext-interface</artifactId>
@@ -15,33 +13,33 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>tip-wlan-opensync-protobuf</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<artifactId>equipment-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>profile-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>location-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>routing-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		
 

opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java

@@ -35,7 +35,7 @@ public interface OpensyncExternalIntegrationInterface {
     void wifiInetStateDbTableUpdate(List<OpensyncAPInetState> inetStateTables, String apId);
 
     void wifiInetStateDbTableDelete(List<OpensyncAPInetState> inetStateTables, String apId);
-
+    
     void processMqttMessage(String topic, Report report);
 
     void processMqttMessage(String topic, FlowReport flowReport);
@@ -47,15 +47,10 @@ public interface OpensyncExternalIntegrationInterface {
     void wifiAssociatedClientsDbTableDelete(String deletedClientMac, String apId);
 
     void awlanNodeDbTableUpdate(OpensyncAWLANNode opensyncAPState, String apId);
+    
+    void dhcpLeasedIpDbTableUpdate(List<Map<String,String>> dhcpAttributes, String apId, RowUpdateOperation rowUpdateOperation);
 
-    void dhcpLeasedIpDbTableUpdate(List<Map<String, String>> dhcpAttributes, String apId,
-            RowUpdateOperation rowUpdateOperation);
-
-    void commandStateDbTableUpdate(List<Map<String, String>> commandStateAttributes, String apId,
-            RowUpdateOperation rowUpdateOperation);
-
-    void apcStateDbTableUpdate(Map<String, String> apcStateAttributes, String apId,
-            RowUpdateOperation rowUpdateOperation);
-
+    void commandStateDbTableUpdate(List<Map<String,String>> commandStateAttributes, String apId, RowUpdateOperation rowUpdateOperation);
+    
     void clearEquipmentStatus(String apId);
 }

opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/ConnectNodeInfo.java

@@ -1,4 +1,3 @@
-
 package com.telecominfraproject.wlan.opensync.external.integration.models;
 
 import java.util.HashMap;
@@ -27,13 +26,6 @@ public class ConnectNodeInfo implements Cloneable {
     public String lanIfName;
     public String lanIfType;
     public String lanMacAddress;
-    public String referenceDesign;
-    public Map<String, String> qrCode;
-    public String modelDescription;
-    public String manufacturerUrl;
-    public String manufacturerName;
-    public String manufacturerDate;
-    public String certificationRegion;
 
     @Override
     public ConnectNodeInfo clone() {
@@ -48,9 +40,6 @@ public class ConnectNodeInfo implements Cloneable {
             if (this.versionMatrix != null) {
                 ret.versionMatrix = new HashMap<>(this.versionMatrix);
             }
-            if (this.qrCode != null) {
-                ret.qrCode = new HashMap<>(this.qrCode);
-            }
             return ret;
         } catch (CloneNotSupportedException e) {
             throw new IllegalStateException("Cannot clone ", e);
@@ -58,45 +47,44 @@ public class ConnectNodeInfo implements Cloneable {
     }
 
     @Override
-    public int hashCode() {
-        return Objects.hash(certificationRegion, country, firmwareVersion, ifName, ifType, ipV4Address, lanIfName, lanIfType, lanIpV4Address, lanMacAddress,
-                macAddress, managerAddr, manufacturerDate, manufacturerName, manufacturerUrl, model, modelDescription, mqttSettings, platformVersion, qrCode,
-                redirectorAddr, referenceDesign, revision, serialNumber, skuNumber, versionMatrix, wifiRadioStates);
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof ConnectNodeInfo)) {
+            return false;
+        }
+        ConnectNodeInfo other = (ConnectNodeInfo) obj;
+        return Objects.equals(country, other.country) && Objects.equals(firmwareVersion, other.firmwareVersion)
+                && Objects.equals(ifName, other.ifName) && Objects.equals(ifType, other.ifType)
+                && Objects.equals(ipV4Address, other.ipV4Address) && Objects.equals(lanIfName, other.lanIfName)
+                && Objects.equals(lanIfType, other.lanIfType) && Objects.equals(lanIpV4Address, other.lanIpV4Address)
+                && Objects.equals(lanMacAddress, other.lanMacAddress) && Objects.equals(macAddress, other.macAddress)
+                && Objects.equals(managerAddr, other.managerAddr) && Objects.equals(model, other.model)
+                && Objects.equals(mqttSettings, other.mqttSettings)
+                && Objects.equals(platformVersion, other.platformVersion)
+                && Objects.equals(redirectorAddr, other.redirectorAddr) && Objects.equals(revision, other.revision)
+                && Objects.equals(serialNumber, other.serialNumber) && Objects.equals(skuNumber, other.skuNumber)
+                && Objects.equals(versionMatrix, other.versionMatrix)
+                && Objects.equals(wifiRadioStates, other.wifiRadioStates);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ConnectNodeInfo other = (ConnectNodeInfo) obj;
-        return Objects.equals(certificationRegion, other.certificationRegion) && Objects.equals(country, other.country)
-                && Objects.equals(firmwareVersion, other.firmwareVersion) && Objects.equals(ifName, other.ifName) && Objects.equals(ifType, other.ifType)
-                && Objects.equals(ipV4Address, other.ipV4Address) && Objects.equals(lanIfName, other.lanIfName) && Objects.equals(lanIfType, other.lanIfType)
-                && Objects.equals(lanIpV4Address, other.lanIpV4Address) && Objects.equals(lanMacAddress, other.lanMacAddress)
-                && Objects.equals(macAddress, other.macAddress) && Objects.equals(managerAddr, other.managerAddr)
-                && Objects.equals(manufacturerDate, other.manufacturerDate) && Objects.equals(manufacturerName, other.manufacturerName)
-                && Objects.equals(manufacturerUrl, other.manufacturerUrl) && Objects.equals(model, other.model)
-                && Objects.equals(modelDescription, other.modelDescription) && Objects.equals(mqttSettings, other.mqttSettings)
-                && Objects.equals(platformVersion, other.platformVersion) && Objects.equals(qrCode, other.qrCode)
-                && Objects.equals(redirectorAddr, other.redirectorAddr) && Objects.equals(referenceDesign, other.referenceDesign)
-                && Objects.equals(revision, other.revision) && Objects.equals(serialNumber, other.serialNumber) && Objects.equals(skuNumber, other.skuNumber)
-                && Objects.equals(versionMatrix, other.versionMatrix) && Objects.equals(wifiRadioStates, other.wifiRadioStates);
+    public int hashCode() {
+        return Objects.hash(country, firmwareVersion, ifName, ifType, ipV4Address, lanIfName, lanIfType, lanIpV4Address,
+                lanMacAddress, macAddress, managerAddr, model, mqttSettings, platformVersion, redirectorAddr, revision,
+                serialNumber, skuNumber, versionMatrix, wifiRadioStates);
     }
 
     @Override
     public String toString() {
-        return "ConnectNodeInfo [mqttSettings=" + mqttSettings + ", versionMatrix=" + versionMatrix + ", wifiRadioStates=" + wifiRadioStates
-                + ", redirectorAddr=" + redirectorAddr + ", managerAddr=" + managerAddr + ", skuNumber=" + skuNumber + ", serialNumber=" + serialNumber
-                + ", macAddress=" + macAddress + ", ipV4Address=" + ipV4Address + ", platformVersion=" + platformVersion + ", firmwareVersion="
-                + firmwareVersion + ", revision=" + revision + ", model=" + model + ", ifName=" + ifName + ", ifType=" + ifType + ", country=" + country
-                + ", lanIpV4Address=" + lanIpV4Address + ", lanIfName=" + lanIfName + ", lanIfType=" + lanIfType + ", lanMacAddress=" + lanMacAddress
-                + ", referenceDesign=" + referenceDesign + ", qrCode=" + qrCode + ", modelDescription=" + modelDescription + ", manufacturerUrl="
-                + manufacturerUrl + ", manufacturerName=" + manufacturerName + ", manufacturerDate=" + manufacturerDate + ", certificationRegion="
-                + certificationRegion + "]";
+        return "ConnectNodeInfo [mqttSettings=" + mqttSettings + ", versionMatrix=" + versionMatrix
+                + ", wifiRadioStates=" + wifiRadioStates + ", redirectorAddr=" + redirectorAddr + ", managerAddr="
+                + managerAddr + ", skuNumber=" + skuNumber + ", serialNumber=" + serialNumber + ", macAddress="
+                + macAddress + ", ipV4Address=" + ipV4Address + ", platformVersion=" + platformVersion
+                + ", firmwareVersion=" + firmwareVersion + ", revision=" + revision + ", model=" + model + ", ifName="
+                + ifName + ", ifType=" + ifType + ", country=" + country + ", lanIpV4Address=" + lanIpV4Address
+                + ", lanIfName=" + lanIfName + ", lanIfType=" + lanIfType + ", lanMacAddress=" + lanMacAddress + "]";
     }
 
 }

opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAWLANNode.java

@@ -1,7 +1,6 @@
 /**
  *
  */
-
 package com.telecominfraproject.wlan.opensync.external.integration.models;
 
 import java.util.HashMap;
@@ -46,14 +45,6 @@ public class OpensyncAWLANNode extends OpensyncAPBase {
     public String revision;
     public String managerAddr;
     public boolean factoryReset;
-    public String referenceDesign;
-    public Map<String, String> qrCode;
-    public String modelDescription;
-    public String manufacturerUrl;
-    public String manufacturerName;
-    public String manufacturerDate;
-    public String certificationRegion;
-
     public Uuid _uuid;
 
     public Uuid version;
@@ -68,39 +59,8 @@ public class OpensyncAWLANNode extends OpensyncAPBase {
 
     public OpensyncAWLANNode(Row row) {
         this();
-        
-//        mqtt_settings        {"key":"string","max":"unlimited","min":0,"value":"string"}
-//        model                {"key":"string","min":0}
-//        sku_number           {"key":"string","min":0}
-//        version_matrix       {"key":"string","max":"unlimited","min":0,"value":{"maxLength":128,"type":"string"}}
-//        model_description    "string"
-//        certification_region "string"
-//        id                   "string"
-//        firmware_version     "string"
-//        firmware_url         {"key":{"maxLength":256,"type":"string"}}
-//        _uuid                "uuid"
-//        upgrade_dl_timer     "integer"
-//        reference_design     "string"
-//        platform_version     "string"
-//        firmware_pass        {"key":{"maxLength":256,"type":"string"}}
-//        upgrade_timer        "integer"
-//        redirector_addr      "string"
-//        led_config           {"key":"string","max":"unlimited","min":0,"value":"string"}
-//        max_backoff          "integer"
-//        mqtt_headers         {"key":"string","max":"unlimited","min":0,"value":"string"}
-//        serial_number        {"key":"string","min":0}
-//        _version             "uuid"
-//        upgrade_status       "integer"
-//        device_mode          {"key":{"enum":["set",["battery","cloud","custom","monitor"]],"type":"string"},"min":0}
-//        min_backoff          "integer"
-//        manufacturer_date    "string"
-//        mqtt_topics          {"key":"string","max":"unlimited","min":0,"value":{"maxLength":128,"type":"string"}}
-//        revision             "string"
-//        manufacturer_name    "string"
-//        manufacturer_url     "string"
-//        manager_addr         "string"
-//        factory_reset        {"key":"boolean","min":0}
         Map<String, Value> map = row.getColumns();
+
         if (map.get("mqtt_settings") != null) {
             this.setMqttSettings(row.getMapColumn("mqtt_settings"));
         }
@@ -110,89 +70,93 @@ public class OpensyncAWLANNode extends OpensyncAPBase {
         if (map.get("mqtt_topics") != null) {
             this.setMqttHeaders(row.getMapColumn("mqtt_topics"));
         }
-        if ((map.get("model") != null) && map.get("model").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+
+        if ((map.get("model") != null)
+                && map.get("model").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setModel(row.getStringColumn("model"));
         }
-        if ((map.get("sku_number") != null) && map.get("sku_number").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("sku_number") != null)
+                && map.get("sku_number").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setSkuNumber(row.getStringColumn("sku_number"));
         }
-        if (map.get("id") != null) {
-            this.setId(getSingleValueFromSet(row, "id"));
-        }
-        if (map.get("reference_design") != null) {
-            this.setReferenceDesign(row.getStringColumn("reference_design"));
-        }
-        if (map.get("qr_code") != null) {
-            this.setQrCode(row.getMapColumn("qr_code"));
-        }
-        if ((map.get("model_description") != null)) {
-            this.setModelDescription(row.getStringColumn("model_description"));
-        }
-        if ((map.get("manufacturer_url") != null)) {
-            this.setManufacturerUrl(row.getStringColumn("manufacturer_url"));
-        }
-        if ((map.get("manufacturer_name") != null)) {
-            this.setManufacturerName(row.getStringColumn("manufacturer_name"));
-        }
-        if ((map.get("manufacturer_date") != null)) {
-            this.setManufacturerDate(row.getStringColumn("manufacturer_date"));
-        }
-        if (map.get("certification_region") != null) {
-            this.setCertificationRegion(row.getStringColumn("certification_region"));
+        if ((map.get("id") != null)
+                && map.get("id").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+            this.setId(row.getStringColumn("id"));
         }
+
         if (map.get("version_matrix") != null) {
             this.setVersionMatrix(row.getMapColumn("version_matrix"));
         }
-        if ((map.get("firmware_version") != null) && map.get("firmware_version").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("firmware_version") != null) && map.get("firmware_version").getClass()
+                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setFirmwareVersion(row.getStringColumn("firmware_version"));
         }
-        if ((map.get("firmware_url") != null) && map.get("firmware_url").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("firmware_url") != null)
+                && map.get("firmware_url").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setFirmwareUrl(row.getStringColumn("firmware_url"));
         }
-        if ((map.get("_uuid") != null) && map.get("_uuid").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+
+        if ((map.get("_uuid") != null)
+                && map.get("_uuid").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setVersion(row.getUuidColumn("_uuid"));
         }
-        if ((map.get("upgrade_dl_timer") != null) && map.get("upgrade_dl_timer").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("upgrade_dl_timer") != null) && map.get("upgrade_dl_timer").getClass()
+                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setUpgradeDlTimer(row.getIntegerColumn("upgrade_dl_timer").intValue());
         }
-        if ((map.get("platform_version") != null) && map.get("platform_version").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("platform_version") != null) && map.get("platform_version").getClass()
+                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setPlatformVersion(row.getStringColumn("platform_version"));
         }
-        if ((map.get("firmware_pass") != null) && map.get("firmware_pass").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("firmware_pass") != null) && map.get("firmware_pass").getClass()
+                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setFirmwarePass(row.getStringColumn("firmware_pass"));
         }
-        if ((map.get("upgrade_timer") != null) && map.get("upgrade_timer").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("upgrade_timer") != null) && map.get("upgrade_timer").getClass()
+                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setUpgradeTimer(row.getIntegerColumn("upgrade_timer").intValue());
         }
-        if ((map.get("max_backoff") != null) && map.get("max_backoff").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("max_backoff") != null)
+                && map.get("max_backoff").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setMaxBackoff(row.getIntegerColumn("max_backoff").intValue());
         }
         if (map.get("led_config") != null) {
             this.setLedConfig(row.getMapColumn("led_config"));
         }
-        if ((map.get("redirector_addr") != null) && map.get("redirector_addr").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("redirector_addr") != null) && map.get("redirector_addr").getClass()
+                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setRedirectorAddr(row.getStringColumn("redirector_addr"));
         }
-        if ((map.get("serial_number") != null) && map.get("serial_number").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("serial_number") != null) && map.get("serial_number").getClass()
+                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setSerialNumber(row.getStringColumn("serial_number"));
         }
-        if ((map.get("_version") != null) && map.get("_version").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("_version") != null)
+                && map.get("_version").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setVersion(row.getUuidColumn("_version"));
         }
+
         this.setUpgradeStatus(row.getIntegerColumn("upgrade_status").intValue());
-        if ((map.get("device_mode") != null) && map.get("device_mode").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+
+        if ((map.get("device_mode") != null)
+                && map.get("device_mode").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setDeviceMode(row.getStringColumn("device_mode"));
         }
-        if ((map.get("min_backoff") != null) && map.get("min_backoff").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("min_backoff") != null)
+                && map.get("min_backoff").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setMinBackoff(row.getIntegerColumn("min_backoff").intValue());
         }
-        if ((map.get("revision") != null) && map.get("revision").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+
+        if ((map.get("revision") != null)
+                && map.get("revision").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setRevision(row.getStringColumn("revision"));
         }
-        if ((map.get("manager_addr") != null) && map.get("manager_addr").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("manager_addr") != null)
+                && map.get("manager_addr").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setManagerAddr(row.getStringColumn("manager_addr"));
         }
-        if ((map.get("factory_reset") != null) && map.get("factory_reset").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("factory_reset") != null) && map.get("factory_reset").getClass()
+                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setFactoryReset(row.getBooleanColumn("factory_reset"));
         }
     }
@@ -297,62 +261,6 @@ public class OpensyncAWLANNode extends OpensyncAPBase {
         return factoryReset;
     }
 
-    public String getReferenceDesign() {
-        return referenceDesign;
-    }
-
-    public void setReferenceDesign(String referenceDesign) {
-        this.referenceDesign = referenceDesign;
-    }
-
-    public Map<String, String> getQrCode() {
-        return qrCode;
-    }
-
-    public void setQrCode(Map<String, String> qrCode) {
-        this.qrCode = qrCode;
-    }
-
-    public String getModelDescription() {
-        return modelDescription;
-    }
-
-    public void setModelDescription(String modelDescription) {
-        this.modelDescription = modelDescription;
-    }
-
-    public String getManufacturerUrl() {
-        return manufacturerUrl;
-    }
-
-    public void setManufacturerUrl(String manufacturerUrl) {
-        this.manufacturerUrl = manufacturerUrl;
-    }
-
-    public String getManufacturerName() {
-        return manufacturerName;
-    }
-
-    public void setManufacturerName(String manufacturerName) {
-        this.manufacturerName = manufacturerName;
-    }
-
-    public String getManufacturerDate() {
-        return manufacturerDate;
-    }
-
-    public void setManufacturerDate(String manufacturerDate) {
-        this.manufacturerDate = manufacturerDate;
-    }
-
-    public String getCertificationRegion() {
-        return certificationRegion;
-    }
-
-    public void setCertificationRegion(String certificationRegion) {
-        this.certificationRegion = certificationRegion;
-    }
-
     public void set_uuid(Uuid _uuid) {
         this._uuid = _uuid;
     }

opensync-ext-static/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
   <artifactId>opensync-ext-static</artifactId>
@@ -13,7 +13,7 @@
   	<dependency>
   		<groupId>com.telecominfraproject.wlan</groupId>
   		<artifactId>opensync-gateway</artifactId>
-  		<version>0.0.1-SNAPSHOT</version>
+  		<version>1.0.0-SNAPSHOT</version>
   	</dependency>
   </dependencies>
 </project>

opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java

@@ -44,7 +44,7 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 
     @Value("${tip.wlan.ovsdb.ssidProfileFileName:/app/config/ProfileSsid.json}")
     private String ssidProfileFileName;
-
+    
     @Value("${tip.wlan.ovsdb.radiusProfileFileName:/app/config/ProfileRadius.json}")
     private String radiusProfileFileName;
 
@@ -84,6 +84,7 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
             List<com.telecominfraproject.wlan.profile.models.Profile> ssidProfiles = com.telecominfraproject.wlan.profile.models.Profile
                     .listFromFile(ssidProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
             ssidProfiles.stream().forEach(p -> apProfile.getChildProfileIds().add(p.getId()));
+            
 
             equipment.setProfileId(apProfile.getId());
             Location location = Location.fromFile(locationFileName, Location.class);
@@ -119,6 +120,7 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
             LOG.info("Received EventReport {}", e);
         });
 
+
     }
 
     public void processMqttMessage(String topic, FlowReport flowReport) {
@@ -196,15 +198,8 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 
     @Override
     public void clearEquipmentStatus(String apId) {
-        LOG.info("Received clearEquipmentStatus for ap {}", apId);
-
-    }
-
-    @Override
-    public void apcStateDbTableUpdate(Map<String, String> apcStateAttributes, String apId,
-            RowUpdateOperation rowUpdateOperation) {
-        LOG.info("Received APC_State {} for operation {}", apcStateAttributes, rowUpdateOperation);
-
+        LOG.info("Received clearEquipmentStatus for ap {}",apId);
+        
     }
 
 }

opensync-gateway-build/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
   <artifactId>opensync-gateway-build</artifactId>

opensync-gateway-cloud-docker/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway-cloud-docker</artifactId>
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway-cloud-process</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway-cloud-process/pom.xml

@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway-cloud-process</artifactId>
@@ -22,95 +20,95 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-cloud</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <artifactId>filestore-service</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 		<dependency>
 			<artifactId>customer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>location-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>equipment-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>profile-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>portal-user-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>service-metric-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>system-event-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>alarm-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>client-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>routing-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>firmware-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>manufacturer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway-cloud-process/src/main/resources/application.properties

@@ -136,7 +136,7 @@ tip.wlan.manufacturerServiceBaseUrl=https://localhost:9092
 tip.wlan.portalUserServiceBaseUrl=https://localhost:9092
 
 tip.wlan.fileStoreDirectory=/tmp/tip-wlan-filestore
-tip.wlan.externalFileStoreURL=https://localhost:9092
+tip.wlan.externalFileStoreURL=localhost:9096
 
 #server.session-timeout= # session timeout in seconds
 #server.tomcat.max-threads = 0 # number of threads in protocol handler

opensync-gateway-static-docker/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway-static-docker</artifactId>
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway-static-process</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway-static-process/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway-static-process</artifactId>
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-static</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway/pom.xml

@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway</artifactId>
@@ -16,22 +14,22 @@
 		<dependency>
 			<artifactId>base-container</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-interface</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>client-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>customer-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vmware.ovsdb</groupId>
@@ -49,13 +47,13 @@
 		<dependency>
 			<artifactId>service-metric-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util -->

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java

@@ -17,7 +17,6 @@ import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession;
 import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
 import com.telecominfraproject.wlan.opensync.external.integration.models.*;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbDao;
-import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbMonitor;
 import com.telecominfraproject.wlan.opensync.ovsdb.metrics.OvsdbClientWithMetrics;
 import com.telecominfraproject.wlan.opensync.ovsdb.metrics.OvsdbMetrics;
 import com.telecominfraproject.wlan.opensync.util.OvsdbStringConstants;
@@ -39,7 +38,6 @@ import javax.annotation.PostConstruct;
 import java.security.cert.X509Certificate;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 
 @Profile("ovsdb_manager")
 @Component
@@ -60,6 +58,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
     private final Counter connectionsDropped = new BasicCounter(
             MonitorConfig.builder("osgw-connectionsDropped").withTags(tags).build());
+    
 
     @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.listenPort:6640}")
     private int ovsdbListenPort;
@@ -117,11 +116,11 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             public void connected(OvsdbClient ovsdbClient) {
 
                 connectionsAttempted.increment();
-
-                if (!(ovsdbClient instanceof OvsdbClientWithMetrics)) {
+                
+                if(! (ovsdbClient instanceof OvsdbClientWithMetrics )) {
                     ovsdbClient = new OvsdbClientWithMetrics(ovsdbClient, ovsdbMetrics);
                 }
-
+                
                 String remoteHost = ovsdbClient.getConnectionInfo().getRemoteAddress().getHostAddress();
                 int localPort = ovsdbClient.getConnectionInfo().getLocalPort();
                 String subjectDn;
@@ -168,7 +167,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             public void disconnected(OvsdbClient ovsdbClient) {
 
                 connectionsDropped.increment();
-
+                
                 String remoteHost;
                 int localPort;
                 String clientCn;
@@ -210,7 +209,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     try {
                         ovsdbClient.shutdown();
                     } catch (Exception e) {
-                        LOG.error("Caught Exception shutting down ovsdb client, may have already been disconnected", e);
+                        LOG.error("Caught Exception shutting down ovsdb client, may have already been disconnected",
+                                e);
                     }
 
                 }
@@ -224,7 +224,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         LOG.info("Manager waiting for connection on port {}...", ovsdbListenPort);
     }
 
-    private void processConnectRequest(OvsdbClient ovsdbClient, String clientCn, ConnectNodeInfo connectNodeInfo) {
+    private void processConnectRequest(OvsdbClient ovsdbClient, String clientCn,
+                                       ConnectNodeInfo connectNodeInfo) {
 
         LOG.debug("Starting Client connect");
         connectNodeInfo = ovsdbDao.updateConnectNodeInfoOnConnect(ovsdbClient, clientCn, connectNodeInfo,
@@ -240,7 +241,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         ovsdbDao.removeAllSsids(ovsdbClient); // always
         ovsdbDao.removeAllInetConfigs(ovsdbClient);
         ovsdbDao.removeWifiRrm(ovsdbClient);
-        ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
         ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
 
         extIntegrationInterface.clearEquipmentStatus(apId);
@@ -252,7 +252,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
             ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
-            ovsdbDao.configureRadsecRadiusAndRealm(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
             if (opensyncAPConfig.getHotspotConfig() != null) {
                 ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig);
@@ -315,15 +314,13 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         ovsdbDao.removeAllSsids(ovsdbClient); // always
         ovsdbDao.removeAllInetConfigs(ovsdbClient);
         ovsdbDao.removeWifiRrm(ovsdbClient);
-        ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
 
         extIntegrationInterface.clearEquipmentStatus(apId);
-        
         ovsdbDao.configureNtpServer(ovsdbClient, opensyncAPConfig);
         ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
         ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
         ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureRadsecRadiusAndRealm(ovsdbClient, opensyncAPConfig);
+
         ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
         if (opensyncAPConfig.getHotspotConfig() != null) {
             ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig);
@@ -366,20 +363,20 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         } catch (OvsdbClientException e) {
             LOG.debug("Could not enable monitor for Wifi_Radio_State table. {}", e.getMessage());
         }
-
+        
         try {
             monitorWifiInetStateDbTable(ovsdbClient, key);
         } catch (OvsdbClientException e) {
             LOG.debug("Could not enable monitor for Wifi_Inet_State table. {}", e.getMessage());
         }
-
+        
         try {
             monitorWifiVifStateDbTable(ovsdbClient, key);
         } catch (OvsdbClientException e) {
             LOG.debug("Could not enable monitor for Wifi_VIF_State table. {}", e.getMessage());
 
         }
-
+        
         try {
             monitorWifiAssociatedClientsDbTable(ovsdbClient, key);
         } catch (OvsdbClientException e) {
@@ -392,7 +389,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             LOG.debug("Could not enable monitor for AWLAN_Node table. {}", e.getMessage());
 
         }
-
+        
         try {
             monitorDhcpLeasedIpDbTable(ovsdbClient, key);
         } catch (OvsdbClientException e) {
@@ -406,19 +403,11 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             LOG.debug("Could not enable monitor for Command_State table. {}", e.getMessage());
 
         }
-
-        try {
-            monitorNodeStateTable(ovsdbClient, key);
-        } catch (OvsdbClientException e) {
-            LOG.debug("Could not enable monitor for Node_State table. {}", e.getMessage());
-        }
         
         try {
-            if (ovsdbClient.getSchema(OvsdbDao.ovsdbName).get().getTables().containsKey("APC_State")) {
-                monitorAPCStateTable(ovsdbClient, key);
-            }
-        } catch (InterruptedException | ExecutionException | OvsdbClientException e) {
-           LOG.debug("Could not enable monitor for APC_State table. {}", e);
+            monitorNodeStateTable(ovsdbClient,key);
+        } catch (OvsdbClientException e) {
+            LOG.debug("Could not enable monitor for Node_State table. {}", e.getMessage());
         }
         LOG.debug("Finished (re)setting monitors for AP {}", key);
     }
@@ -444,8 +433,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                 if (rowUpdate.getNew() == null) {
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns().entrySet()
-                                            .forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
+                                    rowUpdate.getOld().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     delete.add(rowMap);
                                     // delete
@@ -453,8 +441,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     // insert
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getNew().getColumns().entrySet()
-                                            .forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
+                                    rowUpdate.getNew().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     insert.add(rowMap);
                                 } else {
@@ -463,8 +450,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     Map<String, String> rowMap = new HashMap<>();
 
                                     rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
-                                    rowUpdate.getOld().getColumns().entrySet()
-                                            .forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
+                                    rowUpdate.getOld().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     update.add(rowMap);
 
@@ -473,16 +459,19 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                         }
 
                         if (!insert.isEmpty()) {
-                            extIntegrationInterface.dhcpLeasedIpDbTableUpdate(insert, key, RowUpdateOperation.INSERT);
+                            extIntegrationInterface.dhcpLeasedIpDbTableUpdate(insert, key,
+                                    RowUpdateOperation.INSERT);
                         }
 
                         if (!delete.isEmpty()) {
-                            extIntegrationInterface.dhcpLeasedIpDbTableUpdate(delete, key, RowUpdateOperation.DELETE);
+                            extIntegrationInterface.dhcpLeasedIpDbTableUpdate(delete, key,
+                                    RowUpdateOperation.DELETE);
 
                         }
 
                         if (!update.isEmpty()) {
-                            extIntegrationInterface.dhcpLeasedIpDbTableUpdate(update, key, RowUpdateOperation.MODIFY);
+                            extIntegrationInterface.dhcpLeasedIpDbTableUpdate(update, key,
+                                    RowUpdateOperation.MODIFY);
 
                         }
                     } catch (Exception e) {
@@ -515,8 +504,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                 if (rowUpdate.getNew() == null) {
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns()
-                                            .forEach((key1, value) -> rowMap.put(key1, value.toString()));
+                                    rowUpdate.getOld().getColumns().forEach((key1, value) -> rowMap.put(key1, value.toString()));
 
                                     delete.add(rowMap);
                                     // delete
@@ -524,8 +512,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     // insert
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getNew().getColumns()
-                                            .forEach((key1, value) -> rowMap.put(key1, value.toString()));
+                                    rowUpdate.getNew().getColumns().forEach((key1, value) -> rowMap.put(key1, value.toString()));
 
                                     insert.add(rowMap);
                                 } else {
@@ -534,8 +521,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     Map<String, String> rowMap = new HashMap<>();
 
                                     rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
-                                    rowUpdate.getOld().getColumns()
-                                            .forEach((key1, value) -> rowMap.put(key1, value.toString()));
+                                    rowUpdate.getOld().getColumns().forEach((key1, value) -> rowMap.put(key1, value.toString()));
 
                                     update.add(rowMap);
 
@@ -544,16 +530,19 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                         }
 
                         if (!insert.isEmpty()) {
-                            extIntegrationInterface.commandStateDbTableUpdate(insert, key, RowUpdateOperation.INSERT);
+                            extIntegrationInterface.commandStateDbTableUpdate(insert, key,
+                                    RowUpdateOperation.INSERT);
                         }
 
                         if (!delete.isEmpty()) {
-                            extIntegrationInterface.commandStateDbTableUpdate(delete, key, RowUpdateOperation.DELETE);
+                            extIntegrationInterface.commandStateDbTableUpdate(delete, key,
+                                    RowUpdateOperation.DELETE);
 
                         }
 
                         if (!update.isEmpty()) {
-                            extIntegrationInterface.commandStateDbTableUpdate(update, key, RowUpdateOperation.MODIFY);
+                            extIntegrationInterface.commandStateDbTableUpdate(update, key,
+                                    RowUpdateOperation.MODIFY);
 
                         }
                     } catch (Exception e) {
@@ -567,12 +556,13 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     }
 
     private void monitorAwlanNodeDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
-                OvsdbDao.awlanNodeDbTable + "_" + key, new MonitorRequests(ImmutableMap.of(OvsdbDao.awlanNodeDbTable,
-                        new MonitorRequest(new MonitorSelect(true, false, false, true)))),
+        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(
+                OvsdbDao.ovsdbName, OvsdbDao.awlanNodeDbTable + "_" + key, new MonitorRequests(ImmutableMap
+                        .of(OvsdbDao.awlanNodeDbTable, new MonitorRequest(new MonitorSelect(true, false, false, true)))),
                 tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.awlanNodeDbTable + "_" + key + " monitor callback received {}", tableUpdates);
+                        LOG.info(OvsdbDao.awlanNodeDbTable + "_" + key + " monitor callback received {}",
+                                tableUpdates);
 
                         extIntegrationInterface.awlanNodeDbTableUpdate(
                                 ovsdbDao.getOpensyncAWLANNode(tableUpdates, key, ovsdbClient), key);
@@ -592,7 +582,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                 tableUpdates -> {
 
                     try {
-                        LOG.info(OvsdbDao.wifiAssociatedClientsDbTable + "_" + key + " monitor callback received {}",
+                        LOG.info(
+                                OvsdbDao.wifiAssociatedClientsDbTable + "_" + key + " monitor callback received {}",
                                 tableUpdates);
 
                         List<OpensyncWifiAssociatedClients> associatedClients = new ArrayList<>();
@@ -608,7 +599,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     // the updates, as we want to delete
                                     // before
                                     // adding anyway.
-                                    extIntegrationInterface.wifiAssociatedClientsDbTableDelete(deletedClientMac, key);
+                                    extIntegrationInterface.wifiAssociatedClientsDbTableDelete(deletedClientMac,
+                                            key);
                                 } else {
                                     associatedClients.addAll(
                                             ovsdbDao.getOpensyncWifiAssociatedClients(rowUpdate, key, ovsdbClient));
@@ -637,8 +629,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                         new MonitorRequest(new MonitorSelect(true, true, true, true)))),
                 tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.wifiInetStateDbTable + "_" + key + " monitor callback received {}",
-                                tableUpdates);
+                        LOG.info(OvsdbDao.wifiInetStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
 
                         List<OpensyncAPInetState> inetStateInsertOrUpdate = new ArrayList<>();
                         List<OpensyncAPInetState> inetStateDelete = new ArrayList<>();
@@ -648,11 +639,11 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                             for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
 
                                 if (rowUpdate.getNew() == null) {
-                                    inetStateDelete.addAll(
-                                            ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                    inetStateDelete.addAll(ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate,
+                                            key, ovsdbClient));
                                 } else {
-                                    inetStateInsertOrUpdate.addAll(
-                                            ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                    inetStateInsertOrUpdate.addAll(ovsdbDao
+                                            .getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
                                 }
 
                             }
@@ -697,50 +688,51 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
     private void monitorWifiVifStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> vsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
-                OvsdbDao.wifiVifStateDbTable + "_" + key,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable,
-                        new MonitorRequest(new MonitorSelect(false, true, true, true)))),
-                tableUpdates -> {
-                    try {
-                        LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}",
-                                tableUpdates);
+        CompletableFuture<TableUpdates> vsCf = ovsdbClient
+                .monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiVifStateDbTable + "_" + key,
+                        new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable,
+                                new MonitorRequest(new MonitorSelect(false, true, true, true)))),
+                        tableUpdates -> {
+                            try {
+                                LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}",
+                                        tableUpdates);
 
-                        List<OpensyncAPVIFState> vifsToDelete = new ArrayList<>();
-                        List<OpensyncAPVIFState> vifsToInsertOrUpdate = new ArrayList<>();
-                        for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
+                                List<OpensyncAPVIFState> vifsToDelete = new ArrayList<>();
+                                List<OpensyncAPVIFState> vifsToInsertOrUpdate = new ArrayList<>();
+                                for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
 
-                            for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+                                    for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
 
-                                if (rowUpdate.getNew() == null) {
-                                    // this is a deletion
-                                    vifsToDelete.addAll(
-                                            ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                        if (rowUpdate.getNew() == null) {
+                                            // this is a deletion
+                                            vifsToDelete.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(
+                                                    rowUpdate, key, ovsdbClient));
 
-                                } else {
-                                    // either an insert or
-                                    // mutuate/update
-                                    vifsToInsertOrUpdate.addAll(
-                                            ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                        } else {
+                                            // either an insert or
+                                            // mutuate/update
+                                            vifsToInsertOrUpdate.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(
+                                                    rowUpdate, key, ovsdbClient));
+
+                                        }
+
+                                    }
+
+                                    // delete first, if required
+                                    if (!vifsToDelete.isEmpty()) {
+                                        extIntegrationInterface.wifiVIFStateDbTableDelete(vifsToDelete, key);
+                                    }
+                                    if (!vifsToInsertOrUpdate.isEmpty()) {
+                                        extIntegrationInterface.wifiVIFStateDbTableUpdate(vifsToInsertOrUpdate,
+                                                key);
+                                    }
 
                                 }
-
+                            } catch (Exception e) {
+                                LOG.error("wifiVIFStateDbTableUpdate failed", e);
                             }
 
-                            // delete first, if required
-                            if (!vifsToDelete.isEmpty()) {
-                                extIntegrationInterface.wifiVIFStateDbTableDelete(vifsToDelete, key);
-                            }
-                            if (!vifsToInsertOrUpdate.isEmpty()) {
-                                extIntegrationInterface.wifiVIFStateDbTableUpdate(vifsToInsertOrUpdate, key);
-                            }
-
-                        }
-                    } catch (Exception e) {
-                        LOG.error("wifiVIFStateDbTableUpdate failed", e);
-                    }
-
-                });
+                        });
         vsCf.join();
 
     }
@@ -767,28 +759,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         nsCf.join();
     }
 
-    private void monitorAPCStateTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(
-                OvsdbDao.ovsdbName, OvsdbDao.apcStateDbTable + "_" + key, new MonitorRequests(ImmutableMap
-                        .of(OvsdbDao.apcStateDbTable, new MonitorRequest(new MonitorSelect(true, false, false, true)))),
-                tableUpdates -> {
-                    LOG.info(OvsdbDao.apcStateDbTable + "_" + key + " monitor callback received {}");
-                    tableUpdates.getTableUpdates().forEach((key1, value) -> {
-                        LOG.info("TableUpdate for {}", key1);
-                        value.getRowUpdates().values().forEach(r -> {
-
-                            Map<String, String> apcStateAttributes = ovsdbDao.getAPCState(r, key);
-
-                            extIntegrationInterface.apcStateDbTableUpdate(apcStateAttributes, key,
-                                    RowUpdateOperation.MODIFY);
-
-                        });
-
-                    });
-                });
-        nsCf.join();
-    }
-
     @Override
     public String closeSession(String apId) {
         OvsdbSession session = ovsdbSessionMapInterface.getSession(apId);

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java

@@ -46,8 +46,6 @@ public class OvsdbDao extends OvsdbDaoBase {
     OvsdbCommandConfig ovsdbCommand;
     @Autowired
     OvsdbNodeConfig ovsdbNodeConfig;
-    @Autowired
-    OvsdbRadiusProxyConfig ovsdbRadiusProxyConfig;
 
     public String changeRedirectorAddress(OvsdbClient ovsdbClient, String apId, String newRedirectorAddress) {
         return ovsdbNode.changeRedirectorAddress(ovsdbClient, apId, newRedirectorAddress);
@@ -88,10 +86,6 @@ public class OvsdbDao extends OvsdbDaoBase {
         ovsdbNodeConfig.configureNtpServer(ovsdbClient, opensyncAPConfig);
     }
 
-    public void configureRadsecRadiusAndRealm(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-        ovsdbRadiusProxyConfig.configureRadius(ovsdbClient, opensyncAPConfig);
-    }
-
     public void configureSsids(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
         ovsdbSsid.configureSsids(ovsdbClient, opensyncAPConfig);
     }
@@ -157,10 +151,6 @@ public class OvsdbDao extends OvsdbDaoBase {
             String key, OvsdbClient ovsdbClient) {
         return ovsdbMonitor.getOpensyncWifiAssociatedClients(rowUpdate, key, ovsdbClient);
     }
-    
-    public Map<String,String> getAPCState(RowUpdate rowUpdate, String key) {
-        return ovsdbMonitor.getAPCState(rowUpdate, key);
-    }
 
     public void getRadiusAccountingConfiguration(OpensyncAPConfig apConfig, SsidConfiguration ssidConfig,
             Map<String, String> security) {
@@ -200,10 +190,6 @@ public class OvsdbDao extends OvsdbDaoBase {
     public void removeAllStatsConfigs(OvsdbClient ovsdbClient) {
         ovsdbStats.removeAllStatsConfigs(ovsdbClient);
     }
-    
-    public void removeRadsecRadiusAndRealmConfigs(OvsdbClient ovsdbClient) {
-        ovsdbRadiusProxyConfig.removeRadiusConfigurations(ovsdbClient);
-    }
 
     public void removeWifiRrm(OvsdbClient ovsdbClient) {
         ovsdbRrm.removeWifiRrm(ovsdbClient);

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoBase.java

@@ -65,9 +65,6 @@ public class OvsdbDaoBase {
     public static final String hotspot20IconConfigDbTable = "Hotspot20_Icon_Config";
     public static final String hotspot20OsuProvidersDbTable = "Hotspot20_OSU_Providers";
     public static final String hotspot20ConfigDbTable = "Hotspot20_Config";
-    public static final String radiusConfigDbTable = "Radius_Proxy_Config";
-    public static final String apcConfigDbTable = "APC_Config";
-    public static final String apcStateDbTable = "APC_State";
     public static final String StartDebugEngineApCommand = "startPortForwardingSession";
     public static final String StopDebugEngineApCommand = "stopSession";
 
@@ -141,7 +138,7 @@ public class OvsdbDaoBase {
 
     @org.springframework.beans.factory.annotation.Value("${tip.wlan.externalFileStoreURL:https://localhost:9096}")
     String externalFileStoreURL;
-    
+
     @org.springframework.beans.factory.annotation.Value("${tip.wlan.fileStoreDirectory:/tmp/tip-wlan-filestore}")
     String fileStoreDirectoryName;
 
@@ -297,4 +294,4 @@ public class OvsdbDaoBase {
 
     }
 
-}
+}

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbGet.java

@@ -18,7 +18,6 @@ import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.Hotspot20Config;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.Hotspot20IconConfig;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.Hotspot20OsuProviders;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.NodeConfigInfo;
-import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.RadiusProxyConfigInfo;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiInetConfigInfo;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiRadioConfigInfo;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiStatsConfigInfo;
@@ -170,13 +169,4 @@ public class OvsdbGet extends OvsdbDaoBase {
         return ret;
     }
 
-    Map<String, RadiusProxyConfigInfo> getProvisionedRadiusConfigs(OvsdbClient ovsdbClient) {
-        Map<String, RadiusProxyConfigInfo> ret = new HashMap<>();
-        for (Row row : getOvsdbTableRowsForCondition(ovsdbClient, radiusConfigDbTable, null)) {
-            RadiusProxyConfigInfo radiusProxyConfigInfo = new RadiusProxyConfigInfo(row);
-            ret.put(radiusProxyConfigInfo.radiusConfigName, radiusProxyConfigInfo);
-        }
-        return ret;
-    }
-
 }

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbHotspotConfig.java

@@ -502,11 +502,9 @@ public class OvsdbHotspotConfig extends OvsdbDaoBase {
         }
 
         for (Profile ssidProfile : opensyncApConfig.getSsidProfile()) {
-            if (hs2Profile.getOsuSsidProfileId() != null) {
-                if (ssidProfile.getId() == hs2Profile.getOsuSsidProfileId()) {
-                    rowColumns.put("osu_ssid", new Atom<>(((SsidConfiguration) ssidProfile.getDetails()).getSsid()));
-                    break;
-                }
+            if (ssidProfile.getId() == hs2Profile.getOsuSsidProfileId()) {
+                rowColumns.put("osu_ssid", new Atom<>(((SsidConfiguration) ssidProfile.getDetails()).getSsid()));
+                break;
             }
         }
     }
@@ -538,46 +536,24 @@ public class OvsdbHotspotConfig extends OvsdbDaoBase {
                                 hotspotProfile, rowColumns, hs2Profile);
 
                         rowColumns.put("deauth_request_timeout", new Atom<>(hs2Profile.getDeauthRequestTimeout()));
-                        if (hs2Profile.getTermsAndConditionsFile() != null) {
-                            rowColumns.put("tos", new Atom<>(hs2Profile.getTermsAndConditionsFile().getApExportUrl()));
-                        }
+                        rowColumns.put("tos", new Atom<>(hs2Profile.getTermsAndConditionsFile().getApExportUrl()));
                         rowColumns.put("enable", new Atom<>(hs2Profile.isEnableInterworkingAndHs20()));
                         rowColumns.put("network_auth_type",
                                 new Atom<>("0" + hs2Profile.getNetworkAuthenticationType().getId()));
-                        if (hs2Profile.getGasAddr3Behaviour() != null) {
-                            rowColumns.put("gas_addr3_behavior", new Atom<>(hs2Profile.getGasAddr3Behaviour().getId()));
-                        }
+                        rowColumns.put("gas_addr3_behavior", new Atom<>(hs2Profile.getGasAddr3Behaviour().getId()));
                         rowColumns.put("operating_class", new Atom<>(hs2Profile.getOperatingClass()));
                         rowColumns.put("anqp_domain_id", new Atom<>(hs2Profile.getAnqpDomainId()));
-                        rowColumns.put("asra", new Atom<>(hs2Profile.getAdditionalStepsRequiredForAccess() == 1 ? true:false));
-                        rowColumns.put("disable_dgaf", new Atom<>(hs2Profile.isDisableDownstreamGroupAddressedForwarding()));
-                        rowColumns.put("esr", new Atom<>(hs2Profile.isEmergencyServicesReachable()));
-                        if (hs2Profile.getHessid() != null) {
-                            rowColumns.put("hessid", new Atom<>(hs2Profile.getHessid().getAddressAsString()));
-                        }
-                        rowColumns.put("internet", new Atom<>(hs2Profile.isInternetConnectivity()));
-                        if (hs2Profile.getQosMapSetConfiguration() != null) {
-                            rowColumns.put("qos_map_set", new Atom<>(String.join(",", hs2Profile.getQosMapSetConfiguration())));
-                        }
-                        rowColumns.put("uesa", new Atom<>(hs2Profile.isUnauthenticatedEmergencyServiceAccessible()));
+
                         Set<Atom<String>> connectionCapabilities = new HashSet<>();
                         hs2Profile.getConnectionCapabilitySet().stream()
-                        .forEach(c -> connectionCapabilities
-                                .add(new Atom<>(c.getConnectionCapabilitiesIpProtocol().getId() + ":"
-                                        + c.getConnectionCapabilitiesPortNumber() + ":"
-                                        + c.getConnectionCapabilitiesStatus().getId())));
+                                .forEach(c -> connectionCapabilities
+                                        .add(new Atom<>(c.getConnectionCapabilitiesIpProtocol().getId() + ":"
+                                                + c.getConnectionCapabilitiesPortNumber() + ":"
+                                                + c.getConnectionCapabilitiesStatus().getId())));
                         com.vmware.ovsdb.protocol.operation.notation.Set connectionCapabilitySet = com.vmware.ovsdb.protocol.operation.notation.Set
                                 .of(connectionCapabilities);
                         rowColumns.put("connection_capability", connectionCapabilitySet);
 
-                        // access_network_type to add when supported by AP
-                        if (ovsdbClient.getSchema(ovsdbName).get().getTables().get(hotspot20ConfigDbTable).getColumns().containsKey("access_network_type")) {
-                            if (hs2Profile.getAccessNetworkType() != null) {
-                                rowColumns.put("access_network_type", new Atom<>(hs2Profile.getAccessNetworkType().getId()));
-                            }
-                        }
-                        
-                        
                         // # format: <1-octet encoded value as hex str>
                         // # (ipv4_type & 0x3f) << 2 | (ipv6_type & 0x3) << 2
                         // 0x3f = 63 in decimal

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbMonitor.java

@@ -1,9 +1,7 @@
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
 
@@ -170,19 +168,5 @@ public class OvsdbMonitor extends OvsdbDaoBase {
         } else {
             return List.of();
         }
-    }   
-    
-    Map<String, String> getAPCState(RowUpdate rowUpdate, String apId) {
-        Map<String, String> ret = new HashMap<>();
-        if (rowUpdate.getNew() != null) {
-            Row row = rowUpdate.getNew();
-            ret.put("designatedRouterIp", getSingleValueFromSet(row, "dr_addr"));
-            ret.put("backupDesignatedRouterIp", getSingleValueFromSet(row, "bdr_addr"));
-            ret.put("enabled", getSingleValueFromSet(row, "enabled").toString());
-            ret.put("mode", getSingleValueFromSet(row, "mode"));
-        }
-        return ret;
     }
-    
 }
-

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNode.java

@@ -1,11 +1,9 @@
-
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -27,7 +25,6 @@ import com.vmware.ovsdb.protocol.operation.notation.Value;
 import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.protocol.operation.result.SelectResult;
-import com.vmware.ovsdb.protocol.schema.DatabaseSchema;
 import com.vmware.ovsdb.service.OvsdbClient;
 
 @Component
@@ -88,7 +85,8 @@ public class OvsdbNode extends OvsdbDaoBase {
             }
 
             Row row = null;
-            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult) && !((SelectResult) result[0]).getRows().isEmpty()) {
+            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult)
+                    && !((SelectResult) result[0]).getRows().isEmpty()) {
                 row = ((SelectResult) result[0]).getRows().iterator().next();
                 connectNodeInfo.lanIpV4Address = getSingleValueFromSet(row, "inet_addr");
                 connectNodeInfo.lanIfName = row.getStringColumn("if_name");
@@ -105,7 +103,8 @@ public class OvsdbNode extends OvsdbDaoBase {
 
     }
 
-    void fillInWanIpAddressAndMac(OvsdbClient ovsdbClient, ConnectNodeInfo connectNodeInfo, String ifType, String ifName) {
+    void fillInWanIpAddressAndMac(OvsdbClient ovsdbClient, ConnectNodeInfo connectNodeInfo, String ifType,
+            String ifName) {
         try {
             List<Operation> operations = new ArrayList<>();
             List<Condition> conditions = new ArrayList<>();
@@ -133,7 +132,8 @@ public class OvsdbNode extends OvsdbDaoBase {
             }
 
             Row row = null;
-            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult) && !((SelectResult) result[0]).getRows().isEmpty()) {
+            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult)
+                    && !((SelectResult) result[0]).getRows().isEmpty()) {
                 row = ((SelectResult) result[0]).getRows().iterator().next();
                 connectNodeInfo.ipV4Address = getSingleValueFromSet(row, "inet_addr");
                 connectNodeInfo.ifName = row.getStringColumn("if_name");
@@ -166,20 +166,7 @@ public class OvsdbNode extends OvsdbDaoBase {
             columns.add("platform_version");
             columns.add("revision");
             columns.add("version_matrix");
-            columns.add("id");
 
-            DatabaseSchema dbSchema = ovsdbClient.getSchema(ovsdbName).get();
-            Set<String> keys = dbSchema.getTables().get(awlanNodeDbTable).getColumns().keySet();
-            if (keys.containsAll(Set.of("reference_design", "model_description", "manufacturer_url", "manufacturer_name", "manufacturer_date",
-                    "certification_region"))) {
-                columns.addAll(Set.of("reference_design", "model_description", "manufacturer_url", "manufacturer_name", "manufacturer_date",
-                        "certification_region"));
-            }
-
-            if (keys.contains("qr_code")) {
-                columns.add("qr_code");
-            }
-            
             operations.add(new Select(awlanNodeDbTable, conditions, columns));
             CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
             OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
@@ -193,7 +180,8 @@ public class OvsdbNode extends OvsdbDaoBase {
             }
 
             Row row = null;
-            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult) && !((SelectResult) result[0]).getRows().isEmpty()) {
+            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult)
+                    && !((SelectResult) result[0]).getRows().isEmpty()) {
                 row = ((SelectResult) result[0]).getRows().iterator().next();
             }
 
@@ -211,20 +199,6 @@ public class OvsdbNode extends OvsdbDaoBase {
             ret.serialNumber = getSingleValueFromSet(row, "serial_number");
             ret.model = getSingleValueFromSet(row, "model");
 
-            if (keys.containsAll(Set.of("reference_design", "model_description", "manufacturer_url", "manufacturer_name", "manufacturer_date",
-                    "certification_region"))) {
-                    ret.referenceDesign = row.getStringColumn("reference_design");
-                    ret.modelDescription = row.getStringColumn("model_description");
-                    ret.manufacturerUrl = row.getStringColumn("manufacturer_url");
-                    ret.manufacturerName = row.getStringColumn("manufacturer_name");
-                    ret.manufacturerDate =  row.getStringColumn("manufacturer_date");
-                    ret.certificationRegion =  row.getStringColumn("certification_region");
-            }
-
-            if (keys.contains("qr_code")) {
-                ret.qrCode =  row.getMapColumn("qr_code");
-            }
-            
             // now populate macAddress, ipV4Address from Wifi_Inet_State
             // first look them up for if_name = br-wan
             fillInWanIpAddressAndMac(ovsdbClient, ret, defaultWanInterfaceType, defaultWanInterfaceName);
@@ -233,7 +207,8 @@ public class OvsdbNode extends OvsdbDaoBase {
                 fillInWanIpAddressAndMac(ovsdbClient, ret, defaultLanInterfaceType, defaultLanInterfaceName);
 
                 if (ret.ipV4Address == null) {
-                    throw new RuntimeException("Could not get inet address for Lan and Wan network interfaces. Node is not ready to connect.");
+                    throw new RuntimeException(
+                            "Could not get inet address for Lan and Wan network interfaces. Node is not ready to connect.");
                 }
             }
             fillInLanIpAddressAndMac(ovsdbClient, ret, defaultLanInterfaceType);
@@ -287,8 +262,8 @@ public class OvsdbNode extends OvsdbDaoBase {
             serialNumber = getSingleValueFromSet(row, "serial_number");
             model = getSingleValueFromSet(row, "model");
 
-            LOG.info("Redirecting AP Node: clientCn {} serialNumber {} model {} firmwareVersion {} skuNumber {}", clientCn, serialNumber, model,
-                    firmwareVersion, skuNumber);
+            LOG.info("Redirecting AP Node: clientCn {} serialNumber {} model {} firmwareVersion {} skuNumber {}",
+                    clientCn, serialNumber, model, firmwareVersion, skuNumber);
 
             // Update table AWLAN_Node - set manager_addr
             operations.clear();
@@ -318,7 +293,8 @@ public class OvsdbNode extends OvsdbDaoBase {
 
     void rebootOrResetAp(OvsdbClient ovsdbClient, String desiredApAction) {
         try {
-            LOG.debug("rebootOrResetAp on AP perform {}, setting timer for {} seconds.", desiredApAction, rebootOrResetTimerSeconds);
+            LOG.debug("rebootOrResetAp on AP perform {}, setting timer for {} seconds.", desiredApAction,
+                    rebootOrResetTimerSeconds);
             List<Operation> operations = new ArrayList<>();
             Map<String, Value> updateColumns = new HashMap<>();
             updateColumns.put("firmware_url", new Atom<>(desiredApAction));
@@ -339,8 +315,8 @@ public class OvsdbNode extends OvsdbDaoBase {
 
     }
 
-    ConnectNodeInfo updateConnectNodeInfoOnConnect(OvsdbClient ovsdbClient, String clientCn, ConnectNodeInfo incomingConnectNodeInfo,
-            boolean preventCnAlteration) {
+    ConnectNodeInfo updateConnectNodeInfoOnConnect(OvsdbClient ovsdbClient, String clientCn,
+            ConnectNodeInfo incomingConnectNodeInfo, boolean preventCnAlteration) {
         ConnectNodeInfo ret = incomingConnectNodeInfo.clone();
 
         try {
@@ -351,27 +327,9 @@ public class OvsdbNode extends OvsdbDaoBase {
             // updateColumns.put("device_mode", new Atom<String>("cloud") );
 
             // update sku_number if it was empty
-            if (( ret.skuNumber == null) || ret.skuNumber.isEmpty()  || ret.skuNumber.equals("unknown") || ret.skuNumber.startsWith("tip.wlan_")) {              
-                if ((ret.certificationRegion != null && !ret.certificationRegion.equals("unknown") ) && (ret.model != null && !ret.model.equals("unknown"))) {
-                    if (ret.model.endsWith("-" + ret.certificationRegion)) {
-                        updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model));
-                        ret.skuNumber = "TIP-" + ret.model;
-                    } else {
-                        updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model + "-" + ret.certificationRegion));
-                        ret.skuNumber = "TIP-" + ret.model + "-" + ret.certificationRegion;
-                    }
-                } else if ((ret.country != null ) && (ret.model != null && !ret.model.equals("unknown"))) {
-                    if (ret.model.endsWith("-" + ret.country)) {
-                        updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model));
-                        ret.skuNumber = "TIP-" + ret.model;
-                    } else {
-                        updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model + "-" + ret.country));
-                        ret.skuNumber = "TIP-" + ret.model + "-" + ret.country;
-                    }
-                } else if (ret.model != null && !ret.model.equals("unknown")){
-                    updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model));
-                    ret.skuNumber = "TIP-" + ret.model;
-                }
+            if ((ret.skuNumber == null) || ret.skuNumber.isEmpty()) {
+                ret.skuNumber = "tip.wlan_" + ret.serialNumber;
+                updateColumns.put("sku_number", new Atom<>(ret.skuNumber));
             }
 
             // Configure the MQTT connection
@@ -379,7 +337,8 @@ public class OvsdbNode extends OvsdbDaoBase {
             // mqtt_settings:ins:'["map",[["broker","testportal.123wlan.com"],["topics","/ap/dev-ap-0300/opensync"],["qos","0"],["port","1883"],["remote_log","1"]]]'
             Map<String, String> newMqttSettings = new HashMap<>();
             newMqttSettings.put("broker", mqttBrokerAddress);
-            String mqttClientName = OvsdbToWlanCloudTypeMappingUtility.getAlteredClientCnIfRequired(clientCn, incomingConnectNodeInfo, preventCnAlteration);
+            String mqttClientName = OvsdbToWlanCloudTypeMappingUtility.getAlteredClientCnIfRequired(clientCn,
+                    incomingConnectNodeInfo, preventCnAlteration);
             newMqttSettings.put("topics", "/ap/" + mqttClientName + "/opensync");
             newMqttSettings.put("port", "" + mqttBrokerExternalPort);
             newMqttSettings.put("compress", "zlib");
@@ -388,8 +347,8 @@ public class OvsdbNode extends OvsdbDaoBase {
 
             if ((ret.mqttSettings == null) || !ret.mqttSettings.equals(newMqttSettings)) {
                 @SuppressWarnings("unchecked")
-                com.vmware.ovsdb.protocol.operation.notation.Map<String, String> mgttSettings =
-                        com.vmware.ovsdb.protocol.operation.notation.Map.of(newMqttSettings);
+                com.vmware.ovsdb.protocol.operation.notation.Map<String, String> mgttSettings = com.vmware.ovsdb.protocol.operation.notation.Map
+                        .of(newMqttSettings);
                 ret.mqttSettings = newMqttSettings;
                 updateColumns.put("mqtt_settings", mgttSettings);
             }

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRadiusProxyConfig.java

@@ -1,139 +0,0 @@
-package com.telecominfraproject.wlan.opensync.ovsdb.dao;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
-import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
-import com.telecominfraproject.wlan.profile.network.models.RadiusProxyConfiguration;
-import com.vmware.ovsdb.exception.OvsdbClientException;
-import com.vmware.ovsdb.protocol.operation.Delete;
-import com.vmware.ovsdb.protocol.operation.Insert;
-import com.vmware.ovsdb.protocol.operation.Operation;
-import com.vmware.ovsdb.protocol.operation.Update;
-import com.vmware.ovsdb.protocol.operation.notation.Atom;
-import com.vmware.ovsdb.protocol.operation.notation.Row;
-import com.vmware.ovsdb.protocol.operation.notation.Set;
-import com.vmware.ovsdb.protocol.operation.notation.Value;
-import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
-import com.vmware.ovsdb.protocol.operation.result.OperationResult;
-import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
-import com.vmware.ovsdb.service.OvsdbClient;
-
-@Component
-public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
-
-    @Autowired
-    OvsdbGet getProvisionedData;
-
-    void configureApc(OvsdbClient ovsdbClient, Boolean enable, List<Operation> operations) {
-        try {
-            if (ovsdbClient.getSchema(ovsdbName).get().getTables().containsKey(apcConfigDbTable)) {
-                Map<String, Value> updateColumns = new HashMap<>();
-                updateColumns.put("enabled", new Atom<>(enable));
-                Row row = new Row(updateColumns);
-                Update update = new Update(apcConfigDbTable, row);
-                if (!operations.contains(update)) {
-                    // only need to do 1 update of this kind
-                    operations.add(new Update(apcConfigDbTable, row));
-                }
-            }
-        } catch (InterruptedException | ExecutionException | OvsdbClientException e) {
-            LOG.error("Exception getting schema for ovsdb.", e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    void configureRadius(OvsdbClient ovsdbClient, OpensyncAPConfig apConfig) {
-        List<Operation> operations = new ArrayList<>();
-        try {
-            if (ovsdbClient.getSchema(ovsdbName).get().getTables().containsKey(radiusConfigDbTable)) {
-                configureRadiusServers(ovsdbClient, apConfig, operations);
-            }
-        } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
-            LOG.error("Exception provisioning RadSecConfiguraitons.", e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    private void configureRadiusServers(OvsdbClient ovsdbClient, OpensyncAPConfig apConfig, List<Operation> operations)
-            throws OvsdbClientException, InterruptedException, ExecutionException, TimeoutException {
-
-        for (RadiusProxyConfiguration rsc : ((ApNetworkConfiguration) apConfig.getApProfile().getDetails())
-                .getRadiusProxyConfigurations()) {
-            Map<String, Value> updateColumns = new HashMap<>();
-            updateColumns.put("server", new Atom<>(rsc.getServer().getHostAddress()));
-            getCertificateUrls(rsc, updateColumns);
-            updateColumns.put("radius_config_name", new Atom<>(rsc.getName()));
-            updateColumns.put("passphrase", new Atom<>(rsc.getPassphrase()));          
-            updateColumns.put("port", new Atom<>(rsc.getPort()));           
-            updateColumns.put("realm", Set.of(rsc.getRealm()));
-            updateColumns.put("radsec", new Atom<>(rsc.getUseRadSec()));
-            Row row = new Row(updateColumns);
-            operations.add(new Insert(radiusConfigDbTable, row));
-        }
-
-        CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-        OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Insert into {}:", radiusConfigDbTable);
-            for (OperationResult res : result) {
-                LOG.debug("Op Result {}", res);
-            }
-        }
-    }
-
-    private void getCertificateUrls(RadiusProxyConfiguration rsc, Map<String, Value> updateColumns) {
-        String clientCertFilestoreUrl = externalFileStoreURL + rsc.getClientCert().getApExportUrl();
-        String clientKeyFilestoreUrl = externalFileStoreURL + rsc.getClientKey().getApExportUrl();
-        String caCertFilestoreUrl = externalFileStoreURL + rsc.getCaCert().getApExportUrl();
-        if (!clientCertFilestoreUrl.contains("filestore")) {
-            clientCertFilestoreUrl = externalFileStoreURL + "/filestore/" + rsc.getClientCert().getApExportUrl();
-        }
-        if (!clientKeyFilestoreUrl.contains("filestore")) {
-            clientKeyFilestoreUrl = externalFileStoreURL + "/filestore/" + rsc.getClientKey().getApExportUrl();
-        }
-        if (!caCertFilestoreUrl.contains("filestore")) {
-            caCertFilestoreUrl = externalFileStoreURL + "/filestore/" + rsc.getCaCert().getApExportUrl();
-        }           
-        updateColumns.put("client_cert", new Atom<>(clientCertFilestoreUrl));
-        updateColumns.put("client_key", new Atom<>(clientKeyFilestoreUrl));
-        updateColumns.put("ca_cert", new Atom<>(caCertFilestoreUrl));
-    }
-
-    void removeRadiusConfigurations(OvsdbClient ovsdbClient) {
-        LOG.info("removeRadiusConfigurations from {}", radiusConfigDbTable);
-        try {
-            if (ovsdbClient.getSchema(ovsdbName).get().getTables().containsKey(radiusConfigDbTable)) {
-                List<Operation> operations = new ArrayList<>();
-                operations.add(new Delete(radiusConfigDbTable));
-                CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-                OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-                for (OperationResult res : result) {
-                    LOG.info("Op Result {}", res);
-                    if (res instanceof UpdateResult) {
-                        LOG.info("removeRadiusConfigurations {}", res.toString());
-                    } else if (res instanceof ErrorResult) {
-                        LOG.error("removeRadiusConfigurations error {}", (res));
-                        throw new RuntimeException("removeRadiusConfigurations "
-                                + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
-                    }
-                }
-                LOG.info("Removed all radius and realm configurations");
-            }
-        } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
-            LOG.error("Error in removeRadiusConfigurations", e);
-            throw new RuntimeException(e);
-        }
-    }
-
-}

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRrmConfig.java

@@ -178,7 +178,11 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
         updateColumns.put("freq_band", new Atom<>(freqBand));
         updateColumns.put("backup_channel", new Atom<>(backupChannel));
 
-        updateColumns.put("mcast_rate", new Atom<>(multicastRate));
+        if (ovsdbClient.getSchema(ovsdbName).get().getTables().get(wifiRadioConfigDbTable).getColumns()
+                .containsKey("mcast_rate")) {
+
+            updateColumns.put("mcast_rate", new Atom<>(multicastRate));
+        }
 
         if (probeResponseThreshold == null || probeResponseThreshold.isAuto()) {
             updateColumns.put("probe_resp_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
@@ -192,10 +196,13 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
             updateColumns.put("client_disconnect_threshold", new Atom<>(clientDisconnectThreshold.getValue()));
         }
 
-        if (managementRate == null || managementRate == ManagementRate.auto) {
-            updateColumns.put("beacon_rate", new Atom<>(0));
-        } else {
-            updateColumns.put("beacon_rate", new Atom<>(managementRate.getId() * 10));
+        if (ovsdbClient.getSchema(ovsdbName).get().getTables().get(wifiRadioConfigDbTable).getColumns()
+                .containsKey("beacon_rate")) {
+            if (managementRate == null || managementRate == ManagementRate.auto) {
+                updateColumns.put("beacon_rate", new Atom<>(0));
+            } else {
+                updateColumns.put("beacon_rate", new Atom<>(managementRate.getId() * 10));
+            }
         }
 
         if (bestApSettings == null) {
@@ -231,7 +238,8 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
                 confirmRowExistsInTable(ovsdbClient, ((InsertResult) res).getUuid(), wifiRrmConfigDbTable);
             } else if (res instanceof ErrorResult) {
                 LOG.error("configureWifiRrm error {}", (res));
-                throw new RuntimeException("configureWifiRrm " + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
+                throw new RuntimeException(
+                        "configureWifiRrm " + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
             }
 
         }

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java

@@ -1,9 +1,37 @@
-
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
-import com.telecominfraproject.wlan.equipment.models.*;
+import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
+import com.telecominfraproject.wlan.equipment.models.NetworkForwardMode;
+import com.telecominfraproject.wlan.equipment.models.RadioConfiguration;
+import com.telecominfraproject.wlan.equipment.models.RadioMode;
+import com.telecominfraproject.wlan.equipment.models.StateSetting;
 import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiRadioConfigInfo;
@@ -27,28 +55,21 @@ import com.telecominfraproject.wlan.profile.ssid.models.NasIdType;
 import com.telecominfraproject.wlan.profile.ssid.models.NasIpType;
 import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
 import com.vmware.ovsdb.exception.OvsdbClientException;
-import com.vmware.ovsdb.protocol.operation.*;
-import com.vmware.ovsdb.protocol.operation.notation.*;
-import com.vmware.ovsdb.protocol.operation.result.*;
+import com.vmware.ovsdb.protocol.operation.Delete;
+import com.vmware.ovsdb.protocol.operation.Insert;
+import com.vmware.ovsdb.protocol.operation.Operation;
+import com.vmware.ovsdb.protocol.operation.Select;
+import com.vmware.ovsdb.protocol.operation.Update;
+import com.vmware.ovsdb.protocol.operation.notation.Atom;
+import com.vmware.ovsdb.protocol.operation.notation.Condition;
+import com.vmware.ovsdb.protocol.operation.notation.Function;
+import com.vmware.ovsdb.protocol.operation.notation.Row;
+import com.vmware.ovsdb.protocol.operation.notation.Value;
+import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
+import com.vmware.ovsdb.protocol.operation.result.OperationResult;
+import com.vmware.ovsdb.protocol.operation.result.SelectResult;
+import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
 import com.vmware.ovsdb.service.OvsdbClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.*;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
 
 @Component
 public class OvsdbSsidConfig extends OvsdbDaoBase {
@@ -59,8 +80,6 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
     OvsdbNetworkConfig networkConfig;
     @Autowired
     OvsdbNode ovsdbNode;
-    @Autowired
-    OvsdbRadiusProxyConfig radsecConfig;
 
     protected void getEnabledRadios(OvsdbClient ovsdbClient, List<RadioType> radios) {
         try {
@@ -84,26 +103,27 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 }
             }
 
-            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult) && !((SelectResult) result[0]).getRows().isEmpty()) {
+            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult)
+                    && !((SelectResult) result[0]).getRows().isEmpty()) {
 
                 for (Row row : ((SelectResult) result[0]).getRows()) {
 
                     String radioFrequencyBand = getSingleValueFromSet(row, "freq_band");
                     switch (radioFrequencyBand) {
-                        case "2.4G":
-                            radios.add(RadioType.is2dot4GHz);
-                            break;
-                        case "5G":
-                            radios.add(RadioType.is5GHz);
-                            break;
-                        case "5GL":
-                            radios.add(RadioType.is5GHzL);
-                            break;
-                        case "5GU":
-                            radios.add(RadioType.is5GHzU);
-                            break;
-                        default:
-                            LOG.debug("Unsupported or unrecognized radio band type {}", radioFrequencyBand);
+                    case "2.4G":
+                        radios.add(RadioType.is2dot4GHz);
+                        break;
+                    case "5G":
+                        radios.add(RadioType.is5GHz);
+                        break;
+                    case "5GL":
+                        radios.add(RadioType.is5GHzL);
+                        break;
+                    case "5GU":
+                        radios.add(RadioType.is5GHzU);
+                        break;
+                    default:
+                        LOG.debug("Unsupported or unrecognized radio band type {}", radioFrequencyBand);
 
                     }
 
@@ -157,7 +177,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param dtimPeriod
      * @param customOptions
      */
-    void configureCustomOptionsForDtimFragAnd80211k(boolean enable80211k, int dtimPeriod, Map<String, String> customOptions) {
+    void configureCustomOptionsForDtimFragAnd80211k(boolean enable80211k, int dtimPeriod,
+                                                    Map<String, String> customOptions) {
         customOptions.put("dtim_period", String.valueOf(dtimPeriod));
         if (enable80211k) {
             customOptions.put("ieee80211k", String.valueOf(1));
@@ -172,24 +193,18 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param radiusNasId
      * @param radiusNasIp
      * @param radiusOperatorName
-     * @param enable80211r 
      * @param customOptions
      */
-    void configureCustomOptionsForRadiusNas(OvsdbClient ovsdbClient, String radiusNasId, String radiusNasIp, String radiusOperatorName, boolean enable80211r,
-            Map<String, String> customOptions) {
+    void configureCustomOptionsForRadiusNas(OvsdbClient ovsdbClient, String radiusNasId, String radiusNasIp,
+            String radiusOperatorName, Map<String, String> customOptions) {
         ConnectNodeInfo partialConnectNode = new ConnectNodeInfo();
-        ovsdbNode.fillInWanIpAddressAndMac(ovsdbClient, partialConnectNode, defaultWanInterfaceType, defaultWanInterfaceName);
+        ovsdbNode.fillInWanIpAddressAndMac(ovsdbClient, partialConnectNode, defaultWanInterfaceType,
+                defaultWanInterfaceName);
 
         if (radiusNasId != null) {
-            if (enable80211r) {
-                LOG.info("NAS-ID is {}, 80211r is enabled, do not configure, AP will determine radius_nas_id when SSID configuration complete.", radiusNasId);
-            } else if (radiusNasId.equals(NasIdType.AP_BASE_MAC.toString())) {
-                LOG.info("NAS-ID is {}, set radius_nas_id to {}", radiusNasId, partialConnectNode.macAddress);
+            if (radiusNasId.equals(NasIdType.DEFAULT.toString())) {
                 customOptions.put("radius_nas_id", partialConnectNode.macAddress);
-            } else if (radiusNasId.equals(NasIdType.DEFAULT.toString()) || radiusNasId.equals(NasIdType.BSSID.toString())) {
-                LOG.info("NAS-ID is {}, do not configure, AP will determine radius_nas_id when SSID configuration complete.", radiusNasId);
             } else {
-                LOG.info("NAS-ID is USER_DEFINED, set radius_nas_id to provided value {}.", radiusNasId);
                 customOptions.put("radius_nas_id", radiusNasId);
             }
         }
@@ -206,9 +221,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
     }
 
     /**
-     * SSID UL/DL Limits from profile should be tagged against the client UL/DL limit
-     * ssid_ul_limit/ssid_dl_limit no longer used, set to 0 on AP to avoid unknown behaviours.
-     * 
+     *
      * @param rateLimitEnable
      * @param ssidDlLimit
      * @param ssidUlLimit
@@ -217,27 +230,22 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param rtsCtsThreshold
      * @param customOptions
      */
-    void configureCustomOptionsForRatesAndLimits(boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit,
-            int rtsCtsThreshold, Map<String, String> customOptions) {
+    void configureCustomOptionsForRatesAndLimits(boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit,
+            int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, Map<String, String> customOptions) {
         customOptions.put("rate_limit_en", rateLimitEnable ? "1" : "0");
-        customOptions.put("ssid_ul_limit", String.valueOf(0));
-        customOptions.put("ssid_dl_limit", String.valueOf(0));
-        customOptions.put("client_dl_limit", String.valueOf(ssidDlLimit * 1000));
-        customOptions.put("client_ul_limit", String.valueOf(ssidUlLimit * 1000));
+        customOptions.put("ssid_ul_limit", String.valueOf(ssidUlLimit * 1000));
+        customOptions.put("ssid_dl_limit", String.valueOf(ssidDlLimit * 1000));
+        customOptions.put("client_dl_limit", String.valueOf(clientDlLimit * 1000));
+        customOptions.put("client_ul_limit", String.valueOf(clientUlLimit * 1000));
         customOptions.put("rts_threshold", String.valueOf(rtsCtsThreshold));
     }
 
-    void configureCustomOptionsForUseRadiusProxy(boolean useRadiusProxy, Map<String, String> customOptions) {
-        customOptions.put("radproxy", useRadiusProxy ? "1" : "0");
-    }
-
     /**
      * Populate the various <K,V> fields in the custom_options column of the
      * Wifi_VIF_Config ovsdb table.
      *
      * @param ovsdbClient
      * @param enable80211k
-     * @param enable80211r TODO
      * @param rateLimitEnable
      * @param ssidDlLimit
      * @param ssidUlLimit
@@ -250,100 +258,107 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param radiusOperatorName
      * @param updateColumns
      * @param dynamicVlan
-     * @param useRadiusProxy
      */
-    void configureCustomOptionsForSsid(OvsdbClient ovsdbClient, boolean enable80211k, boolean enable80211r, boolean rateLimitEnable, int ssidDlLimit,
-            int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int dtimPeriod, String radiusNasId, String radiusNasIp,
-            String radiusOperatorName, Map<String, Value> updateColumns, int dynamicVlan, Boolean useRadiusProxy) {
+    void configureCustomOptionsForSsid(OvsdbClient ovsdbClient, boolean enable80211k, boolean rateLimitEnable,
+                                       int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold,
+                                       int dtimPeriod, String radiusNasId, String radiusNasIp, String radiusOperatorName,
+                                       Map<String, Value> updateColumns, int dynamicVlan) {
         Map<String, String> customOptions = new HashMap<>();
+        configureCustomOptionsForRatesAndLimits(rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit,
+                rtsCtsThreshold, customOptions);
 
-        configureCustomOptionsForUseRadiusProxy(useRadiusProxy, customOptions);
-
-        configureCustomOptionsForRatesAndLimits(rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, customOptions);
-
-        configureCustomOptionsForRadiusNas(ovsdbClient, radiusNasId, radiusNasIp, radiusOperatorName, enable80211r, customOptions);
+        configureCustomOptionsForRadiusNas(ovsdbClient, radiusNasId, radiusNasIp, radiusOperatorName, customOptions);
 
         configureCustomOptionsForDtimFragAnd80211k(enable80211k, dtimPeriod, customOptions);
 
         configureCustomOptionsForDynamicVlan(dynamicVlan, customOptions);
 
         @SuppressWarnings("unchecked")
-        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> customMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(customOptions);
+        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> customMap = com.vmware.ovsdb.protocol.operation.notation.Map
+                .of(customOptions);
         updateColumns.put("custom_options", customMap);
     }
 
-    void configureSingleSsid(OvsdbClient ovsdbClient, String vifInterfaceName, String ssid, boolean ssidBroadcast, Map<String, String> security, int vlanId,
-            boolean rrmEnabled, boolean enable80211r, int mobilityDomain, boolean enable80211v, boolean enable80211k, String minHwMode, boolean enabled,
-            int keyRefresh, boolean uapsdEnabled, boolean apBridge, NetworkForwardMode networkForwardMode, List<MacAddress> macBlockList,
-            boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int dtimPeriod,
-            Map<String, String> captiveMap, List<String> walledGardenAllowlist, String radiusNasId, String radiusNasIp, String radiusOperatorName,
-            String greTunnelName, int dynamicVlan, Boolean useRadiusProxy, List<Operation> operations) {
+    void configureSingleSsid(OvsdbClient ovsdbClient, String vifInterfaceName, String ssid, boolean ssidBroadcast,
+                             Map<String, String> security, int vlanId, boolean rrmEnabled, boolean enable80211r,
+                             int mobilityDomain, boolean enable80211v, boolean enable80211k, String minHwMode, boolean enabled,
+                             int keyRefresh, boolean uapsdEnabled, boolean apBridge, NetworkForwardMode networkForwardMode,
+                             List<MacAddress> macBlockList,
+                             boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit,
+                             int rtsCtsThreshold, int dtimPeriod, Map<String, String> captiveMap,
+                             List<String> walledGardenAllowlist, String radiusNasId,
+                             String radiusNasIp, String radiusOperatorName, String greTunnelName, int dynamicVlan, List<Operation> operations) {
 
         Map<String, Value> updateColumns = new HashMap<>();
-        // If we are doing a NAT SSID, no bridge, else yes
-        // If gre tunnel and vlanId > 1 use vlan if name for bridge
-        String bridgeInterfaceName = defaultWanInterfaceName;
-        if (greTunnelName != null && vlanId > 1) {
-            bridgeInterfaceName = greTunnelName + "_" + vlanId;
-        } else if (networkForwardMode == NetworkForwardMode.NAT) {
-            bridgeInterfaceName = defaultLanInterfaceName;
-        }
+            // If we are doing a NAT SSID, no bridge, else yes
+            // If gre tunnel and vlanId > 1 use vlan if name for bridge
+            String bridgeInterfaceName = defaultWanInterfaceName;
+            if (greTunnelName != null && vlanId > 1) {
+                bridgeInterfaceName = greTunnelName + "_" + vlanId;
+            } else if (networkForwardMode == NetworkForwardMode.NAT) {
+                bridgeInterfaceName = defaultLanInterfaceName;
+            }
 
-        if (vlanId > 1) {
-            updateColumns.put("vlan_id", new Atom<>(vlanId));
-        } else {
-            updateColumns.put("vlan_id", new Atom<>(1));
-        }
+            if (vlanId > 1) {
+                updateColumns.put("vlan_id", new Atom<>(vlanId));
+            } else {
+                updateColumns.put("vlan_id", new Atom<>(1));
+            }
 
-        updateColumns.put("mode", new Atom<>("ap"));
-        @SuppressWarnings("unchecked")
-        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> captivePortalMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(captiveMap);
-        updateColumns.put("captive_portal", captivePortalMap);
+            updateColumns.put("mode", new Atom<>("ap"));
+            @SuppressWarnings("unchecked")
+            com.vmware.ovsdb.protocol.operation.notation.Map<String, String> captivePortalMap = com.vmware.ovsdb.protocol.operation.notation.Map
+                    .of(captiveMap);
+            updateColumns.put("captive_portal", captivePortalMap);
 
-        if (walledGardenAllowlist != null && !walledGardenAllowlist.isEmpty()) {
-            Set<Atom<String>> atomMacList = new HashSet<>();
-            walledGardenAllowlist.forEach(allow -> atomMacList.add(new Atom<>(allow)));
-            com.vmware.ovsdb.protocol.operation.notation.Set allowListSet = com.vmware.ovsdb.protocol.operation.notation.Set.of(atomMacList);
-            updateColumns.put("captive_allowlist", allowListSet);
-        } else {
-            updateColumns.put("captive_allowlist", new com.vmware.ovsdb.protocol.operation.notation.Set());
-        }
-        updateColumns.put("bridge", new Atom<>(bridgeInterfaceName));
-        if (enable80211v) {
-            updateColumns.put("btm", new Atom<>(1));
-        } else {
-            updateColumns.put("btm", new Atom<>(0));
-        }
-        updateColumns.put("enabled", new Atom<>(enabled));
-        if (enable80211r) {
-            updateColumns.put("ft_psk", new Atom<>(1));
-            updateColumns.put("ft_mobility_domain", new Atom<>(mobilityDomain));
-        } else {
-            updateColumns.put("ft_psk", new Atom<>(0));
-            updateColumns.put("ft_mobility_domain", new com.vmware.ovsdb.protocol.operation.notation.Set());
-        }
-        updateColumns.put("if_name", new Atom<>(vifInterfaceName));
-        updateColumns.put("rrm", new Atom<>(rrmEnabled ? 1 : 0));
-        updateColumns.put("ssid", new Atom<>(ssid));
-        updateColumns.put("ssid_broadcast", new Atom<>(ssidBroadcast ? "enabled" : "disabled"));
-        updateColumns.put("uapsd_enable", new Atom<>(uapsdEnabled));
-        updateColumns.put("min_hw_mode", new Atom<>(minHwMode));
-        updateColumns.put("group_rekey", new Atom<>(keyRefresh));
-        updateColumns.put("ap_bridge", new Atom<>(apBridge));
-        @SuppressWarnings("unchecked")
-        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> securityMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(security);
-        updateColumns.put("security", securityMap);
-        configureCustomOptionsForSsid(ovsdbClient, enable80211k, enable80211r, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit,
-                rtsCtsThreshold, dtimPeriod, radiusNasId, radiusNasIp, radiusOperatorName, updateColumns, dynamicVlan, useRadiusProxy);
-        updateBlockList(updateColumns, macBlockList);
-        Row row = new Row(updateColumns);
-        operations.add(new Insert(wifiVifConfigDbTable, row));
+            if (walledGardenAllowlist != null && !walledGardenAllowlist.isEmpty()) {
+                Set<Atom<String>> atomMacList = new HashSet<>();
+                walledGardenAllowlist.forEach(allow -> atomMacList.add(new Atom<>(allow)));
+                com.vmware.ovsdb.protocol.operation.notation.Set allowListSet = com.vmware.ovsdb.protocol.operation.notation.Set
+                        .of(atomMacList);
+                updateColumns.put("captive_allowlist", allowListSet);
+            } else {
+                updateColumns.put("captive_allowlist", new com.vmware.ovsdb.protocol.operation.notation.Set());
+            }
+            updateColumns.put("bridge", new Atom<>(bridgeInterfaceName));
+            if (enable80211v) {
+                updateColumns.put("btm", new Atom<>(1));
+            } else {
+                updateColumns.put("btm", new Atom<>(0));
+            }
+            updateColumns.put("enabled", new Atom<>(enabled));
+            if (enable80211r) {
+                updateColumns.put("ft_psk", new Atom<>(1));
+                updateColumns.put("ft_mobility_domain", new Atom<>(mobilityDomain));
+            } else {
+                updateColumns.put("ft_psk", new Atom<>(0));
+                updateColumns.put("ft_mobility_domain", new com.vmware.ovsdb.protocol.operation.notation.Set());
+            }
+            updateColumns.put("if_name", new Atom<>(vifInterfaceName));
+            updateColumns.put("rrm", new Atom<>(rrmEnabled ? 1 : 0));
+            updateColumns.put("ssid", new Atom<>(ssid));
+            updateColumns.put("ssid_broadcast", new Atom<>(ssidBroadcast ? "enabled" : "disabled"));
+            updateColumns.put("uapsd_enable", new Atom<>(uapsdEnabled));
+            updateColumns.put("min_hw_mode", new Atom<>(minHwMode));
+            updateColumns.put("group_rekey", new Atom<>(keyRefresh));
+            updateColumns.put("ap_bridge", new Atom<>(apBridge));
+            @SuppressWarnings("unchecked")
+            com.vmware.ovsdb.protocol.operation.notation.Map<String, String> securityMap = com.vmware.ovsdb.protocol.operation.notation.Map
+                    .of(security);
+            updateColumns.put("security", securityMap);
+            configureCustomOptionsForSsid(ovsdbClient, enable80211k, rateLimitEnable, ssidDlLimit, ssidUlLimit,
+                    clientDlLimit, clientUlLimit, rtsCtsThreshold, dtimPeriod, radiusNasId,
+                    radiusNasIp, radiusOperatorName, updateColumns, dynamicVlan);
+            updateBlockList(updateColumns, macBlockList);
+            Row row = new Row(updateColumns);
+            operations.add(new Insert(wifiVifConfigDbTable, row));
     }
 
     void configureSsids(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
 
         boolean rrmEnabled = false;
-        if ((opensyncApConfig.getEquipmentLocation() != null) && (opensyncApConfig.getEquipmentLocation().getDetails() != null)) {
+        if ((opensyncApConfig.getEquipmentLocation() != null)
+                && (opensyncApConfig.getEquipmentLocation().getDetails() != null)) {
             rrmEnabled = opensyncApConfig.getEquipmentLocation().getDetails().isRrmEnabled();
         }
         List<MacAddress> macBlockList = opensyncApConfig.getBlockedClients();
@@ -356,7 +371,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         for (Profile ssidProfile : opensyncApConfig.getSsidProfile()) {
 
             SsidConfiguration ssidConfig = (SsidConfiguration) ssidProfile.getDetails();
-            ApElementConfiguration apElementConfig = (ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails();
+            ApElementConfiguration apElementConfig = (ApElementConfiguration) opensyncApConfig.getCustomerEquipment()
+                    .getDetails();
             RfConfiguration rfConfig = (RfConfiguration) opensyncApConfig.getRfProfile().getDetails();
 
             for (RadioType radioType : ssidConfig.getAppliedRadios()) {
@@ -389,7 +405,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                     clientUlLimit = ssidConfig.getClientBandwidthLimitUp();
                 }
 
-                Map<String, WifiRadioConfigInfo> provisionedRadioConfigs = getProvisionedData.getProvisionedWifiRadioConfigs(ovsdbClient);
+                Map<String, WifiRadioConfigInfo> provisionedRadioConfigs = getProvisionedData
+                        .getProvisionedWifiRadioConfigs(ovsdbClient);
                 String freqBand = null;
                 String ifName = null;
                 String radioName = null;
@@ -445,7 +462,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                     uapsdEnabled = radioConfiguration.getUapsdState() == StateSetting.enabled;
                     apBridge = radioConfiguration.getStationIsolation() == StateSetting.disabled; // stationIsolation
                 }
-
+                
                 String minHwMode = "11n"; // min_hw_mode is 11n
                 if (radioMode.equals(RadioMode.modeAC) && !radioType.equals(RadioType.is2dot4GHz)) {
                     minHwMode = "11ac";
@@ -468,7 +485,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 boolean enable80211k = true;
                 // off by default, only applicable for is2do4GHz
                 if ((ssidConfig.getRadioBasedConfigs() != null)
-                        && (ssidConfig.getRadioBasedConfigs().containsKey(radioType) && (ssidConfig.getRadioBasedConfigs().get(radioType) != null))) {
+                        && (ssidConfig.getRadioBasedConfigs().containsKey(radioType)
+                                && (ssidConfig.getRadioBasedConfigs().get(radioType) != null))) {
                     if (ssidConfig.getRadioBasedConfigs().get(radioType).getEnable80211r() != null) {
                         enable80211r = ssidConfig.getRadioBasedConfigs().get(radioType).getEnable80211r();
                         if (enable80211r) {
@@ -503,18 +521,21 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 int dynamicVlan = 0;
                 if (opensyncSecurityMode.endsWith("EAP")) {
                     if (ssidConfig.getRadiusClientConfiguration() != null) {
-                        radiusNasId = ssidConfig.getRadiusClientConfiguration().getNasClientId().equals(NasIdType.USER_DEFINED)
-                                ? ssidConfig.getRadiusClientConfiguration().getUserDefinedNasId()
-                                : ssidConfig.getRadiusClientConfiguration().getNasClientId().toString();
-                        radiusNasIp = ssidConfig.getRadiusClientConfiguration().getNasClientIp().equals(NasIpType.USER_DEFINED)
-                                ? ssidConfig.getRadiusClientConfiguration().getUserDefinedNasIp()
-                                : ssidConfig.getRadiusClientConfiguration().getNasClientIp().toString();
+                        radiusNasId = ssidConfig.getRadiusClientConfiguration().getNasClientId()
+                                .equals(NasIdType.USER_DEFINED)
+                                        ? ssidConfig.getRadiusClientConfiguration().getUserDefinedNasId()
+                                        : ssidConfig.getRadiusClientConfiguration().getNasClientId().toString();
+                        radiusNasIp = ssidConfig.getRadiusClientConfiguration().getNasClientIp()
+                                .equals(NasIpType.USER_DEFINED)
+                                        ? ssidConfig.getRadiusClientConfiguration().getUserDefinedNasIp()
+                                        : ssidConfig.getRadiusClientConfiguration().getNasClientIp().toString();
                         radiusOperName = ssidConfig.getRadiusClientConfiguration().getOperatorId();
                     } else {
                         radiusNasId = NasIdType.DEFAULT.toString();
                         radiusNasIp = NasIpType.WAN_IP.toString();
                     }
-                    if (ssidConfig.getForwardMode() == null || ssidConfig.getForwardMode().equals(NetworkForwardMode.BRIDGE)) {
+                    if (ssidConfig.getForwardMode() == null
+                            || ssidConfig.getForwardMode().equals(NetworkForwardMode.BRIDGE)) {
                         // get the dynamicVlan value for this ssid, when in
                         // bridge forward mode
                         // null implies bridge
@@ -532,8 +553,9 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
 
                 boolean enabled = ssidConfig.getSsidAdminState().equals(StateSetting.enabled);
                 int vlanId = ssidConfig.getVlanId() != null ? ssidConfig.getVlanId() : 1;
-                Optional<GreTunnelConfiguration> tunnelConfiguration = ((ApNetworkConfiguration) opensyncApConfig.getApProfile().getDetails())
-                        .getGreTunnelConfigurations().stream().filter(t -> t.getVlanIdsInGreTunnel().contains(vlanId)).findFirst();
+                Optional<GreTunnelConfiguration> tunnelConfiguration = ((ApNetworkConfiguration) opensyncApConfig
+                        .getApProfile().getDetails()).getGreTunnelConfigurations().stream()
+                                .filter(t -> t.getVlanIdsInGreTunnel().contains(vlanId)).findFirst();
                 String greTunnelName = null;
                 if (tunnelConfiguration.isPresent()) {
                     greTunnelName = tunnelConfiguration.get().getGreTunnelName();
@@ -546,23 +568,16 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                     interfacesPerFreqBand.put(freqBand, 1);
                 }
 
-                boolean useRadiusProxy = false;
-                if (ssidConfig.getUseRadiusProxy() != null) {
-                    useRadiusProxy = ssidConfig.getUseRadiusProxy();
-                }
                 try {
-                    configureSingleSsid(ovsdbClient, ifName, ssidConfig.getSsid(), ssidBroadcast, security, vlanId, rrmEnabled, enable80211r, mobilityDomain,
-                            enable80211v, enable80211k, minHwMode, enabled, keyRefresh, uapsdEnabled, apBridge, ssidConfig.getForwardMode(), macBlockList,
-                            rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, dtimPeriod, captiveMap,
-                            walledGardenAllowlist, radiusNasId, radiusNasIp, radiusOperName, greTunnelName, dynamicVlan, useRadiusProxy, operations);
-
-                    networkConfig.configureInetVifInterface(ovsdbClient, ifName, enabled, ssidConfig.getForwardMode(), operations);
-
-                    if (useRadiusProxy) {
-                        // make sure it's enabled if we are going to use it
-                        radsecConfig.configureApc(ovsdbClient, useRadiusProxy, operations);
-                    }
+                    configureSingleSsid(ovsdbClient, ifName, ssidConfig.getSsid(), ssidBroadcast,
+                            security, vlanId, rrmEnabled, enable80211r, mobilityDomain, enable80211v,
+                            enable80211k, minHwMode, enabled, keyRefresh, uapsdEnabled, apBridge,
+                            ssidConfig.getForwardMode(), macBlockList,
+                            rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold,
+                            dtimPeriod, captiveMap, walledGardenAllowlist,
+                            radiusNasId, radiusNasIp, radiusOperName, greTunnelName, dynamicVlan,operations);
 
+                    networkConfig.configureInetVifInterface(ovsdbClient, ifName, enabled, ssidConfig.getForwardMode(),operations );
                 } catch (IllegalStateException e) {
                     // could not provision this SSID, but still can go on
                     LOG.warn("could not provision SSID {} on {}", ssidConfig.getSsid(), freqBand);
@@ -580,14 +595,19 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         }
     }
 
-    void getBonjourGatewayConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<Short, Set<String>> bonjourServiceMap) {
-        if ((ssidConfig.getBonjourGatewayProfileId() != null) && (opensyncApConfig.getBonjourGatewayProfiles() != null)) {
+    void getBonjourGatewayConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
+            Map<Short, Set<String>> bonjourServiceMap) {
+        if ((ssidConfig.getBonjourGatewayProfileId() != null)
+                && (opensyncApConfig.getBonjourGatewayProfiles() != null)) {
             for (Profile profileBonjour : opensyncApConfig.getBonjourGatewayProfiles()) {
-                if ((ssidConfig.getBonjourGatewayProfileId() == profileBonjour.getId()) && (profileBonjour.getDetails() != null)) {
+                if ((ssidConfig.getBonjourGatewayProfileId() == profileBonjour.getId())
+                        && (profileBonjour.getDetails() != null)) {
 
-                    BonjourGatewayProfile bonjourGatewayConfiguration = (BonjourGatewayProfile) profileBonjour.getDetails();
+                    BonjourGatewayProfile bonjourGatewayConfiguration = (BonjourGatewayProfile) profileBonjour
+                            .getDetails();
 
-                    Collection<BonjourServiceSet> bonjourServicesCollection = bonjourGatewayConfiguration.getBonjourServices();
+                    Collection<BonjourServiceSet> bonjourServicesCollection = bonjourGatewayConfiguration
+                            .getBonjourServices();
                     bonjourServicesCollection.forEach(b -> {
                         Set<String> serviceSet = new HashSet<>();
                         if (bonjourServiceMap.containsKey(b.getVlanId())) {
@@ -611,15 +631,15 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      */
     String getCaptiveAuthentication(CaptivePortalAuthenticationType authentication) {
         switch (authentication) {
-            case guest:
-                return "None";
-            case username:
-                return "username";
-            case radius:
-                return "radius";
-            default:
-                LOG.error("Unsupported captive portal authentication {}", authentication);
-                return "None";
+        case guest:
+            return "None";
+        case username:
+            return "username";
+        case radius:
+            return "radius";
+        default:
+            LOG.error("Unsupported captive portal authentication {}", authentication);
+            return "None";
         }
     }
 
@@ -630,63 +650,76 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param captiveMap
      * @param walledGardenAllowlist
      */
-    void getCaptiveConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<String, String> captiveMap,
-            List<String> walledGardenAllowlist) {
+    void getCaptiveConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
+            Map<String, String> captiveMap, List<String> walledGardenAllowlist) {
         if ((ssidConfig.getCaptivePortalId() != null) && (opensyncApConfig.getCaptiveProfiles() != null)) {
             for (Profile profileCaptive : opensyncApConfig.getCaptiveProfiles()) {
-                if ((ssidConfig.getCaptivePortalId() == profileCaptive.getId()) && (profileCaptive.getDetails() != null)) {
-                    CaptivePortalConfiguration captiveProfileDetails = ((CaptivePortalConfiguration) profileCaptive.getDetails());
+                if ((ssidConfig.getCaptivePortalId() == profileCaptive.getId())
+                        && (profileCaptive.getDetails() != null)) {
+                    CaptivePortalConfiguration captiveProfileDetails = ((CaptivePortalConfiguration) profileCaptive
+                            .getDetails());
 
                     // +#define SCHEMA_CONSTS_PAGE_TITLE "page_title"
                     if (captiveProfileDetails.getBrowserTitle() != null) {
-                        captiveMap.put("session_timeout", String.valueOf(captiveProfileDetails.getSessionTimeoutInMinutes()));
+                        captiveMap.put("session_timeout",
+                                String.valueOf(captiveProfileDetails.getSessionTimeoutInMinutes()));
                         captiveMap.put("page_title", captiveProfileDetails.getBrowserTitle());
                     }
                     if (captiveProfileDetails.getAuthenticationType().equals(CaptivePortalAuthenticationType.radius)) {
-                        Optional<Profile> optional =
-                                opensyncApConfig.getRadiusProfiles().stream().filter(p -> p.getId() == captiveProfileDetails.getRadiusServiceId()).findFirst();
+                        Optional<Profile> optional = opensyncApConfig.getRadiusProfiles().stream()
+                                .filter(p -> p.getId() == captiveProfileDetails.getRadiusServiceId()).findFirst();
                         if (optional.isPresent()) {
                             Profile profile = optional.get();
                             RadiusProfile radiusProfile = (RadiusProfile) profile.getDetails();
-                            captiveMap.put("radius_server_ip", String.valueOf(radiusProfile.getPrimaryRadiusAuthServer().getIpAddress().getHostAddress()));
+                            captiveMap.put("radius_server_ip", String.valueOf(
+                                    radiusProfile.getPrimaryRadiusAuthServer().getIpAddress().getHostAddress()));
 
-                            captiveMap.put("radius_server_port", String.valueOf(radiusProfile.getPrimaryRadiusAuthServer().getPort()));
+                            captiveMap.put("radius_server_port",
+                                    String.valueOf(radiusProfile.getPrimaryRadiusAuthServer().getPort()));
 
-                            captiveMap.put("radius_server_secret", String.valueOf(radiusProfile.getPrimaryRadiusAuthServer().getSecret()));
+                            captiveMap.put("radius_server_secret",
+                                    String.valueOf(radiusProfile.getPrimaryRadiusAuthServer().getSecret()));
                             if (captiveProfileDetails.getRadiusAuthMethod() != null) {
 
-                                captiveMap.put("radius_auth_type", String.valueOf(captiveProfileDetails.getRadiusAuthMethod()));
+                                captiveMap.put("radius_auth_type",
+                                        String.valueOf(captiveProfileDetails.getRadiusAuthMethod()));
                             }
                         }
                     }
+
                     if (captiveProfileDetails.getRedirectURL() != null) {
                         captiveMap.put("redirect_url", captiveProfileDetails.getRedirectURL());
                     }
-                    captiveMap.put("session_timeout", String.valueOf(captiveProfileDetails.getSessionTimeoutInMinutes()));
+                    captiveMap.put("session_timeout",
+                            String.valueOf(captiveProfileDetails.getSessionTimeoutInMinutes()));
+
                     captiveMap.put("browser_title", captiveProfileDetails.getBrowserTitle());
                     captiveMap.put("splash_page_title", captiveProfileDetails.getHeaderContent());
                     captiveMap.put("acceptance_policy", captiveProfileDetails.getUserAcceptancePolicy());
                     captiveMap.put("login_success_text", captiveProfileDetails.getSuccessPageMarkdownText());
-                    captiveMap.put("authentication", getCaptiveAuthentication(captiveProfileDetails.getAuthenticationType()));
-                    if (captiveProfileDetails.getLogoFile() != null) {
-                        String splashLogoUrl = externalFileStoreURL + captiveProfileDetails.getLogoFile().getApExportUrl();
-                        captiveMap.put("splash_page_logo", splashLogoUrl);
-                    }
-                    if (captiveProfileDetails.getBackgroundFile() != null) {
-                        String splashBackgroundUrl = externalFileStoreURL + captiveProfileDetails.getBackgroundFile().getApExportUrl();
-                        captiveMap.put("splash_page_background_logo", splashBackgroundUrl);
+                    captiveMap.put("authentication",
+                            getCaptiveAuthentication(captiveProfileDetails.getAuthenticationType()));
+		    if (!externalFileStoreURL.endsWith("/filestore/")) {
+                        externalFileStoreURL = externalFileStoreURL + "/filestore/";
                     }
                     if (captiveProfileDetails.getAuthenticationType().equals(CaptivePortalAuthenticationType.username)) {
                         // create a user/password file for the AP to pull
-                        Path userFilepath = createCaptivePortalUserFile(captiveProfileDetails.getUserList(), profileCaptive.getId());
+                        Path userFilepath = createCaptivePortalUserFile(captiveProfileDetails.getUserList(),profileCaptive.getId());
                         ManagedFileInfo mfi = new ManagedFileInfo();
                         mfi.setFileCategory(FileCategory.UsernamePasswordList);
                         mfi.setFileType(FileType.TEXT);
                         mfi.setApExportUrl(userFilepath.getFileName().toString());
-                        String usernamePasswordFileUrl = externalFileStoreURL + mfi.getApExportUrl();
-                        captiveMap.put("username_password_file", usernamePasswordFileUrl);
+                        captiveMap
+                                .put("username_password_file", externalFileStoreURL + mfi.getApExportUrl());
+                    }
+                    if (captiveProfileDetails.getLogoFile() != null) {
+                        captiveMap.put("splash_page_logo", externalFileStoreURL +
+                                captiveProfileDetails.getLogoFile().getApExportUrl());
+                    }
+                    if (captiveProfileDetails.getBackgroundFile() != null) {
+                        captiveMap.put("splash_page_background_logo",
+                                externalFileStoreURL + captiveProfileDetails.getBackgroundFile().getApExportUrl());
                     }
-
                     LOG.debug("captiveMap {}", captiveMap);
                     walledGardenAllowlist.addAll(captiveProfileDetails.getWalledGardenAllowlist());
 
@@ -697,7 +730,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
 
     Path createCaptivePortalUserFile(List<TimedAccessUserRecord> userList, long captivePortalProfileId) {
 
-        Path path = Paths.get(fileStoreDirectoryName + File.separator + "captive-portal-users-" + captivePortalProfileId + ".txt");
+        Path path = Paths.get(
+                fileStoreDirectoryName + File.separator + "captive-portal-users-" + captivePortalProfileId + ".txt");
 
         try {
             Files.deleteIfExists(path);
@@ -705,9 +739,9 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             LOG.error("Cannot delete {}", path, e);
         }
         for (TimedAccessUserRecord userRecord : userList) {
-            byte[] bytes = ("username=" + userRecord.getUsername() + ", password=" + userRecord.getPassword() + ", firstname="
-                    + userRecord.getUserDetails().getFirstName() + ", lastname=" + userRecord.getUserDetails().getLastName() + System.lineSeparator())
-                            .getBytes();
+            byte[] bytes = ("username=" + userRecord.getUsername() + ", password=" + userRecord.getPassword()
+                    + ", firstname=" + userRecord.getUserDetails().getFirstName() + ", lastname="
+                    + userRecord.getUserDetails().getLastName() + System.lineSeparator()).getBytes();
             try {
                 Files.write(path, bytes, StandardOpenOption.APPEND);
                 LOG.debug("Successfully written data to the file {}", path);
@@ -722,7 +756,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         return path;
 
     }
-
+    
+    
     /**
      * Maps between the osvdb security definitions and the cloud's security mode
      * for the give SSID being configured.
@@ -761,75 +796,78 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         return opensyncSecurityMode;
     }
 
-    void getRadiusAccountingConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<String, String> security) {
+    void getRadiusAccountingConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
+            Map<String, String> security) {
 
-        LOG.debug("getRadiusAccountingConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig, opensyncApConfig.getRadiusProfiles());
+        LOG.debug("getRadiusAccountingConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig,
+                opensyncApConfig.getRadiusProfiles());
 
         LOG.debug("Radius Accounting Profiles {}", opensyncApConfig.getRadiusProfiles());
 
-        List<Profile> radiusProfileList =
-                opensyncApConfig.getRadiusProfiles().stream().filter(t -> t.getId() == ssidConfig.getRadiusServiceId()).collect(Collectors.toList());
+        List<Profile> radiusProfileList = opensyncApConfig.getRadiusProfiles().stream()
+                .filter(t -> t.getId() == ssidConfig.getRadiusServiceId()).collect(Collectors.toList());
 
         if (radiusProfileList.size() > 0) {
             Profile profileRadius = radiusProfileList.get(0);
             RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
             RadiusServer rServer = profileDetails.getPrimaryRadiusAccountingServer();
             if (rServer != null) {
-                if (ssidConfig.getUseRadiusProxy()) {
-                    security.put("radius_acct_ip", "127.0.0.1");
-                    security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
-                    security.put("radius_acct_secret", "secret");
-                } else {
-                    security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
-                    security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
-                    security.put("radius_acct_secret", rServer.getSecret());
-                }
-                if (ssidConfig.getRadiusAcountingServiceInterval() != null && ssidConfig.getRadiusAcountingServiceInterval() > 0) {
+                security.put("radius_acct_ip",
+                        rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
+                security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
+                security.put("radius_acct_secret", rServer.getSecret());
+                if (ssidConfig.getRadiusAcountingServiceInterval() != null) {
                     // if the value is present, use the
                     // radius_acct_interval
                     security.put("radius_acct_interval", ssidConfig.getRadiusAcountingServiceInterval().toString());
 
+                } else {
+                    LOG.info("No radius_acct_interval defined for ssid {}, Setting radius_acct_interval to 0",
+                            ssidConfig.getSsid());
+                    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"));
+                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 Accounting Server defined in Radius Profile");
             }
 
         } else {
-            LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles());
+            LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(),
+                    opensyncApConfig.getRadiusProfiles());
         }
 
     }
 
-    void getRadiusConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<String, String> security) {
+    void getRadiusConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
+            Map<String, String> security) {
 
-        LOG.debug("getRadiusConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig, opensyncApConfig.getRadiusProfiles());
+        LOG.debug("getRadiusConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig,
+                opensyncApConfig.getRadiusProfiles());
 
         LOG.debug("Radius Profiles {}", opensyncApConfig.getRadiusProfiles());
 
-        List<Profile> radiusProfileList =
-                opensyncApConfig.getRadiusProfiles().stream().filter(t -> t.getId() == ssidConfig.getRadiusServiceId()).collect(Collectors.toList());
+        List<Profile> radiusProfileList = opensyncApConfig.getRadiusProfiles().stream()
+                .filter(t -> t.getId() == ssidConfig.getRadiusServiceId()).collect(Collectors.toList());
 
         if (radiusProfileList.size() > 0) {
             Profile profileRadius = radiusProfileList.get(0);
             RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
             RadiusServer radiusServer = profileDetails.getPrimaryRadiusAuthServer();
-            if (ssidConfig.getUseRadiusProxy()) {
-                security.put("radius_server_ip", "127.0.0.1");
-                security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
-                security.put("radius_server_secret", "secret");
-            } else {
-                security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
-                security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
-                security.put("radius_server_secret", radiusServer.getSecret());
-            }
-            LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
-                    security.get("radius_server_port"), security.get("radius_server_secret"));
+            security.put("radius_server_ip",
+                    radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
+            security.put("radius_server_port",
+                    radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
+            security.put("radius_server_secret", radiusServer.getSecret());
+            LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}",
+                    security.get("radius_server_ip"), security.get("radius_server_port"),
+                    security.get("radius_server_secret"));
 
         } else {
-            LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles());
+            LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(),
+                    opensyncApConfig.getRadiusProfiles());
         }
     }
 
@@ -843,8 +881,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param ssidSecurityMode
      * @param opensyncSecurityMode
      */
-    void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<String, String> security, String ssidSecurityMode,
-            String opensyncSecurityMode) {
+    void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
+            Map<String, String> security, String ssidSecurityMode, String opensyncSecurityMode) {
         security.put("encryption", opensyncSecurityMode);
         // key and mode is N/A for OPEN security
         if (!opensyncSecurityMode.equals("OPEN")) {
@@ -914,14 +952,18 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                     LOG.info("removeAllSsids:result {}", res.toString());
                 } else if (res instanceof ErrorResult) {
                     LOG.error("removeAllSsids:result error {}", (res));
-                    throw new RuntimeException("removeAllSsids " + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
+                    throw new RuntimeException("removeAllSsids " + ((ErrorResult) res).getError() + " "
+                            + ((ErrorResult) res).getDetails());
                 }
             }
 
-            Map<String, WifiVifConfigInfo> provisionedVifConfigs = getProvisionedData.getProvisionedWifiVifConfigs(ovsdbClient);
+            Map<String, WifiVifConfigInfo> provisionedVifConfigs = getProvisionedData
+                    .getProvisionedWifiVifConfigs(ovsdbClient);
             // this should be empty
             if (!provisionedVifConfigs.isEmpty()) {
-                throw new RuntimeException("Failed to remove all vif configurations from Wifi_VIF_Config dbTable, still has " + provisionedVifConfigs.values());
+                throw new RuntimeException(
+                        "Failed to remove all vif configurations from Wifi_VIF_Config dbTable, still has "
+                                + provisionedVifConfigs.values());
             }
 
             LOG.info("Removed all ssids");
@@ -941,7 +983,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             for (MacAddress mac : macBlockList) {
                 atomMacList.add(new Atom<>(mac.getAddressAsString()));
             }
-            com.vmware.ovsdb.protocol.operation.notation.Set macListSet = com.vmware.ovsdb.protocol.operation.notation.Set.of(atomMacList);
+            com.vmware.ovsdb.protocol.operation.notation.Set macListSet = com.vmware.ovsdb.protocol.operation.notation.Set
+                    .of(atomMacList);
             updateColumns.put("mac_list", macListSet);
         } else {
             updateColumns.put("mac_list_type", new Atom<>("none"));

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/RadiusProxyConfigInfo.java

@@ -1,101 +0,0 @@
-package com.telecominfraproject.wlan.opensync.ovsdb.dao.models;
-
-import java.util.Objects;
-
-import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbDaoBase;
-import com.vmware.ovsdb.protocol.operation.notation.Row;
-import java.util.Set;
-import com.vmware.ovsdb.protocol.operation.notation.Uuid;
-
-public class RadiusProxyConfigInfo implements Cloneable {
-    
-/**
-    Column             Type
-    ------------------ ---------------------------------------------------------------
-    _version           "uuid"
-    server             "string"
-    realm              {"key":{"maxLength":256,"type":"string"},"max":16,"min":0}
-    port               "integer"
-    radsec             "boolean"
-    client_cert        {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
-    radius_config_name "string"
-    passphrase         {"key":{"maxLength":128,"type":"string"},"min":0}
-    _uuid              "uuid"
-    client_key         {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
-    ca_cert            {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
- */
-
-    public Uuid uuid;
-    public Uuid version;
-    public String server;
-    public String clientCert;
-    public String radiusConfigName;
-    public String passphrase;
-    public String clientKey;
-    public String caCert;
-    public Set<String> realm;
-    public Boolean radsec;
-    public Integer port;
-
-    public RadiusProxyConfigInfo() {
-
-    }
-
-    public RadiusProxyConfigInfo(Row row) {
-        this.uuid = row.getUuidColumn("_uuid");
-        this.version = row.getUuidColumn("_version");
-        this.server = row.getStringColumn("server");
-        this.clientCert = OvsdbDaoBase.getSingleValueFromSet(row, "client_cert");
-        this.caCert = OvsdbDaoBase.getSingleValueFromSet(row, "ca_cert");
-        this.clientKey = OvsdbDaoBase.getSingleValueFromSet(row, "client_key");
-        this.passphrase = OvsdbDaoBase.getSingleValueFromSet(row, "passphrase");
-        this.realm = row.getSetColumn("realm");
-        this.port = row.getIntegerColumn("port").intValue();
-        this.radsec = row.getBooleanColumn("radsec");
-        this.radiusConfigName = row.getStringColumn("radius_config_name");
-    }
-    
-    @Override
-    public RadiusProxyConfigInfo clone() {
-        try {
-            RadiusProxyConfigInfo ret = (RadiusProxyConfigInfo)super.clone();
-            if (realm != null) {
-                ret.realm = this.realm;
-            }
-            return ret;
-        } catch (CloneNotSupportedException e) {
-            throw new IllegalStateException("Cannot clone ", e);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(caCert, clientCert, clientKey, passphrase, port, radiusConfigName, radsec, realm, server,
-                uuid, version);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        RadiusProxyConfigInfo other = (RadiusProxyConfigInfo) obj;
-        return Objects.equals(caCert, other.caCert) && Objects.equals(clientCert, other.clientCert)
-                && Objects.equals(clientKey, other.clientKey) && Objects.equals(passphrase, other.passphrase)
-                && Objects.equals(port, other.port) && Objects.equals(radiusConfigName, other.radiusConfigName)
-                && Objects.equals(radsec, other.radsec) && Objects.equals(realm, other.realm)
-                && Objects.equals(server, other.server) && Objects.equals(uuid, other.uuid)
-                && Objects.equals(version, other.version);
-    }
-
-    @Override
-    public String toString() {
-        return "RadiusProxyConfigInfo [uuid=" + uuid + ", version=" + version + ", server=" + server + ", clientCert="
-                + clientCert + ", radiusConfigName=" + radiusConfigName + ", passphrase=" + passphrase + ", clientKey="
-                + clientKey + ", caCert=" + caCert + ", realm=" + realm + ", radsec=" + radsec + ", port=" + port + "]";
-    }
-
-}

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/metrics/OvsdbClientWithMetrics.java

@@ -1,7 +1,6 @@
 package com.telecominfraproject.wlan.opensync.ovsdb.metrics;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 import com.vmware.ovsdb.callback.LockCallback;
@@ -74,27 +73,6 @@ public class OvsdbClientWithMetrics implements OvsdbClient {
 
     public void shutdown() {
         delegate.shutdown();
-    }
+    }    
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(delegate, metrics);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == this.delegate) {
-            // in this case, we are probably handling a disconnect, so we have an OvsdbClient, but not a 'metrics' client
-            return true;
-        } 
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        OvsdbClientWithMetrics other = (OvsdbClientWithMetrics) obj;
-        return Objects.equals(delegate, other.delegate) && Objects.equals(metrics, other.metrics);
-    } 
-        
 }

opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java

@@ -1,4 +1,3 @@
-
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import static org.junit.Assert.assertNotNull;
@@ -61,16 +60,16 @@ import com.vmware.ovsdb.protocol.schema.TableSchema;
 import com.vmware.ovsdb.service.OvsdbClient;
 
 @RunWith(SpringRunner.class)
-@ActiveProfiles(profiles = {"integration_test",}) // NOTE: these profiles will
+@ActiveProfiles(profiles = { "integration_test", }) // NOTE: these profiles will
 // be ADDED to the list of
 // active profiles
 @SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = OvsdbDaoTest.class)
-@Import(
-        value = {OvsdbDao.class, OvsdbDaoTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class, OvsdbHotspotConfig.class, OvsdbCommandConfig.class,
-                OvsdbMonitor.class, OvsdbFirmwareConfig.class, OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
-                OvsdbNodeConfig.class, OvsdbRadiusProxyConfig.class
+@Import(value = { OvsdbDao.class, OvsdbDaoTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class,
+        OvsdbHotspotConfig.class, OvsdbCommandConfig.class, OvsdbMonitor.class, OvsdbFirmwareConfig.class,
+        OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
+        OvsdbNodeConfig.class
 
-        })
+})
 public class OvsdbDaoTest {
 
     static final int DEFAULT_CUSTOMER_ID = 1;
@@ -148,8 +147,6 @@ public class OvsdbDaoTest {
     OvsdbCommandConfig ovsdbCommand;
     @Autowired
     OvsdbNodeConfig ovsdbNodeConfig;
-    @Autowired
-    OvsdbRadiusProxyConfig ovsdbRadiusProxyConfig;
 
     @MockBean(answer = Answers.RETURNS_MOCKS)
     OvsdbGet ovsdbGet;
@@ -179,8 +176,9 @@ public class OvsdbDaoTest {
     @Test
     public void testConfigureGreTunnels() throws Exception {
         List<Row> rows = new ArrayList<>();
-        OperationResult[] operationResult = new OperationResult[] {new SelectResult(rows)};
-        Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList())).thenReturn(selectionFutureResult);
+        OperationResult[] operationResult = new OperationResult[] { new SelectResult(rows) };
+        Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList()))
+                .thenReturn(selectionFutureResult);
         Mockito.when(selectionFutureResult.get(30, TimeUnit.SECONDS)).thenReturn(operationResult);
         Profile apProfile = new Profile();
         apProfile.setCustomerId(2);
@@ -217,7 +215,7 @@ public class OvsdbDaoTest {
         apConfig.setEquipmentLocation(location);
         ovsdbDao.getRadiusAccountingConfiguration(apConfig, ssidConfig, security);
 
-        assertNull (security.get("radius_acct_interval"));
+        assert (security.get("radius_acct_interval").equals("60"));
         assert (security.get("radius_acct_ip").equals("192.168.0.1"));
         assert (security.get("radius_acct_port").equals("1813"));
         assert (security.get("radius_acct_secret").equals("secret"));
@@ -251,21 +249,25 @@ public class OvsdbDaoTest {
         passpointVenueProfile.setId(VENUE_ID);
         Profile hotspot20IdProviderProfile = new Profile();
         hotspot20IdProviderProfile.setId(HOTSPOT_PROVIDER_ID_1);
-        hotspot20IdProviderProfile = OvsdbDaoTestUtilities.createPasspointIdProviderProfile(DEFAULT_CUSTOMER_ID, hotspot20IdProviderProfile,
-                "TipWlan-Hotspot20-OSU-Provider", "Rogers AT&T Wireless", "Canada", "ca", 302, 720, "rogers.com", 1);
+        hotspot20IdProviderProfile = OvsdbDaoTestUtilities.createPasspointIdProviderProfile(DEFAULT_CUSTOMER_ID,
+                hotspot20IdProviderProfile, "TipWlan-Hotspot20-OSU-Provider", "Rogers AT&T Wireless", "Canada", "ca",
+                302, 720, "rogers.com", 1);
         Profile hotspot20IdProviderProfile2 = new Profile();
         hotspot20IdProviderProfile2.setId(HOTSPOT_PROVIDER_ID_2);
-        hotspot20IdProviderProfile2 = OvsdbDaoTestUtilities.createPasspointIdProviderProfile(DEFAULT_CUSTOMER_ID, hotspot20IdProviderProfile2,
-                "TipWlan-Hotspot20-OSU-Provider-2", "Telus Mobility", "Canada", "ca", 302, 220, "telus.com", 1);
+        hotspot20IdProviderProfile2 = OvsdbDaoTestUtilities.createPasspointIdProviderProfile(DEFAULT_CUSTOMER_ID,
+                hotspot20IdProviderProfile2, "TipWlan-Hotspot20-OSU-Provider-2", "Telus Mobility", "Canada", "ca", 302,
+                220, "telus.com", 1);
 
         profileSsidOsu.getChildProfileIds().add(hotspot20IdProviderProfile.getId());
         profileSsidOsu.getChildProfileIds().add(hotspot20IdProviderProfile2.getId());
 
-        Profile passpointHotspotConfig = OvsdbDaoTestUtilities.createPasspointHotspotConfig(DEFAULT_CUSTOMER_ID, hotspot20IdProviderProfile2,
-                hotspot20IdProviderProfile, passpointOperatorProfile, passpointVenueProfile, profileSsidPsk, profileSsidOsu);
+        Profile passpointHotspotConfig = OvsdbDaoTestUtilities.createPasspointHotspotConfig(DEFAULT_CUSTOMER_ID,
+                hotspot20IdProviderProfile2, hotspot20IdProviderProfile, passpointOperatorProfile,
+                passpointVenueProfile, profileSsidPsk, profileSsidOsu);
         passpointHotspotConfig.setId(HOTSPOT_CONFIG_ID);
 
-        Profile hotspotProfileAp = OvsdbDaoTestUtilities.createPasspointApProfile(DEFAULT_CUSTOMER_ID, profileSsidPsk, profileSsidOsu);
+        Profile hotspotProfileAp = OvsdbDaoTestUtilities.createPasspointApProfile(DEFAULT_CUSTOMER_ID, profileSsidPsk,
+                profileSsidOsu);
         hotspotProfileAp.setId(EQUIPMENT_AP_ID);
 
         hsConfig.setHotspot20OperatorSet(Set.of(passpointOperatorProfile));
@@ -279,12 +281,14 @@ public class OvsdbDaoTest {
 
         apConfig.setSsidProfile(List.of(profileSsidOsu, profileSsidPsk));
 
-        Mockito.when(futureResult.get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS))).thenReturn(OvsdbDaoTestUtilities.hs20IconRows())
-                .thenReturn(OvsdbDaoTestUtilities.hs20InsertIconRows()).thenReturn(OvsdbDaoTestUtilities.hs20OsuProviders())
-                .thenReturn(OvsdbDaoTestUtilities.hs20IconRows()).thenReturn(OvsdbDaoTestUtilities.hs20IconRows())
-                .thenReturn(OvsdbDaoTestUtilities.hs20InsertProviderRows()).thenReturn(OvsdbDaoTestUtilities.hs20Config())
-                .thenReturn(OvsdbDaoTestUtilities.hs20OsuProviders()).thenReturn(OvsdbDaoTestUtilities.vifConfigRows())
-                .thenReturn(OvsdbDaoTestUtilities.vifConfigRows()).thenReturn(OvsdbDaoTestUtilities.hs20Config());
+        Mockito.when(futureResult.get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS)))
+                .thenReturn(OvsdbDaoTestUtilities.hs20IconRows()).thenReturn(OvsdbDaoTestUtilities.hs20InsertIconRows())
+                .thenReturn(OvsdbDaoTestUtilities.hs20OsuProviders()).thenReturn(OvsdbDaoTestUtilities.hs20IconRows())
+                .thenReturn(OvsdbDaoTestUtilities.hs20IconRows())
+                .thenReturn(OvsdbDaoTestUtilities.hs20InsertProviderRows())
+                .thenReturn(OvsdbDaoTestUtilities.hs20Config()).thenReturn(OvsdbDaoTestUtilities.hs20OsuProviders())
+                .thenReturn(OvsdbDaoTestUtilities.vifConfigRows()).thenReturn(OvsdbDaoTestUtilities.vifConfigRows())
+                .thenReturn(OvsdbDaoTestUtilities.hs20Config());
 
         Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList())).thenReturn(futureResult);
 
@@ -346,12 +350,275 @@ public class OvsdbDaoTest {
 
     }
 
+    @Test
+    public void testGetConnectNodeInfo() throws Exception {
+
+        Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList())).thenReturn(futureResult);
+
+        java.util.Map<String, Value> awlanColumns = new HashMap<>();
+        awlanColumns.put("mqtt_settings", com.vmware.ovsdb.protocol.operation.notation.Map
+                .of(ImmutableMap.of("broker", "192.168.1.101", "port", "1883")));
+        awlanColumns.put("redirector_addr", Atom.string(REDIRECT_ADDR));
+        awlanColumns.put("manager_addr", Atom.string(MGR_ADDR));
+        awlanColumns.put("platform_version", Atom.string(PLATFORM_VERSION));
+        awlanColumns.put("firmware_version", Atom.string(FW_VERSION));
+        awlanColumns.put("revision", Atom.string(REVISION));
+        awlanColumns.put("sku_number", Atom.string(SKU_NUMBER));
+        awlanColumns.put("serial_number", Atom.string(SERIAL_NUM));
+        awlanColumns.put("model", Atom.string(MODEL));
+        Row awlanRow = new Row(awlanColumns);
+
+        List<Row> awlanRows = ImmutableList.of(awlanRow);
+
+        OperationResult[] awlanResult = new OperationResult[] { new SelectResult(awlanRows) };
+
+        java.util.Map<String, Value> inetWanColumns = new HashMap<>();
+        inetWanColumns.put("inet_addr", Atom.string(WAN_IP));
+        inetWanColumns.put("hwaddr", Atom.string(WAN_MAC));
+        inetWanColumns.put("if_name", Atom.string(WAN_IF_NAME));
+        inetWanColumns.put("if_type", Atom.string(WAN_IF_TYPE));
+
+        Row inetWanRow = new Row(inetWanColumns);
+
+        List<Row> inetWanRows = ImmutableList.of(inetWanRow);
+
+        OperationResult[] inetWanResult = new OperationResult[] { new SelectResult(inetWanRows) };
+
+        java.util.Map<String, Value> inetLanColumns = new HashMap<>();
+        inetLanColumns.put("inet_addr", Atom.string(LAN_IP));
+        inetLanColumns.put("hwaddr", Atom.string(LAN_MAC));
+        inetLanColumns.put("if_name", Atom.string(LAN_IF_NAME));
+        inetLanColumns.put("if_type", Atom.string(LAN_IF_TYPE));
+
+        Row inetLanRow = new Row(inetLanColumns);
+
+        List<Row> inetLanRows = ImmutableList.of(inetLanRow);
+
+        OperationResult[] inetLanResult = new OperationResult[] { new SelectResult(inetLanRows) };
+
+        java.util.Map<String, Value> wifiRadioStateColumns = new HashMap<>();
+        wifiRadioStateColumns.put("freq_band", Atom.string("2.4G"));
+        wifiRadioStateColumns.put("if_name", Atom.string("home-ap-24"));
+        Row wifiRadioStateRow = new Row(wifiRadioStateColumns);
+
+        java.util.Map<String, Value> wifiRadioStateColumns2 = new HashMap<>();
+        wifiRadioStateColumns2.put("freq_band", Atom.string("5GL"));
+        wifiRadioStateColumns2.put("if_name", Atom.string("home-ap-l50"));
+        Row wifiRadioStateRow2 = new Row(wifiRadioStateColumns2);
+
+        java.util.Map<String, Value> wifiRadioStateColumns3 = new HashMap<>();
+        wifiRadioStateColumns3.put("freq_band", Atom.string("5GU"));
+        wifiRadioStateColumns3.put("if_name", Atom.string("home-ap-u50"));
+        Row wifiRadioStateRow3 = new Row(wifiRadioStateColumns3);
+
+        List<Row> wifiRadioStateRows = ImmutableList.of(wifiRadioStateRow, wifiRadioStateRow2, wifiRadioStateRow3);
+
+        OperationResult[] wifiRadioStateResult = new OperationResult[] { new SelectResult(wifiRadioStateRows) };
+
+        Mockito.when(futureResult.get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS))).thenReturn(awlanResult)
+                .thenReturn(inetWanResult).thenReturn(inetLanResult).thenReturn(wifiRadioStateResult);
+
+        ConnectNodeInfo connectNodeInfo = ovsdbDao.getConnectNodeInfo(ovsdbClient);
+
+        assertNotNull(connectNodeInfo);
+        assert (connectNodeInfo.wifiRadioStates.entrySet().size() == 3);
+        assert (connectNodeInfo.firmwareVersion.equals(FW_VERSION));
+        assert (connectNodeInfo.redirectorAddr.equals(REDIRECT_ADDR));
+        assert (connectNodeInfo.ipV4Address.equals(WAN_IP));
+
+        assert (connectNodeInfo.lanIfName.equals(LAN_IF_NAME));
+        assert (connectNodeInfo.ifName.equals(WAN_IF_NAME));
+
+        Mockito.verify(ovsdbClient, Mockito.times(4)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
+
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void testFailGetConnectNodeInfo() throws Exception {
+
+        Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList())).thenReturn(futureResult);
+
+        java.util.Map<String, Value> awlanColumns = new HashMap<>();
+        awlanColumns.put("mqtt_settings", com.vmware.ovsdb.protocol.operation.notation.Map
+                .of(ImmutableMap.of("broker", "192.168.1.101", "port", "1883")));
+        awlanColumns.put("redirector_addr", Atom.string(REDIRECT_ADDR));
+        awlanColumns.put("manager_addr", Atom.string(MGR_ADDR));
+        awlanColumns.put("platform_version", Atom.string(PLATFORM_VERSION));
+        awlanColumns.put("firmware_version", Atom.string(FW_VERSION));
+        awlanColumns.put("revision", Atom.string(REVISION));
+        awlanColumns.put("sku_number", Atom.string(SKU_NUMBER));
+        awlanColumns.put("serial_number", Atom.string(SERIAL_NUM));
+        awlanColumns.put("model", Atom.string(MODEL));
+        Row awlanRow = new Row(awlanColumns);
+
+        List<Row> awlanRows = ImmutableList.of(awlanRow);
+
+        OperationResult[] awlanResult = new OperationResult[] { new SelectResult(awlanRows) };
+        java.util.Map<String, Value> inetWanColumns = new HashMap<>();
+        inetWanColumns.put("inet_addr", Atom.string(WAN_IP));
+        inetWanColumns.put("hwaddr", Atom.string(WAN_MAC));
+        inetWanColumns.put("if_name", Atom.string(WAN_IF_NAME));
+        inetWanColumns.put("if_type", Atom.string(WAN_IF_TYPE));
+
+        Row inetWanRow = new Row(inetWanColumns);
+
+        List<Row> inetWanRows = ImmutableList.of(inetWanRow);
+
+        OperationResult[] inetWanResult = new OperationResult[] { new SelectResult(inetWanRows) };
+
+        OperationResult[] errorResult = new OperationResult[] { new ErrorResult("Error", "Error") };
+
+        java.util.Map<String, Value> inetLanColumns = new HashMap<>();
+        inetLanColumns.put("inet_addr", Atom.string(LAN_IP));
+        inetLanColumns.put("hwaddr", Atom.string(LAN_MAC));
+        inetLanColumns.put("if_name", Atom.string(LAN_IF_NAME));
+        inetLanColumns.put("if_type", Atom.string(LAN_IF_TYPE));
+
+        Row inetLanRow = new Row(inetLanColumns);
+
+        List<Row> inetLanRows = ImmutableList.of(inetLanRow);
+
+        OperationResult[] inetLanResult = new OperationResult[] { new SelectResult(inetLanRows) };
+
+        java.util.Map<String, Value> wifiRadioStateColumns = new HashMap<>();
+        wifiRadioStateColumns.put("freq_band", Atom.string("2.4G"));
+        wifiRadioStateColumns.put("if_name", Atom.string("home-ap-24"));
+        Row wifiRadioStateRow = new Row(wifiRadioStateColumns);
+
+        java.util.Map<String, Value> wifiRadioStateColumns2 = new HashMap<>();
+        wifiRadioStateColumns2.put("freq_band", Atom.string("5GL"));
+        wifiRadioStateColumns2.put("if_name", Atom.string("home-ap-l50"));
+        Row wifiRadioStateRow2 = new Row(wifiRadioStateColumns2);
+
+        java.util.Map<String, Value> wifiRadioStateColumns3 = new HashMap<>();
+        wifiRadioStateColumns3.put("freq_band", Atom.string("5GU"));
+        wifiRadioStateColumns3.put("if_name", Atom.string("home-ap-u50"));
+        Row wifiRadioStateRow3 = new Row(wifiRadioStateColumns3);
+
+        List<Row> wifiRadioStateRows = ImmutableList.of(wifiRadioStateRow, wifiRadioStateRow2, wifiRadioStateRow3);
+
+        OperationResult[] wifiRadioStateResult = new OperationResult[] { new SelectResult(wifiRadioStateRows) };
+
+        // No 'WAN' for this test, will have an ERROR
+        Mockito.when(futureResult.get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS))).thenReturn(awlanResult)
+                .thenReturn(errorResult).thenReturn(errorResult).thenReturn(inetLanResult)
+                .thenReturn(wifiRadioStateResult);
+        ConnectNodeInfo connectNodeInfo = ovsdbDao.getConnectNodeInfo(ovsdbClient);
+        assertNotNull(connectNodeInfo.firmwareVersion);
+        assertNotNull(connectNodeInfo.model);
+        assertNotNull(connectNodeInfo.skuNumber);
+        assertNotNull(connectNodeInfo.platformVersion);
+        assertNotNull(connectNodeInfo.serialNumber);
+        assertNotNull(connectNodeInfo.mqttSettings);
+        assertNotNull(connectNodeInfo.redirectorAddr);
+        assertNotNull(connectNodeInfo.managerAddr);
+
+        assertNull(connectNodeInfo.ifName);
+        assertNull(connectNodeInfo.ifType);
+        assertNull(connectNodeInfo.ipV4Address);
+        assertNull(connectNodeInfo.macAddress);
+
+        assertNotNull(connectNodeInfo.lanIfName);
+        assertNotNull(connectNodeInfo.lanIfType);
+        assertNotNull(connectNodeInfo.lanIpV4Address);
+        assertNotNull(connectNodeInfo.lanMacAddress);
+
+        assert (connectNodeInfo.wifiRadioStates.entrySet().size() == 3);
+        Mockito.verify(ovsdbClient, Mockito.times(5)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
+        Mockito.clearInvocations(ovsdbClient);
+
+        // No 'LAN' for this test, will have an ERROR
+        Mockito.when(futureResult.get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS))).thenReturn(awlanResult)
+                .thenReturn(inetWanResult).thenReturn(errorResult).thenReturn(wifiRadioStateResult);
+        connectNodeInfo = ovsdbDao.getConnectNodeInfo(ovsdbClient);
+        assertNotNull(connectNodeInfo.firmwareVersion);
+        assertNotNull(connectNodeInfo.model);
+        assertNotNull(connectNodeInfo.skuNumber);
+        assertNotNull(connectNodeInfo.platformVersion);
+        assertNotNull(connectNodeInfo.serialNumber);
+        assertNotNull(connectNodeInfo.mqttSettings);
+        assertNotNull(connectNodeInfo.redirectorAddr);
+        assertNotNull(connectNodeInfo.managerAddr);
+
+        assertNotNull(connectNodeInfo.ifName);
+        assertNotNull(connectNodeInfo.ifType);
+        assertNotNull(connectNodeInfo.ipV4Address);
+        assertNotNull(connectNodeInfo.macAddress);
+
+        assertNull(connectNodeInfo.lanIfName);
+        assertNull(connectNodeInfo.lanIfType);
+        assertNull(connectNodeInfo.lanIpV4Address);
+        assertNull(connectNodeInfo.lanMacAddress);
+
+        assert (connectNodeInfo.wifiRadioStates.entrySet().size() == 3);
+        Mockito.verify(ovsdbClient, Mockito.times(4)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
+        Mockito.clearInvocations(ovsdbClient);
+
+        // No 'Wifi_Radio_State data' for this test, will have an ERROR
+        Mockito.when(futureResult.get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS))).thenReturn(awlanResult)
+                .thenReturn(inetWanResult).thenReturn(inetLanResult).thenReturn(errorResult);
+        connectNodeInfo = ovsdbDao.getConnectNodeInfo(ovsdbClient);
+
+        assertNotNull(connectNodeInfo.firmwareVersion);
+        assertNotNull(connectNodeInfo.model);
+        assertNotNull(connectNodeInfo.skuNumber);
+        assertNotNull(connectNodeInfo.platformVersion);
+        assertNotNull(connectNodeInfo.serialNumber);
+        assertNotNull(connectNodeInfo.mqttSettings);
+        assertNotNull(connectNodeInfo.redirectorAddr);
+        assertNotNull(connectNodeInfo.managerAddr);
+
+        assertNotNull(connectNodeInfo.ifName);
+        assertNotNull(connectNodeInfo.ifType);
+        assertNotNull(connectNodeInfo.ipV4Address);
+        assertNotNull(connectNodeInfo.macAddress);
+
+        assertNotNull(connectNodeInfo.lanIfName);
+        assertNotNull(connectNodeInfo.lanIfType);
+        assertNotNull(connectNodeInfo.lanIpV4Address);
+        assertNotNull(connectNodeInfo.lanMacAddress);
+
+        assert (connectNodeInfo.wifiRadioStates.isEmpty());
+
+        Mockito.verify(ovsdbClient, Mockito.times(4)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
+        Mockito.clearInvocations(ovsdbClient);
+
+        // No 'AWLAN_Node data' for this test, will have an ERROR
+        Mockito.when(futureResult.get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS))).thenReturn(errorResult)
+                .thenReturn(inetWanResult).thenReturn(inetLanResult).thenReturn(wifiRadioStateResult);
+        connectNodeInfo = ovsdbDao.getConnectNodeInfo(ovsdbClient);
+        assertNull(connectNodeInfo.firmwareVersion);
+        assertNull(connectNodeInfo.model);
+        assertNull(connectNodeInfo.skuNumber);
+        assertNull(connectNodeInfo.platformVersion);
+        assertNull(connectNodeInfo.serialNumber);
+        assertNull(connectNodeInfo.mqttSettings);
+        assertNull(connectNodeInfo.redirectorAddr);
+        assertNull(connectNodeInfo.managerAddr);
+
+        assertNotNull(connectNodeInfo.ifName);
+        assertNotNull(connectNodeInfo.ifType);
+        assertNotNull(connectNodeInfo.ipV4Address);
+        assertNotNull(connectNodeInfo.macAddress);
+
+        assertNotNull(connectNodeInfo.lanIfName);
+        assertNotNull(connectNodeInfo.lanIfType);
+        assertNotNull(connectNodeInfo.lanIpV4Address);
+        assertNotNull(connectNodeInfo.lanMacAddress);
+
+        assert (connectNodeInfo.wifiRadioStates.entrySet().size() == 3);
+
+        Mockito.verify(ovsdbClient, Mockito.times(4)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
+        Mockito.clearInvocations(ovsdbClient);
+
+    }
+
     @Test
     public void testObsdbDaoEnableNetworkProbe() throws Exception {
 
         Uuid rowUuid = Uuid.of(UUID.randomUUID());
 
-        OperationResult[] wifiStatsConfigEnableNetworkProbe = new OperationResult[] {new InsertResult(rowUuid)};
+        OperationResult[] wifiStatsConfigEnableNetworkProbe = new OperationResult[] { new InsertResult(rowUuid) };
 
         Mockito.when(futureResult.get(30L, TimeUnit.SECONDS)).thenReturn(wifiStatsConfigEnableNetworkProbe);
 
@@ -366,8 +633,9 @@ public class OvsdbDaoTest {
     @Test
     public void testObsdbDaoEnableNetworkProbeError() throws Exception {
 
-        OperationResult[] wifiStatsConfigEnableNetworkProbeFail = new OperationResult[] {new ErrorResult("constraint violation",
-                "network_probe is not one of the allowed values ([capacity, client, device, essid, neighbor, quality, radio, rssi, steering, survey])")};
+        OperationResult[] wifiStatsConfigEnableNetworkProbeFail = new OperationResult[] { new ErrorResult(
+                "constraint violation",
+                "network_probe is not one of the allowed values ([capacity, client, device, essid, neighbor, quality, radio, rssi, steering, survey])") };
 
         Mockito.when(futureResult.get(30L, TimeUnit.SECONDS)).thenReturn(wifiStatsConfigEnableNetworkProbeFail);
 
@@ -382,16 +650,19 @@ public class OvsdbDaoTest {
     @Test
     public void testProcessNewChannelsRequest() throws Exception {
 
-        OperationResult[] testProcessNewChannelsRequestResult = new OperationResult[] {new UpdateResult(1), new UpdateResult(1), new UpdateResult(1),
-                new UpdateResult(1), new UpdateResult(1), new UpdateResult(1)};
+        OperationResult[] testProcessNewChannelsRequestResult = new OperationResult[] { new UpdateResult(1),
+                new UpdateResult(1), new UpdateResult(1), new UpdateResult(1), new UpdateResult(1),
+                new UpdateResult(1) };
 
         Mockito.when(futureResult.get(30L, TimeUnit.SECONDS)).thenReturn(testProcessNewChannelsRequestResult);
 
         Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList())).thenReturn(futureResult);
 
         ovsdbDao.processNewChannelsRequest(ovsdbClient,
-                Map.of(RadioType.is2dot4GHz, Integer.valueOf(1), RadioType.is5GHzL, Integer.valueOf(40), RadioType.is5GHzU, Integer.valueOf(153)),
-                Map.of(RadioType.is2dot4GHz, Integer.valueOf(6), RadioType.is5GHzL, Integer.valueOf(36), RadioType.is5GHzU, Integer.valueOf(149)));
+                Map.of(RadioType.is2dot4GHz, Integer.valueOf(1), RadioType.is5GHzL, Integer.valueOf(40),
+                        RadioType.is5GHzU, Integer.valueOf(153)),
+                Map.of(RadioType.is2dot4GHz, Integer.valueOf(6), RadioType.is5GHzL, Integer.valueOf(36),
+                        RadioType.is5GHzU, Integer.valueOf(149)));
 
         Mockito.verify(futureResult).get(30L, TimeUnit.SECONDS);
 
@@ -400,7 +671,8 @@ public class OvsdbDaoTest {
     @Test(expected = RuntimeException.class)
     public void testObsdbDaoEnableNetworkProbeException() throws Exception {
 
-        Mockito.when(futureResult.get(30L, TimeUnit.SECONDS)).thenThrow(new OvsdbClientException("OvsdbClientException"));
+        Mockito.when(futureResult.get(30L, TimeUnit.SECONDS))
+                .thenThrow(new OvsdbClientException("OvsdbClientException"));
 
         Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList())).thenReturn(futureResult);
 

opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNodeTest.java

@@ -36,7 +36,7 @@ import com.vmware.ovsdb.service.OvsdbClient;
 @Import(value = { OvsdbDao.class, OvsdbNodeTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class,
         OvsdbHotspotConfig.class, OvsdbCommandConfig.class, OvsdbMonitor.class, OvsdbFirmwareConfig.class,
         OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
-        OvsdbNodeConfig.class,OvsdbRadiusProxyConfig.class
+        OvsdbNodeConfig.class
 
 })
 public class OvsdbNodeTest {
@@ -77,8 +77,6 @@ public class OvsdbNodeTest {
     OvsdbCommandConfig ovsdbCommand;
     @Autowired
     OvsdbNodeConfig ovsdbNodeConfig;
-    @Autowired
-    OvsdbRadiusProxyConfig ovsdbRadiusProxyConfig;
     @MockBean(answer = Answers.RETURNS_MOCKS)
     OvsdbGet ovsdbGet;
 
@@ -112,7 +110,6 @@ public class OvsdbNodeTest {
         connectNodeInfo.lanIfName = "lan";
         connectNodeInfo.lanIfType = "bridge";
         connectNodeInfo.serialNumber = "0123456789";
-        connectNodeInfo.model = "EA8300-CA";
 
         Map<String, String> newMqttSettings = new HashMap<>();
         newMqttSettings.put("broker", ovsdbNode.mqttBrokerAddress);
@@ -127,7 +124,7 @@ public class OvsdbNodeTest {
         ConnectNodeInfo newConnectNodeInfo = ovsdbNode.updateConnectNodeInfoOnConnect(ovsdbClient, "AP-1",
                 connectNodeInfo, false);
         assert (connectNodeInfo.ifName.equals(newConnectNodeInfo.ifName));
-        assert (newConnectNodeInfo.skuNumber.equals("TIP-" + connectNodeInfo.model));
+        assert (newConnectNodeInfo.skuNumber.equals("tip.wlan_" + connectNodeInfo.serialNumber));
         assert (newConnectNodeInfo.mqttSettings.equals(newMqttSettings));
     }
 

opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfigTest.java

@@ -41,7 +41,7 @@ import com.vmware.ovsdb.service.OvsdbClient;
 @Import(value = { OvsdbDao.class, OvsdbSsidConfigTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class,
         OvsdbHotspotConfig.class, OvsdbCommandConfig.class, OvsdbMonitor.class, OvsdbFirmwareConfig.class,
         OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
-        OvsdbNodeConfig.class,OvsdbRadiusProxyConfig.class
+        OvsdbNodeConfig.class
 
 })
 public class OvsdbSsidConfigTest {
@@ -82,8 +82,7 @@ public class OvsdbSsidConfigTest {
     OvsdbCommandConfig ovsdbCommand;
     @Autowired
     OvsdbNodeConfig ovsdbNodeConfig;
-    @Autowired
-    OvsdbRadiusProxyConfig ovsdbRadiusProxyConfig;
+
     @MockBean(answer = Answers.RETURNS_MOCKS)
     OvsdbGet ovsdbGet;