WIFI-1669: propagations

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

opensync-ext-cloud/pom.xml

@@ -4,136 +4,136 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-ext-cloud</artifactId>
 	<name>opensync-ext-cloud</name>
 	<description>Configuration interface that provides config from the cloud services.</description>
 	<dependencies>
-		<dependency>
+<!-- 		<dependency> -->
-			<groupId>com.telecominfraproject.wlan</groupId>
+<!-- 			<groupId>com.telecominfraproject.wlan</groupId> -->
-			<artifactId>opensync-ext-interface</artifactId>
+<!-- 			<artifactId>opensync-ext-interface</artifactId> -->
-			<version>1.3.0-SNAPSHOT</version>
+<!-- 			<version>0.0.1-SNAPSHOT</version> -->
-		</dependency>
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
  	 
         <dependency>
             <artifactId>base-client</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
       <dependency>
         <artifactId>equipment-gateway-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>
      
       <dependency>
         <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>profile-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>portal-user-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>service-metric-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>status-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
  
        <dependency>
         <artifactId>firmware-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>manufacturer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>      
  
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>     
 
 	</dependencies>

opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/controller/OpensyncCloudGatewayController.java

@@ -1,4 +1,3 @@
-
 package com.telecominfraproject.wlan.opensync.external.integration.controller;
 
 import java.util.ArrayList;
@@ -25,7 +24,6 @@ import org.springframework.security.web.bind.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.telecominfraproject.wlan.core.client.PingClient;
@@ -34,7 +32,6 @@ import com.telecominfraproject.wlan.core.model.service.GatewayType;
 import com.telecominfraproject.wlan.core.model.service.ServiceInstanceInformation;
 import com.telecominfraproject.wlan.core.server.container.ConnectorProperties;
 import com.telecominfraproject.wlan.datastore.exceptions.DsEntityNotFoundException;
-import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWBaseCommand;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWBlinkRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWChangeRedirectorHost;
@@ -45,13 +42,11 @@ import com.telecominfraproject.wlan.equipmentgateway.models.CEGWConfigChangeNoti
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWFirmwareDownloadRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWFirmwareFlashRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWNewChannelRequest;
-import com.telecominfraproject.wlan.equipmentgateway.models.CEGWCellSizeAttributesRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRadioResetRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRebootRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRouteCheck;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWStartDebugEngine;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWStopDebugEngine;
-import com.telecominfraproject.wlan.equipmentgateway.models.CEGatewayCommand;
 import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommand;
 import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommandResponse;
 import com.telecominfraproject.wlan.equipmentgateway.models.GatewayDefaults;
@@ -152,16 +147,19 @@ public class OpensyncCloudGatewayController {
                 String inventoryId = command.getInventoryId();
 
                 if (com.telecominfraproject.wlan.core.model.json.BaseJsonModel.hasUnsupportedValue(command)) {
-                    LOG.error("[{}] Failed to deliver command {}, command contains unsupported value", inventoryId, command);
+                    LOG.error("[{}] Failed to deliver command {}, command contains unsupported value", inventoryId,
-                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand, "Unsupported value in command for " + inventoryId, command,
+                            command);
-                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort()));
+                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
+                            "Unsupported value in command for " + inventoryId, command, registeredGateway.getHostname(),
+                            registeredGateway.getPort()));
                     return;
                 }
                 OvsdbSession session = ovsdbSessionMapInterface.getSession(inventoryId);
                 if (session == null) {
                     LOG.warn("[{}] Failed to deliver command {}, equipment session not found", inventoryId, command);
-                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "No session found for " + inventoryId, command,
+                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE,
-                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort()));
+                            "No session found for " + inventoryId, command, registeredGateway.getHostname(),
+                            registeredGateway.getPort()));
                     return;
                 }
 
@@ -201,35 +199,30 @@ public class OpensyncCloudGatewayController {
                         ret.add(processRadioReboot(session, (CEGWRebootRequest) command));
                         break;
                     case ClientBlocklistChangeNotification:
-                        ret.add(sendClientBlocklistChangeNotification(session, (CEGWClientBlocklistChangeNotification) command));
+                        ret.add(sendClientBlocklistChangeNotification(session,
+                                (CEGWClientBlocklistChangeNotification) command));
                         break;
                     case NewChannelRequest:
                         ret.add(sendNewChannelRequest(session, (CEGWNewChannelRequest) command));
                         break;
-                    case CellSizeAttributesRequest:
-                        ret.add(sendCellSizeRequest(session, (CEGWCellSizeAttributesRequest) command));
-                        break;
-//                    case MostRecentStatsTimestamp:
-//                        ret.add(sendGetMostRecentStatsTimestampRequest(command, inventoryId));
-//                        break;
                     default:
                         LOG.warn("[{}] Failed to deliver command {}, unsupported command type", inventoryId, command);
-                        ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
+                        ret.add(new EquipmentCommandResponse(
-                                "Invalid command type (" + command.getCommandType() + ") for equipment (" + inventoryId + ")", command,
+                                CEGWCommandResultCode.UnsupportedCommand, "Invalid command type ("
-                                registeredGateway == null ? null : registeredGateway.getHostname(),
+                                        + command.getCommandType() + ") for equipment (" + inventoryId + ")",
-                                registeredGateway == null ? -1 : registeredGateway.getPort()));
+                                command, registeredGateway.getHostname(), registeredGateway.getPort()));
                 }
 
             }
 
 
-
         });
 
         return ret;
     }
 
-    private EquipmentCommandResponse processFirmwareDownload(OvsdbSession session, CEGWFirmwareDownloadRequest command) {
+    private EquipmentCommandResponse processFirmwareDownload(OvsdbSession session,
+            CEGWFirmwareDownloadRequest command) {
         return sendMessage(session, command.getInventoryId(), command);
     }
 
@@ -250,8 +243,6 @@ public class OpensyncCloudGatewayController {
         return new GatewayDefaults();
     }
 
-
-
     /**
      * Verify a route to customer equipment
      *
@@ -263,18 +254,19 @@ public class OpensyncCloudGatewayController {
         if (null != command.getRoutingId()) {
             if (!command.getRoutingId().equals(session.getRoutingId())) {
 
-                LOG.info("[E:{} R:{}] Stale routing entry ({}) detected", command.getInventoryId(), session.getRoutingId(),
+                LOG.info("[C:{} E:{} R:{}] Stale routing entry ({}) detected", session.getCustomerId(),
-                        command.getRoutingId());
+                        command.getInventoryId(), session.getRoutingId(), command.getRoutingId());
 
-                return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "Inactive Route Identifer", command,
+                return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "Inactive Route Identifer",
-                        registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+                        command, registeredGateway.getHostname(), registeredGateway.getPort());
             }
         }
         return new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Route active", command,
-                registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+                registeredGateway.getHostname(), registeredGateway.getPort());
     }
 
-    private EquipmentCommandResponse sendConfigChangeNotification(OvsdbSession session, CEGWConfigChangeNotification command) {
+    private EquipmentCommandResponse sendConfigChangeNotification(OvsdbSession session,
+            CEGWConfigChangeNotification command) {
 
         return sendMessage(session, command.getInventoryId(), command);
     }
@@ -284,17 +276,20 @@ public class OpensyncCloudGatewayController {
             session.getOvsdbClient().shutdown();
         } catch (Exception e) {
             LOG.error("[{}] Failed to close session on CE: {}", command.getInventoryId(), e.getLocalizedMessage());
-            return new EquipmentCommandResponse(CEGWCommandResultCode.FailedToSend,
+            return new EquipmentCommandResponse(
-                    "Failed to send command " + command.getCommandType() + " to " + command.getInventoryId() + ": " + e.getMessage(), command,
+                    CEGWCommandResultCode.FailedToSend, "Failed to send command " + command.getCommandType() + " to "
-                    registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+                            + command.getInventoryId() + ": " + e.getMessage(),
+                    command, registeredGateway.getHostname(), registeredGateway.getPort());
         }
         LOG.debug("[{}] Closed session to CE", command.getInventoryId());
-        return new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Closed session to " + command.getInventoryId(), command,
+        return new EquipmentCommandResponse(CEGWCommandResultCode.Success,
-                registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+                "Closed session to " + command.getInventoryId(), command, registeredGateway.getHostname(),
+                registeredGateway.getPort());
 
     }
 
-    private EquipmentCommandResponse sendClientBlocklistChangeNotification(OvsdbSession session, CEGWClientBlocklistChangeNotification command) {
+    private EquipmentCommandResponse sendClientBlocklistChangeNotification(OvsdbSession session,
+            CEGWClientBlocklistChangeNotification command) {
         return sendMessage(session, command.getInventoryId(), command);
     }
 
@@ -302,10 +297,6 @@ public class OpensyncCloudGatewayController {
         return sendMessage(session, command.getInventoryId(), command);
     }
 
-    private EquipmentCommandResponse sendCellSizeRequest(OvsdbSession session, CEGWCellSizeAttributesRequest command) {
-        return sendMessage(session, command.getInventoryId(), command);
-    }
-
     /**
      * Deliver a message in payload to the CE
      *
@@ -317,17 +308,15 @@ public class OpensyncCloudGatewayController {
     private EquipmentCommandResponse sendMessage(OvsdbSession session, String inventoryId, EquipmentCommand command) {
 
         LOG.debug("Received command {} for {}", command.getCommandType(), inventoryId);
-        EquipmentCommandResponse response =
+        EquipmentCommandResponse response = new EquipmentCommandResponse(CEGWCommandResultCode.Success,
-                new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Received Command " + command.getCommandType() + " for " + inventoryId, command,
+                "Received Command " + command.getCommandType() + " for " + inventoryId, command,
-                        registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+                registeredGateway.getHostname(), registeredGateway.getPort());
 
-        if (command instanceof CEGWBlinkRequest) {
+        if (command instanceof CEGWConfigChangeNotification) {
-            String resultDetails = tipwlanOvsdbClient.processBlinkRequest(inventoryId, ((CEGWBlinkRequest)command).getBlinkAllLEDs()); 
-            response.setResultDetail(resultDetails);
-        } else if (command instanceof CEGWConfigChangeNotification) {
             tipwlanOvsdbClient.processConfigChanged(inventoryId);
         } else if (command instanceof CEGWClientBlocklistChangeNotification) {
-            tipwlanOvsdbClient.processClientBlocklistChange(inventoryId, ((CEGWClientBlocklistChangeNotification) command).getBlockList());
+            tipwlanOvsdbClient.processClientBlocklistChange(inventoryId,
+                    ((CEGWClientBlocklistChangeNotification) command).getBlockList());
         } else if (command instanceof CEGWChangeRedirectorHost) {
             String newRedirectorAddress = ((CEGWChangeRedirectorHost) command).getRedirectorHost();
             tipwlanOvsdbClient.changeRedirectorHost(inventoryId, newRedirectorAddress);
@@ -342,13 +331,7 @@ public class OpensyncCloudGatewayController {
             Map<RadioType, Integer> newBackupChannels = request.getNewBackupChannels();
             Map<RadioType, Integer> newPrimaryChannels = request.getNewPrimaryChannels();
 
-            String resultDetails = tipwlanOvsdbClient.processNewChannelsRequest(inventoryId, newBackupChannels, newPrimaryChannels);
+            String resultDetails = tipwlanOvsdbClient.processNewChannelsRequest(inventoryId, newBackupChannels,newPrimaryChannels);
-            response.setResultDetail(resultDetails);
-        } else if (command instanceof CEGWCellSizeAttributesRequest) {
-            CEGWCellSizeAttributesRequest request = (CEGWCellSizeAttributesRequest) command;
-            Map<RadioType, CellSizeAttributes> cellSizeAttributeMap = request.getCellSizeAttributesMap();
-
-            String resultDetails = tipwlanOvsdbClient.processCellSizeAttributesRequest(inventoryId, cellSizeAttributeMap);
             response.setResultDetail(resultDetails);
 
         } else if (command instanceof CEGWFirmwareDownloadRequest) {
@@ -359,7 +342,8 @@ public class OpensyncCloudGatewayController {
             String firmwareVersion = dlRequest.getFirmwareVersion();
             String username = dlRequest.getUsername();
 
-            String resultDetails = tipwlanOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion, username);
+            String resultDetails = tipwlanOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion,
+                    username);
 
             response.setResultDetail(resultDetails);
 
@@ -371,15 +355,15 @@ public class OpensyncCloudGatewayController {
             flashRequest.getInventoryId();
             flashRequest.getUsername();
 
-            String resultDetails =
+            String resultDetails = tipwlanOvsdbClient.processFirmwareFlash(flashRequest.getInventoryId(),
-                    tipwlanOvsdbClient.processFirmwareFlash(flashRequest.getInventoryId(), flashRequest.getFirmwareVersion(), flashRequest.getUsername());
+                    flashRequest.getFirmwareVersion(), flashRequest.getUsername());
 
             response.setResultDetail(resultDetails);
 
         } else if (command instanceof CEGWRadioResetRequest) {
             response = new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
                     "Received Command " + command.getCommandType() + " for " + inventoryId, command,
-                    registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+                    registeredGateway.getHostname(), registeredGateway.getPort());
         } else if (command instanceof CEGWRebootRequest) {
 
             CEGWRebootRequest rebootRequest = (CEGWRebootRequest) command;
@@ -403,9 +387,10 @@ public class OpensyncCloudGatewayController {
                 default:
                     response = new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
                             "Received Command " + command.getCommandType() + " for " + inventoryId, command,
-                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+                            registeredGateway.getHostname(), registeredGateway.getPort());
             }
 
+
         }
 
         return response;
@@ -423,14 +408,15 @@ public class OpensyncCloudGatewayController {
         return sendMessage(session, command.getInventoryId(), command);
     }
 
+
     private EquipmentCommandResponse processBlinkRequest(OvsdbSession session, CEGWBlinkRequest command) {
 
         return sendMessage(session, command.getInventoryId(), command);
     }
 
     @RequestMapping(value = "/commandWithUser", method = RequestMethod.POST)
-    public EquipmentCommandResponse sendCommandWithAuthUser(@RequestBody EquipmentCommand command, @AuthenticationPrincipal Object requestUser,
+    public EquipmentCommandResponse sendCommandWithAuthUser(@RequestBody EquipmentCommand command,
-            HttpServletRequest httpServletRequest) {
+            @AuthenticationPrincipal Object requestUser, HttpServletRequest httpServletRequest) {
 
         // use these properties to get address and port where request has
         // arrived
@@ -463,7 +449,8 @@ public class OpensyncCloudGatewayController {
             }
 
             if (eqRoutingSvc == null) {
-                throw new ConfigurationException("Unable to register gateway with routing service: routing service interface not initialized");
+                throw new ConfigurationException(
+                        "Unable to register gateway with routing service: routing service interface not initialized");
             }
 
             cleanupStaleGwRecord();
@@ -479,11 +466,13 @@ public class OpensyncCloudGatewayController {
                 EquipmentGatewayRecord result = eqRoutingSvc.registerGateway(gwRecord);
                 registeredGwId = result.getId();
                 registeredGateway = result;
-                LOG.info("Successfully registered (name={}, id={}) with Routing Service", result.getHostname(), registeredGwId);
+                LOG.info("Successfully registered (name={}, id={}) with Routing Service", result.getHostname(),
+                        registeredGwId);
                 registeredWithRoutingService = true;
             } catch (RuntimeException e) {
                 // failed
-                LOG.error("Failed to register Customer Equipment Gateway (name={}) with Routing Service : {}", getGatewayName(), e.getLocalizedMessage());
+                LOG.error("Failed to register Customer Equipment Gateway (name={}) with Routing Service : {}",
+                        getGatewayName(), e.getLocalizedMessage());
             }
         }
     }
@@ -508,7 +497,8 @@ public class OpensyncCloudGatewayController {
                             eqRoutingSvc.deleteGateway(eqpRec.getId());
                         } catch (RuntimeException e) {
                             // failed
-                            LOG.error("Failed to delete Equipment Gateway (name={}) from Routing Service: {}", eqpRec.getHostname(), e.getLocalizedMessage());
+                            LOG.error("Failed to delete Equipment Gateway (name={}) from Routing Service: {}",
+                                    eqpRec.getHostname(), e.getLocalizedMessage());
                         }
                     } else {
                         LOG.debug("Gateway {} is reachable.", eqpRec.getHostname());
@@ -519,8 +509,9 @@ public class OpensyncCloudGatewayController {
             }
         } catch (Exception ex) { // Catching Exception to prevent crashing the
                                  // register thread
-            LOG.debug("Generic Exception encountered when trying to cleanup " + "the stale not-reachable GateWays. Continuing to register the new Gateway."
+            LOG.debug("Generic Exception encountered when trying to cleanup "
-                    + " Error: {} ", ex.getMessage());
+                    + "the stale not-reachable GateWays. Continuing to register the new Gateway." + " Error: {} ",
+                    ex.getMessage());
         }
     }
 
@@ -544,13 +535,14 @@ public class OpensyncCloudGatewayController {
         if (registeredWithRoutingService) {
             try {
                 eqRoutingSvc.deleteGateway(registeredGwId);
-                LOG.info("Deregistered Customer Equipment Gateway (name={},id={}) with Routing Service", getGatewayName(), registeredGwId);
+                LOG.info("Deregistered Customer Equipment Gateway (name={},id={}) with Routing Service",
+                        getGatewayName(), registeredGwId);
                 registeredGwId = -1;
                 registeredGateway = null;
             } catch (Exception e) {
                 // failed
-                LOG.error("Failed to deregister Customer Equipment Gateway (name={},id={}) with Routing Service: {}", getGatewayName(), registeredGwId,
+                LOG.error("Failed to deregister Customer Equipment Gateway (name={},id={}) with Routing Service: {}",
-                        e.getLocalizedMessage());
+                        getGatewayName(), registeredGwId, e.getLocalizedMessage());
             }
             registeredWithRoutingService = false;
         }
@@ -568,10 +560,12 @@ public class OpensyncCloudGatewayController {
      * @param equipmentId
      * @return associationId
      */
-    public EquipmentRoutingRecord registerCustomerEquipment(String equipmentName, Integer customerId, Long equipmentId) {
+    public EquipmentRoutingRecord registerCustomerEquipment(String equipmentName, Integer customerId,
+            Long equipmentId) {
         registerWithRoutingService();
         if (!registeredWithRoutingService) {
-            LOG.error("Unable to register customer equipement (name={},id={}): gateway not registered.", equipmentName, equipmentId);
+            LOG.error("Unable to register customer equipement (name={},id={}): gateway not registered.", equipmentName,
+                    equipmentId);
             return null;
         }
         // Clean up stale records
@@ -583,11 +577,13 @@ public class OpensyncCloudGatewayController {
         try {
             routingRecord = eqRoutingSvc.create(routingRecord);
 
-            LOG.debug("Registered customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId, routingRecord.getId());
+            LOG.debug("Registered customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId,
+                    routingRecord.getId());
             return routingRecord;
 
         } catch (Exception e) {
-            LOG.error("Failed to register customer equipement (name={},id={}): {}", equipmentName, equipmentId, e.getLocalizedMessage());
+            LOG.error("Failed to register customer equipement (name={},id={}): {}", equipmentName, equipmentId,
+                    e.getLocalizedMessage());
         }
         return null;
     }
@@ -600,7 +596,7 @@ public class OpensyncCloudGatewayController {
      * Gateway does not exist, delete the equipmentRouting entry.
      * 
      * @param equipmentId:
-     *        Equipment's ID
+     *            Equipment's ID
      */
     protected void cleanupStaleEqptRoutingRecord(Long equipmentId) {
         LOG.debug("In Clean Up stale Equipment Routing record for Equipment ID {}", equipmentId);
@@ -613,17 +609,20 @@ public class OpensyncCloudGatewayController {
                         if (gwRec != null) {
                             if (!isGwReachable(gwRec.getIpAddr(), gwRec.getPort())) {
                                 // GW isn't reachable --> invoke unregister
-                                LOG.debug("Gateway {} is not-reachable... Deleting the equipment routing entry", gwRec.getHostname());
+                                LOG.debug("Gateway {} is not-reachable... Deleting the equipment routing entry",
+                                        gwRec.getHostname());
                                 deleteUnresponiveGwRoutingRecord(eqRouting.getId(), equipmentId);
                             } else {
                                 LOG.debug("Gateway {} is reachable.", gwRec.getHostname());
                             }
                         } else {
-                            LOG.debug("Gateway with ID {} not found. Deleting the equipment routing entry ", eqRouting.getGatewayId());
+                            LOG.debug("Gateway with ID {} not found. Deleting the equipment routing entry ",
+                                    eqRouting.getGatewayId());
                             deleteUnresponiveGwRoutingRecord(eqRouting.getId(), equipmentId);
                         }
                     } catch (DsEntityNotFoundException entityNotFoundException) {
-                        LOG.debug("Gateway ID: {} not found... Deleting the equipment routing entry", eqRouting.getGatewayId());
+                        LOG.debug("Gateway ID: {} not found... Deleting the equipment routing entry",
+                                eqRouting.getGatewayId());
                         deleteUnresponiveGwRoutingRecord(eqRouting.getId(), equipmentId);
                     }
                 }
@@ -632,10 +631,9 @@ public class OpensyncCloudGatewayController {
             }
         } catch (Exception genericException) { // Catching Exception to prevent
                                                // crashing the register thread
-            LOG.debug(
+            LOG.debug("Generic Exception encountered when trying to cleanup "
-                    "Generic Exception encountered when trying to cleanup "
+                    + "the stale routing records for equipment ID: {}. Continuing to register the new RoutingRecord."
-                            + "the stale routing records for equipment ID: {}. Continuing to register the new RoutingRecord." + " Error: {} ",
+                    + " Error: {} ", equipmentId, genericException.getMessage());
-                    equipmentId, genericException.getMessage());
         }
     }
 
@@ -644,7 +642,8 @@ public class OpensyncCloudGatewayController {
             eqRoutingSvc.delete(routingId);
         } catch (RuntimeException e) {
             // failed
-            LOG.error("Failed to delete Equipment routing record (ID={}) from Routing Service: {}", eqptId, e.getLocalizedMessage());
+            LOG.error("Failed to delete Equipment routing record (ID={}) from Routing Service: {}", eqptId,
+                    e.getLocalizedMessage());
             return false;
         }
         return true;
@@ -652,16 +651,18 @@ public class OpensyncCloudGatewayController {
 
     public void deregisterCustomerEquipment(Long routingId, String equipmentName, Long equipmentId) {
         if (!registeredWithRoutingService) {
-            LOG.error("Unable to deregister customer equipement (name={},id={}): gateway not registered", equipmentName, equipmentId);
+            LOG.error("Unable to deregister customer equipement (name={},id={}): gateway not registered", equipmentName,
+                    equipmentId);
             return;
         }
         try {
-            LOG.debug("Deregistering customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId, routingId);
+            LOG.debug("Deregistering customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId,
+                    routingId);
 
             eqRoutingSvc.delete(routingId);
         } catch (Exception e) {
-            LOG.error("Failed to deregister customer equipement (name={},id={}) with route id={}: {}", equipmentName, equipmentId, routingId,
+            LOG.error("Failed to deregister customer equipement (name={},id={}) with route id={}: {}", equipmentName,
-                    e.getLocalizedMessage());
+                    equipmentId, routingId, e.getLocalizedMessage());
         }
     }
 

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

@@ -10,8 +10,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.telecominfraproject.wlan.client.models.events.realtime.ClientConnectSuccessEvent;
 import com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent.DisconnectFrameType;
 import com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent.DisconnectInitiator;
+import com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent.ClientTimeoutReason;
 import com.telecominfraproject.wlan.client.models.events.utils.WlanReasonCode;
 import com.telecominfraproject.wlan.client.models.events.utils.WlanStatusCode;
 import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
@@ -26,6 +28,7 @@ import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
 import com.telecominfraproject.wlan.profile.models.ProfileContainer;
 import com.telecominfraproject.wlan.profile.models.ProfileType;
 import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
+import com.telecominfraproject.wlan.systemevent.equipment.BaseDhcpEvent;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeChannelHopEvent;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeSipCallReportEvent;
@@ -40,6 +43,7 @@ import com.telecominfraproject.wlan.systemevent.models.SystemEvent;
 
 import sts.OpensyncStats;
 import sts.OpensyncStats.AssocType;
+import sts.OpensyncStats.CTReasonType;
 import sts.OpensyncStats.CallReport;
 import sts.OpensyncStats.CallStart;
 import sts.OpensyncStats.CallStop;
@@ -48,8 +52,22 @@ import sts.OpensyncStats.DeviceType;
 import sts.OpensyncStats.EventReport;
 import sts.OpensyncStats.EventReport.ClientAssocEvent;
 import sts.OpensyncStats.EventReport.ClientAuthEvent;
+import sts.OpensyncStats.EventReport.ClientConnectEvent;
 import sts.OpensyncStats.EventReport.ClientDisconnectEvent;
+import sts.OpensyncStats.EventReport.ClientFailureEvent;
+import sts.OpensyncStats.EventReport.ClientFirstDataEvent;
+import sts.OpensyncStats.EventReport.ClientIdEvent;
 import sts.OpensyncStats.EventReport.ClientIpEvent;
+import sts.OpensyncStats.EventReport.ClientTimeoutEvent;
+import sts.OpensyncStats.EventReport.DhcpAckEvent;
+import sts.OpensyncStats.EventReport.DhcpCommonData;
+import sts.OpensyncStats.EventReport.DhcpDeclineEvent;
+import sts.OpensyncStats.EventReport.DhcpDiscoverEvent;
+import sts.OpensyncStats.EventReport.DhcpInformEvent;
+import sts.OpensyncStats.EventReport.DhcpNakEvent;
+import sts.OpensyncStats.EventReport.DhcpOfferEvent;
+import sts.OpensyncStats.EventReport.DhcpRequestEvent;
+import sts.OpensyncStats.EventReport.DhcpTransaction;
 import sts.OpensyncStats.FrameType;
 import sts.OpensyncStats.RtpFlowStats;
 import sts.OpensyncStats.StreamingVideoServerDetected;
@@ -72,7 +90,6 @@ public class RealtimeEventPublisher {
 
     private static final Logger LOG = LoggerFactory.getLogger(RealtimeEventPublisher.class);
 
-    
     void publishChannelHopEvents(int customerId, long equipmentId, long locationId, EventReport e) {
 
         LOG.info("publishChannelHopEvents for customerId {} equipmentId {}");
@@ -161,7 +178,94 @@ public class RealtimeEventPublisher {
         }
     }
 
+    void publishClientConnectSuccessEvent(int customerId, long equipmentId, long locationId, ClientConnectEvent clientConnectEvent) {
 
+        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientConnectEvent, customerId,
+                equipmentId);
+        ClientConnectSuccessEvent clientEvent = new ClientConnectSuccessEvent(clientConnectEvent.getTimestampMs());
+        clientEvent.setClientMacAddress(MacAddress.valueOf(clientConnectEvent.getStaMac()));
+        clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
+                .getRadioTypeFromOpensyncStatsRadioBandType(clientConnectEvent.getBand()));
+        clientEvent.setSsid(clientConnectEvent.getSsid());
+        clientEvent.setSessionId(clientConnectEvent.getSessionId());
+
+        if (clientConnectEvent.hasFbtUsed()) {
+            clientEvent.setFbtUsed(clientConnectEvent.getFbtUsed());
+        }
+        if (clientConnectEvent.hasEvTimeBootupInUsAssoc()) {
+            clientEvent.setAssocTs(clientConnectEvent.getEvTimeBootupInUsAssoc());
+        }
+
+        if (clientConnectEvent.hasEvTimeBootupInUsAuth()) {
+            clientEvent.setAuthTs(clientConnectEvent.getEvTimeBootupInUsAuth());
+        }
+
+        if (clientConnectEvent.hasEvTimeBootupInUsEapol()) {
+            clientEvent.setEapolTs(clientConnectEvent.getEvTimeBootupInUsEapol());
+        }
+
+        if (clientConnectEvent.hasEvTimeBootupInUsFirstRx()) {
+            clientEvent.setFirstDataRxTs(clientConnectEvent.getEvTimeBootupInUsFirstRx());
+        }
+
+        if (clientConnectEvent.hasEvTimeBootupInUsFirstTx()) {
+            clientEvent.setFirstDataTxTs(clientConnectEvent.getEvTimeBootupInUsFirstTx());
+        }
+
+        if (clientConnectEvent.hasEvTimeBootupInUsIp()) {
+            clientEvent.setIpAcquisitionTs(clientConnectEvent.getEvTimeBootupInUsIp());
+        }
+
+        if (clientConnectEvent.hasEvTimeBootupInUsPortEnable()) {
+            clientEvent.setPortEnabledTs(clientConnectEvent.getEvTimeBootupInUsPortEnable());
+        }
+
+        if (clientConnectEvent.hasCltId()) {
+            clientEvent.setHostName(clientConnectEvent.getCltId());
+        }
+
+        if (clientConnectEvent.hasSecType()) {
+            clientEvent.setSecurityType(OvsdbToWlanCloudTypeMappingUtility
+                    .getCloudSecurityTypeFromOpensyncStats(clientConnectEvent.getSecType()));
+        }
+
+        if (clientConnectEvent.hasAssocType()) {
+            clientEvent.setReassociation(clientConnectEvent.getAssocType().equals(AssocType.REASSOC));
+        }
+
+        if (clientConnectEvent.hasAssocRssi()) {
+            clientEvent.setAssocRSSI(clientConnectEvent.getAssocRssi());
+        }
+
+        if (clientConnectEvent.hasUsing11K()) {
+            clientEvent.setUsing11k(clientConnectEvent.getUsing11K());
+        }
+
+        if (clientConnectEvent.hasUsing11R()) {
+            clientEvent.setUsing11r(clientConnectEvent.getUsing11R());
+        }
+
+        if (clientConnectEvent.hasUsing11V()) {
+            clientEvent.setUsing11v(clientConnectEvent.getUsing11V());
+        }
+
+        if (clientConnectEvent.hasIpAddr()) {
+            try {
+                clientEvent.setIpAddr(InetAddress.getByAddress(clientConnectEvent.getIpAddr().toByteArray()));
+
+            } catch (UnknownHostException e1) {
+                LOG.error("Invalid Ip Address for client {}", clientConnectEvent.getIpAddr(), e1);
+            }
+        }
+
+        clientEvent.setCustomerId(customerId);
+        clientEvent.setEquipmentId(equipmentId);
+        clientEvent.setLocationId(locationId);
+
+        LOG.info("publishing client event {} to cloud", clientEvent);
+        cloudEventDispatcherInterface.publishEvent(clientEvent);
+
+    }
 
     void publishClientDisconnectEvent(int customerId, long equipmentId, long locationId, ClientDisconnectEvent clientDisconnectEvent) {
 
@@ -171,7 +275,7 @@ public class RealtimeEventPublisher {
         com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent(
                 clientDisconnectEvent.getTimestampMs());
         clientEvent.setClientMacAddress(MacAddress.valueOf(clientDisconnectEvent.getStaMac()));
-        clientEvent.setSessionId(Long.toUnsignedString( clientDisconnectEvent.getSessionId()));
+        clientEvent.setSessionId(clientDisconnectEvent.getSessionId());
         clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
                 .getRadioTypeFromOpensyncStatsRadioBandType(clientDisconnectEvent.getBand()));
         clientEvent.setSsid(clientDisconnectEvent.getSsid());
@@ -203,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);
@@ -218,7 +322,7 @@ public class RealtimeEventPublisher {
 
         com.telecominfraproject.wlan.client.models.events.realtime.ClientAuthEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientAuthEvent(
                 clientAuthEvent.getTimestampMs());
-        clientEvent.setSessionId(Long.toUnsignedString( clientAuthEvent.getSessionId()));
+        clientEvent.setSessionId(clientAuthEvent.getSessionId());
         clientEvent.setSsid(clientAuthEvent.getSsid());
         clientEvent.setClientMacAddress(MacAddress.valueOf(clientAuthEvent.getStaMac()));
         clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
@@ -227,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);
@@ -243,7 +346,7 @@ public class RealtimeEventPublisher {
         com.telecominfraproject.wlan.client.models.events.realtime.ClientAssocEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientAssocEvent(
                 clientAssocEvent.getTimestampMs());
 
-        clientEvent.setSessionId(Long.toUnsignedString( clientAssocEvent.getSessionId()));
+        clientEvent.setSessionId(clientAssocEvent.getSessionId());
         clientEvent.setSsid(clientAssocEvent.getSsid());
         clientEvent.setClientMacAddress(MacAddress.valueOf(clientAssocEvent.getStaMac()));
         clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
@@ -277,7 +380,6 @@ public class RealtimeEventPublisher {
             clientEvent.setUsing11v(clientAssocEvent.getUsing11V());
         }
 
-        clientEvent.setEventTimestamp(clientAssocEvent.getTimestampMs());
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -287,6 +389,81 @@ public class RealtimeEventPublisher {
 
     }
 
+    void publishClientFailureEvent(int customerId, long equipmentId, long locationId, ClientFailureEvent clientFailureEvent) {
+        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientFailureEvent, customerId,
+                equipmentId);
+
+        com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent(
+                clientFailureEvent.getTimestampMs());
+
+        clientEvent.setSessionId(clientFailureEvent.getSessionId());
+        clientEvent.setClientMacAddress(MacAddress.valueOf(clientFailureEvent.getStaMac()));
+        clientEvent.setSsid(clientFailureEvent.getSsid());
+
+        if (clientFailureEvent.hasReasonStr()) {
+            clientEvent.setReasonString(clientFailureEvent.getReasonStr());
+        }
+
+        if (clientFailureEvent.hasReasonCode()) {
+            clientEvent.setReasonCode(WlanReasonCode.getById(clientFailureEvent.getReasonCode()));
+        }
+
+        clientEvent.setCustomerId(customerId);
+        clientEvent.setEquipmentId(equipmentId);
+        clientEvent.setLocationId(locationId);
+
+        LOG.info("publishing client event {} to cloud", clientEvent);
+        cloudEventDispatcherInterface.publishEvent(clientEvent);
+    }
+
+    void publishClientFirstDataEvent(int customerId, long equipmentId, long locationId, ClientFirstDataEvent clientFirstDataEvent) {
+        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientFirstDataEvent, customerId,
+                equipmentId);
+
+        com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent(
+                clientFirstDataEvent.getTimestampMs());
+
+        clientEvent.setSessionId(clientFirstDataEvent.getSessionId());
+        clientEvent.setClientMacAddress(MacAddress.valueOf(clientFirstDataEvent.getStaMac()));
+
+        if (clientFirstDataEvent.hasFdataTxUpTsInUs()) {
+            clientEvent.setFirstDataSentTs(clientFirstDataEvent.getFdataTxUpTsInUs());
+        }
+
+        if (clientFirstDataEvent.hasFdataRxUpTsInUs()) {
+            clientEvent.setFirstDataRcvdTs(clientFirstDataEvent.getFdataRxUpTsInUs());
+        }
+
+        clientEvent.setCustomerId(customerId);
+        clientEvent.setEquipmentId(equipmentId);
+        clientEvent.setLocationId(locationId);
+
+        LOG.info("publishing client event {} to cloud", clientEvent);
+        cloudEventDispatcherInterface.publishEvent(clientEvent);
+
+    }
+
+    void publishClientIdEvent(int customerId, long equipmentId, long locationId, ClientIdEvent clientIdEvent) {
+
+        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientIdEvent, customerId, equipmentId);
+
+        com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent(
+                clientIdEvent.getTimestampMs());
+
+        clientEvent.setSessionId(clientIdEvent.getSessionId());
+        clientEvent.setClientMacAddress(MacAddress.valueOf(clientIdEvent.getCltMac()));
+        if (clientIdEvent.hasCltId()) {
+            clientEvent.setUserId(clientIdEvent.getCltId());
+        }
+
+        clientEvent.setCustomerId(customerId);
+        clientEvent.setEquipmentId(equipmentId);
+        clientEvent.setLocationId(locationId);
+
+        LOG.info("publishing client event {} to cloud", clientEvent);
+        cloudEventDispatcherInterface.publishEvent(clientEvent);
+    }
+
     void publishClientIpEvent(int customerId, long equipmentId, long locationId, ClientIpEvent clientIpEvent) {
 
         LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientIpEvent, customerId, equipmentId);
@@ -294,17 +471,12 @@ public class RealtimeEventPublisher {
         com.telecominfraproject.wlan.client.models.events.realtime.ClientIpAddressEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientIpAddressEvent(
                 clientIpEvent.getTimestampMs());
 
-        clientEvent.setSessionId(Long.toUnsignedString( clientIpEvent.getSessionId()));
+        clientEvent.setSessionId(clientIpEvent.getSessionId());
         clientEvent.setClientMacAddress(MacAddress.valueOf(clientIpEvent.getStaMac()));
         if (clientIpEvent.hasIpAddr()) {
-            try {
+            clientEvent.setIpAddr(clientIpEvent.getIpAddr().toByteArray());
-                clientEvent.setIpAddr(InetAddress.getByAddress(clientIpEvent.getIpAddr().toByteArray()));
-            } catch (UnknownHostException e1) {
-                LOG.error("Invalid Client IP Address for equipmentId {}, clientIpEvent {}", equipmentId, clientIpEvent);
-            }
         }
 
-        clientEvent.setEventTimestamp(clientIpEvent.getTimestampMs());
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
         clientEvent.setLocationId(locationId);
@@ -313,6 +485,317 @@ public class RealtimeEventPublisher {
         cloudEventDispatcherInterface.publishEvent(clientEvent);
     }
 
+    void publishClientTimeoutEvent(int customerId, long equipmentId, long locationId, ClientTimeoutEvent clientTimeoutEvent) {
+
+        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientTimeoutEvent, customerId,
+                equipmentId);
+
+        com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent(
+                clientTimeoutEvent.getTimestampMs());
+
+        clientEvent.setSessionId(clientTimeoutEvent.getSessionId());
+        clientEvent.setClientMacAddress(MacAddress.valueOf(clientTimeoutEvent.getStaMac()));
+        if (clientTimeoutEvent.hasRCode()) {
+            clientEvent.setTimeoutReason(clientTimeoutEvent.getRCode().equals(CTReasonType.CTR_IDLE_TOO_LONG)
+                    ? ClientTimeoutReason.IdleTooLong
+                    : ClientTimeoutReason.FailedProbe);
+        }
+        if (clientTimeoutEvent.hasLastRcvUpTsInUs()) {
+            clientEvent.setLastRecvTime(clientTimeoutEvent.getLastRcvUpTsInUs());
+        }
+        if (clientTimeoutEvent.hasLastSentUpTsInUs()) {
+            clientEvent.setLastSentTime(clientTimeoutEvent.getLastSentUpTsInUs());
+        }
+
+        clientEvent.setCustomerId(customerId);
+        clientEvent.setEquipmentId(equipmentId);
+        clientEvent.setLocationId(locationId);
+
+        LOG.info("publishing client event {} to cloud", clientEvent);
+        cloudEventDispatcherInterface.publishEvent(clientEvent);
+
+    }
+
+    void publishDhcpTransactionEvents(int customerId, long equipmentId, long locationId, List<DhcpTransaction> dhcpTransactionList) {
+        LOG.info("Publish Dhcp Transaction Events for customer {} equipmentId {}", customerId, equipmentId);
+        List<SystemEvent> dhcpEventsList = new ArrayList<>();
+        for (DhcpTransaction dhcpTransaction : dhcpTransactionList) {
+
+            for (DhcpAckEvent ackEvent : dhcpTransaction.getDhcpAckEventList()) {
+                LOG.debug("DhcpAckEvent {}", ackEvent);
+
+                com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent cloudDhcpAck = new com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent();
+
+                cloudDhcpAck.setCustomerId(customerId);
+                cloudDhcpAck.setEquipmentId(equipmentId);
+                cloudDhcpAck.setLocationId(locationId);
+
+                if (ackEvent.hasDhcpCommonData()) {
+                    cloudDhcpAck = (com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent) getDhcpCommonDataForEvent(
+                            cloudDhcpAck, ackEvent.getDhcpCommonData());
+                } else {
+                    cloudDhcpAck.setxId(dhcpTransaction.getXId());
+                }
+
+                if (ackEvent.hasGatewayIp()) {
+                    try {
+                        cloudDhcpAck.setGatewayIp(InetAddress.getByAddress(ackEvent.getGatewayIp().toByteArray()));
+                    } catch (UnknownHostException e) {
+                        LOG.error("Invalid GatewayIP", e);
+                    }
+                }
+
+                if (ackEvent.hasLeaseTime()) {
+                    cloudDhcpAck.setLeaseTime(ackEvent.getLeaseTime());
+                }
+
+                if (ackEvent.hasPrimaryDns()) {
+                    try {
+                        cloudDhcpAck.setPrimaryDns(InetAddress.getByAddress(ackEvent.getPrimaryDns().toByteArray()));
+                    } catch (UnknownHostException e) {
+                        LOG.error("Invalid PrimaryDNS", e);
+                    }
+                }
+
+                if (ackEvent.hasSecondaryDns()) {
+                    try {
+                        cloudDhcpAck
+                                .setSecondaryDns(InetAddress.getByAddress(ackEvent.getSecondaryDns().toByteArray()));
+                    } catch (UnknownHostException e) {
+                        LOG.error("Invalid SecondaryDNS", e);
+                    }
+                }
+
+                if (ackEvent.hasRebindingTime()) {
+                    cloudDhcpAck.setRebindingTime(ackEvent.getRebindingTime());
+                }
+
+                if (ackEvent.hasRenewalTime()) {
+                    cloudDhcpAck.setRenewalTime(ackEvent.getRenewalTime());
+                }
+
+                if (ackEvent.hasSubnetMask()) {
+                    try {
+                        cloudDhcpAck.setSubnetMask(InetAddress.getByAddress(ackEvent.getSubnetMask().toByteArray()));
+                    } catch (UnknownHostException e) {
+                        LOG.error("Invalid SubnetMask", e);
+                    }
+                }
+
+                if (ackEvent.hasTimeOffset()) {
+                    cloudDhcpAck.setTimeOffset(ackEvent.getTimeOffset());
+                }
+
+                LOG.debug("Cloud DhcpAckEvent {}", cloudDhcpAck);
+
+                dhcpEventsList.add(cloudDhcpAck);
+            }
+
+            for (DhcpNakEvent nakEvent : dhcpTransaction.getDhcpNakEventList()) {
+                LOG.debug("DhcpNakEvent {}", nakEvent);
+
+                com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent cloudDhcpNak = new com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent();
+
+                cloudDhcpNak.setCustomerId(customerId);
+                cloudDhcpNak.setEquipmentId(equipmentId);
+                cloudDhcpNak.setLocationId(locationId);
+
+                if (nakEvent.hasDhcpCommonData()) {
+                    cloudDhcpNak = (com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent) getDhcpCommonDataForEvent(
+                            cloudDhcpNak, nakEvent.getDhcpCommonData());
+
+                } else {
+                    cloudDhcpNak.setxId(dhcpTransaction.getXId());
+                }
+
+                if (nakEvent.hasFromInternal()) {
+                    cloudDhcpNak.setFromInternal(nakEvent.getFromInternal());
+                }
+
+                LOG.debug("Cloud DhcpNakEvent {}", cloudDhcpNak);
+
+                dhcpEventsList.add(cloudDhcpNak);
+
+            }
+
+            for (DhcpOfferEvent offerEvent : dhcpTransaction.getDhcpOfferEventList()) {
+                LOG.debug("DhcpOfferEvent {}", offerEvent);
+
+                com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent cloudDhcpOffer = new com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent();
+
+                cloudDhcpOffer.setCustomerId(customerId);
+                cloudDhcpOffer.setEquipmentId(equipmentId);
+                cloudDhcpOffer.setLocationId(locationId);
+
+                if (offerEvent.hasDhcpCommonData()) {
+                    cloudDhcpOffer = (com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent) getDhcpCommonDataForEvent(
+                            cloudDhcpOffer, offerEvent.getDhcpCommonData());
+
+                } else {
+                    cloudDhcpOffer.setxId(dhcpTransaction.getXId());
+                }
+
+                if (offerEvent.hasFromInternal()) {
+                    cloudDhcpOffer.setFromInternal(offerEvent.getFromInternal());
+                }
+
+                dhcpEventsList.add(cloudDhcpOffer);
+
+            }
+
+            for (DhcpInformEvent informEvent : dhcpTransaction.getDhcpInformEventList()) {
+                LOG.debug("DhcpInformEvent {}", informEvent);
+
+                com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent cloudDhcpInform = new com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent();
+
+                cloudDhcpInform.setCustomerId(customerId);
+                cloudDhcpInform.setEquipmentId(equipmentId);
+                cloudDhcpInform.setLocationId(locationId);
+
+                if (informEvent.hasDhcpCommonData()) {
+                    cloudDhcpInform = (com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent) getDhcpCommonDataForEvent(
+                            cloudDhcpInform, informEvent.getDhcpCommonData());
+
+                } else {
+                    cloudDhcpInform.setxId(dhcpTransaction.getXId());
+                }
+
+                dhcpEventsList.add(cloudDhcpInform);
+
+            }
+
+            for (DhcpDeclineEvent declineEvent : dhcpTransaction.getDhcpDeclineEventList()) {
+                LOG.debug("DhcpDeclineEvent {}", declineEvent);
+
+                com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent cloudDhcpDecline = new com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent();
+
+                cloudDhcpDecline.setCustomerId(customerId);
+                cloudDhcpDecline.setEquipmentId(equipmentId);
+                cloudDhcpDecline.setLocationId(locationId);
+
+                if (declineEvent.hasDhcpCommonData()) {
+                    cloudDhcpDecline = (com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent) getDhcpCommonDataForEvent(
+                            cloudDhcpDecline, declineEvent.getDhcpCommonData());
+
+                } else {
+                    cloudDhcpDecline.setxId(dhcpTransaction.getXId());
+                }
+
+                LOG.debug("Cloud DhcpDeclineEvent {}", cloudDhcpDecline);
+
+                dhcpEventsList.add(cloudDhcpDecline);
+
+            }
+
+            for (DhcpRequestEvent requestEvent : dhcpTransaction.getDhcpRequestEventList()) {
+                LOG.debug("DhcpRequestEvent {}", requestEvent);
+
+                com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent cloudDhcpRequest = new com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent();
+
+                cloudDhcpRequest.setCustomerId(customerId);
+                cloudDhcpRequest.setEquipmentId(equipmentId);
+                cloudDhcpRequest.setLocationId(locationId);
+
+                if (requestEvent.hasDhcpCommonData()) {
+                    cloudDhcpRequest = (com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent) getDhcpCommonDataForEvent(
+                            cloudDhcpRequest, requestEvent.getDhcpCommonData());
+
+                } else {
+                    cloudDhcpRequest.setxId(dhcpTransaction.getXId());
+                }
+
+                if (requestEvent.hasHostname()) {
+                    cloudDhcpRequest.setHostName(requestEvent.getHostname());
+                }
+
+                LOG.debug("Cloud DhcpRequestEvent {}", cloudDhcpRequest);
+
+                dhcpEventsList.add(cloudDhcpRequest);
+
+            }
+
+            for (DhcpDiscoverEvent discoverEvent : dhcpTransaction.getDhcpDiscoverEventList()) {
+                LOG.debug("DhcpDiscoverEvent {}", discoverEvent);
+
+                com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent cloudDhcpDiscover = new com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent();
+
+                cloudDhcpDiscover.setCustomerId(customerId);
+                cloudDhcpDiscover.setEquipmentId(equipmentId);
+                cloudDhcpDiscover.setLocationId(locationId);
+
+                if (discoverEvent.hasDhcpCommonData()) {
+                    cloudDhcpDiscover = (com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent) getDhcpCommonDataForEvent(
+                            cloudDhcpDiscover, discoverEvent.getDhcpCommonData());
+
+                } else {
+                    cloudDhcpDiscover.setxId(dhcpTransaction.getXId());
+                }
+
+                if (discoverEvent.hasHostname()) {
+                    cloudDhcpDiscover.setHostName(discoverEvent.getHostname());
+                }
+
+                LOG.debug("Cloud DhcpDiscoverEvent {}", cloudDhcpDiscover);
+
+                dhcpEventsList.add(cloudDhcpDiscover);
+
+            }
+        }
+
+        if (dhcpEventsList.size() > 0) {
+            LOG.info("Publishing DhcpEvents {}", dhcpEventsList);
+            cloudEventDispatcherInterface.publishEventsBulk(dhcpEventsList);
+        }
+    }
+
+    BaseDhcpEvent getDhcpCommonDataForEvent(BaseDhcpEvent cloudDhcpEvent, DhcpCommonData dhcpCommonData) {
+        if (dhcpCommonData.hasXId()) {
+            cloudDhcpEvent.setxId(dhcpCommonData.getXId());
+        }
+
+        if (dhcpCommonData.hasVlanId()) {
+            cloudDhcpEvent.setVlanId(dhcpCommonData.getVlanId());
+        }
+
+        if (dhcpCommonData.hasDeviceMacAddress()) {
+
+            try {
+                cloudDhcpEvent.setClientMacAddress(MacAddress.valueOf(dhcpCommonData.getDeviceMacAddress()));
+            } catch (Exception e) {
+                LOG.error("Could not parse device_mac_address from DhcpCommonData ", dhcpCommonData, e);
+            }
+        }
+
+        if (dhcpCommonData.hasDhcpServerIp()) {
+            try {
+                cloudDhcpEvent
+                        .setDhcpServerIp(InetAddress.getByAddress(dhcpCommonData.getDhcpServerIp().toByteArray()));
+            } catch (UnknownHostException e) {
+                LOG.error("Invalid Dhcp Server IP", e);
+            }
+        }
+
+        if (dhcpCommonData.hasClientIp()) {
+            try {
+                cloudDhcpEvent.setClientIp(InetAddress.getByAddress(dhcpCommonData.getClientIp().toByteArray()));
+            } catch (UnknownHostException e) {
+                LOG.error("Invalid Client IP", e);
+            }
+        }
+
+        if (dhcpCommonData.hasRelayIp()) {
+            try {
+                cloudDhcpEvent.setRelayIp(InetAddress.getByAddress(dhcpCommonData.getRelayIp().toByteArray()));
+            } catch (UnknownHostException e) {
+                LOG.error("Invalid Relay IP", e);
+            }
+        }
+
+        cloudDhcpEvent.setEventTimestamp(dhcpCommonData.getTimestampMs());
+
+        return cloudDhcpEvent;
+    }
+
     void publishSipCallEvents(int customerId, long equipmentId, long locationId, List<VideoVoiceReport> sipCallReportList) {
         // only in case it is not there, we will just use the time when we
         // received the report/event
@@ -364,7 +847,7 @@ public class RealtimeEventPublisher {
             cloudSipCallReportEvent.setEventType(RealTimeEventType.SipCallReport);
 
             cloudSipCallReportEvent.setSipCallId(callReport.getWifiSessionId());
-            cloudSipCallReportEvent.setAssociationId(Long.toUnsignedString( callReport.getSessionId()));
+            cloudSipCallReportEvent.setAssociationId(callReport.getSessionId());
 
             if (callReport.hasReason()) {
                 cloudSipCallReportEvent.setReportReason(getCallReportReason(callReport.getReason()));
@@ -430,11 +913,11 @@ public class RealtimeEventPublisher {
             }
 
             if (apCallStart.hasSessionId()) {
-                cloudSipCallStartEvent.setAssociationId(Long.toUnsignedString( apCallStart.getSessionId()));
+                cloudSipCallStartEvent.setAssociationId(apCallStart.getSessionId());
             }
 
             if (apCallStart.hasWifiSessionId()) {
-                cloudSipCallStartEvent.setAssociationId(Long.toUnsignedString( apCallStart.getWifiSessionId()));
+                cloudSipCallStartEvent.setAssociationId(apCallStart.getWifiSessionId());
             }
 
             if (apCallStart.getCodecsCount() > 0) {
@@ -494,7 +977,7 @@ public class RealtimeEventPublisher {
 
             if (apCallStop.hasSessionId()) {
 
-                cloudSipCallStopEvent.setAssociationId(Long.toUnsignedString(  apCallStop.getSessionId()));
+                cloudSipCallStopEvent.setAssociationId(apCallStop.getSessionId());
 
             }
 
@@ -558,11 +1041,11 @@ public class RealtimeEventPublisher {
             }
 
             if (apStreamVideoServer.hasSessionId()) {
-                rtsStartEvent.setSessionId(Long.toUnsignedString( apStreamVideoServer.getSessionId()));
+                rtsStartEvent.setSessionId(apStreamVideoServer.getSessionId());
             }
 
             if (apStreamVideoServer.hasVideoSessionId()) {
-                rtsStartEvent.setVideoSessionId(Long.toUnsignedString(  apStreamVideoServer.getVideoSessionId()));
+                rtsStartEvent.setVideoSessionId(apStreamVideoServer.getVideoSessionId());
             }
 
             eventsList.add(rtsStartEvent);
@@ -682,7 +1165,7 @@ public class RealtimeEventPublisher {
             }
 
             if (apStreamVideoSessionStart.hasSessionId()) {
-                rtsStartSessionEvent.setSessionId(Long.toUnsignedString( apStreamVideoSessionStart.getSessionId()));
+                rtsStartSessionEvent.setSessionId(apStreamVideoSessionStart.getSessionId());
 
             }
 
@@ -693,7 +1176,7 @@ public class RealtimeEventPublisher {
             }
 
             if (apStreamVideoSessionStart.hasVideoSessionId()) {
-                rtsStartSessionEvent.setVideoSessionId(Long.toUnsignedString( apStreamVideoSessionStart.getVideoSessionId()));
+                rtsStartSessionEvent.setVideoSessionId(apStreamVideoSessionStart.getVideoSessionId());
             }
             eventsList.add(rtsStartSessionEvent);
         }
@@ -723,7 +1206,7 @@ public class RealtimeEventPublisher {
             }
 
             if (apStreamVideoStop.hasSessionId()) {
-                rtsStopEvent.setSessionId(Long.toUnsignedString( apStreamVideoStop.getSessionId()));
+                rtsStopEvent.setSessionId(apStreamVideoStop.getSessionId());
             }
 
             if (apStreamVideoStop.hasStreamingVideoType()) {
@@ -738,7 +1221,7 @@ public class RealtimeEventPublisher {
             }
 
             if (apStreamVideoStop.hasVideoSessionId()) {
-                rtsStopEvent.setVideoSessionId(Long.toUnsignedString(  apStreamVideoStop.getVideoSessionId()));
+                rtsStopEvent.setVideoSessionId(apStreamVideoStop.getVideoSessionId());
             }
 
             eventsList.add(rtsStopEvent);

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

@@ -1,4 +1,3 @@
-
 package com.telecominfraproject.wlan.opensync.external.integration;
 
 import static org.junit.Assert.assertNotNull;
@@ -6,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;
@@ -50,8 +48,6 @@ import com.telecominfraproject.wlan.core.model.entity.CountryCode;
 import com.telecominfraproject.wlan.core.model.equipment.EquipmentType;
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
-import com.telecominfraproject.wlan.core.model.pagination.PaginationContext;
-import com.telecominfraproject.wlan.core.model.pagination.PaginationResponse;
 import com.telecominfraproject.wlan.customer.models.Customer;
 import com.telecominfraproject.wlan.customer.models.CustomerDetails;
 import com.telecominfraproject.wlan.customer.models.EquipmentAutoProvisioningSettings;
@@ -79,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;
@@ -98,9 +93,10 @@ import sts.OpensyncStats.RadioBandType;
 import sts.OpensyncStats.Report;
 
 @RunWith(SpringRunner.class)
-@ActiveProfiles(profiles = {"integration_test",})
+@ActiveProfiles(profiles = { "integration_test", })
 @SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = OpensyncExternalIntegrationCloudTest.class)
-@Import(value = {AlarmServiceInterface.class, OpensyncExternalIntegrationCloud.class, OpensyncExternalIntegrationCloudTest.Config.class,
+@Import(value = { AlarmServiceInterface.class, OpensyncExternalIntegrationCloud.class,
+        OpensyncExternalIntegrationCloudTest.Config.class,
 
 })
 public class OpensyncExternalIntegrationCloudTest {
@@ -135,6 +131,7 @@ public class OpensyncExternalIntegrationCloudTest {
     @Autowired
     OpensyncExternalIntegrationCloud opensyncExternalIntegrationCloud;
 
+
     MockitoSession mockito;
 
     @Configuration
@@ -171,12 +168,10 @@ public class OpensyncExternalIntegrationCloudTest {
         Location location = new Location();
         location.setId(8L);
         location.setCustomerId(2);
-        LocationDetails details = LocationDetails.createWithDefaults();
+        location.setDetails(LocationDetails.createWithDefaults());
-        details.setCountryCode(CountryCode.CA);
-        location.setDetails(details);
         location.setName("Location-UT");
         location.setLocationType(LocationType.BUILDING);
-        Mockito.when(locationServiceInterface.getOrNull(Mockito.anyLong())).thenReturn(location);
+
         Customer customer = new Customer();
         customer.setId(2);
         CustomerDetails customerDetails = new CustomerDetails();
@@ -195,21 +190,25 @@ public class OpensyncExternalIntegrationCloudTest {
         ssidProfile.setDetails(SsidConfiguration.createWithDefaults());
 
         apProfile.setChildProfileIds(ImmutableSet.of(ssidProfile.getId()));
-        Mockito.when(profileServiceInterface.create(ArgumentMatchers.any(Profile.class))).thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(profileServiceInterface.create(ArgumentMatchers.any(Profile.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
         // .thenReturn(ssidProfile);
-        Mockito.when(profileServiceInterface.update(ArgumentMatchers.any(Profile.class))).thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(profileServiceInterface.update(ArgumentMatchers.any(Profile.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
 
         Status fwStatus = new Status();
         fwStatus.setDetails(new EquipmentUpgradeStatusData());
-        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(), ArgumentMatchers.eq(StatusDataType.FIRMWARE)))
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
-                .thenReturn(fwStatus);
+                ArgumentMatchers.eq(StatusDataType.FIRMWARE))).thenReturn(fwStatus);
 
-        Mockito.when(firmwareServiceInterface.getDefaultCustomerTrackSetting()).thenReturn(new CustomerFirmwareTrackSettings());
+        Mockito.when(firmwareServiceInterface.getDefaultCustomerTrackSetting())
+                .thenReturn(new CustomerFirmwareTrackSettings());
         CustomerFirmwareTrackRecord fwTrackRecord = new CustomerFirmwareTrackRecord();
         fwTrackRecord.setSettings(new CustomerFirmwareTrackSettings());
         fwTrackRecord.setTrackRecordId(3);
         fwTrackRecord.setCustomerId(2);
-        Mockito.when(firmwareServiceInterface.getCustomerFirmwareTrackRecord(ArgumentMatchers.anyInt())).thenReturn(fwTrackRecord);
+        Mockito.when(firmwareServiceInterface.getCustomerFirmwareTrackRecord(ArgumentMatchers.anyInt()))
+                .thenReturn(fwTrackRecord);
 
         Equipment equipment = new Equipment();
         equipment.setCustomerId(2);
@@ -221,18 +220,24 @@ public class OpensyncExternalIntegrationCloudTest {
         equipment.setDetails(ApElementConfiguration.createWithDefaults());
 
         Mockito.when(equipmentServiceInterface.get(1L)).thenReturn(equipment);
-        Mockito.when(equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122"))).thenReturn(equipment);
+        Mockito.when(
+                equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
+                .thenReturn(equipment);
 
-        Mockito.when(equipmentServiceInterface.create(ArgumentMatchers.any(Equipment.class))).thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(equipmentServiceInterface.create(ArgumentMatchers.any(Equipment.class)))
-        Mockito.when(equipmentServiceInterface.update(ArgumentMatchers.any(Equipment.class))).thenAnswer(i -> i.getArguments()[0]);
+                .thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(equipmentServiceInterface.update(ArgumentMatchers.any(Equipment.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
 
         OvsdbSession session = Mockito.mock(OvsdbSession.class);
+
         Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(session);
 
         opensyncExternalIntegrationCloud.apConnected("Test_Client_21P10C68818122", createConnectNodeInfo());
 
+
         Mockito.verify(firmwareServiceInterface).getDefaultCustomerTrackSetting();
-        Mockito.verify(locationServiceInterface).getOrNull(ArgumentMatchers.anyLong());
+        Mockito.verifyNoInteractions(locationServiceInterface);
 
     }
 
@@ -241,12 +246,11 @@ public class OpensyncExternalIntegrationCloudTest {
         Location location = new Location();
         location.setId(8L);
         location.setCustomerId(2);
-        LocationDetails details = LocationDetails.createWithDefaults();
+        location.setDetails(LocationDetails.createWithDefaults());
-        details.setCountryCode(CountryCode.CA);
-        location.setDetails(details);
         location.setName("Location-UT");
         location.setLocationType(LocationType.BUILDING);
-        Mockito.when(locationServiceInterface.getOrNull(8L)).thenReturn(location);
+
+        Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);
 
         Customer customer = new Customer();
         customer.setId(2);
@@ -279,7 +283,8 @@ public class OpensyncExternalIntegrationCloudTest {
         childProfileIds.add(ssidProfile.getId());   
         apProfile.setChildProfileIds(childProfileIds);
 
-        Mockito.when(profileServiceInterface.create(ArgumentMatchers.any(Profile.class))).thenReturn(apProfile).thenReturn(ssidProfile).thenReturn(rfProfile);
+        Mockito.when(profileServiceInterface.create(ArgumentMatchers.any(Profile.class))).thenReturn(apProfile)
+                .thenReturn(ssidProfile).thenReturn(rfProfile);
         Mockito.when(profileServiceInterface.update(ArgumentMatchers.any(Profile.class))).thenReturn(apProfile);
         
         List<Profile> profileList = new ArrayList<>();
@@ -300,21 +305,27 @@ public class OpensyncExternalIntegrationCloudTest {
 
         Mockito.when(equipmentServiceInterface.get(1L)).thenReturn(equipment);
 
-        Mockito.when(equipmentServiceInterface.create(ArgumentMatchers.any(Equipment.class))).thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(equipmentServiceInterface.create(ArgumentMatchers.any(Equipment.class)))
-        Mockito.when(equipmentServiceInterface.update(ArgumentMatchers.any(Equipment.class))).thenAnswer(i -> i.getArguments()[0]);
+                .thenAnswer(i -> i.getArguments()[0]);
-        Mockito.when(equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122"))).thenReturn(null);
+        Mockito.when(equipmentServiceInterface.update(ArgumentMatchers.any(Equipment.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(
+                equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
+                .thenReturn(null);
 
         Status fwStatus = new Status();
         fwStatus.setDetails(new EquipmentUpgradeStatusData());
-        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(), ArgumentMatchers.eq(StatusDataType.FIRMWARE)))
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
-                .thenReturn(fwStatus);
+                ArgumentMatchers.eq(StatusDataType.FIRMWARE))).thenReturn(fwStatus);
 
-        Mockito.when(firmwareServiceInterface.getDefaultCustomerTrackSetting()).thenReturn(new CustomerFirmwareTrackSettings());
+        Mockito.when(firmwareServiceInterface.getDefaultCustomerTrackSetting())
+                .thenReturn(new CustomerFirmwareTrackSettings());
         CustomerFirmwareTrackRecord fwTrackRecord = new CustomerFirmwareTrackRecord();
         fwTrackRecord.setSettings(new CustomerFirmwareTrackSettings());
         fwTrackRecord.setTrackRecordId(3);
         fwTrackRecord.setCustomerId(2);
-        Mockito.when(firmwareServiceInterface.getCustomerFirmwareTrackRecord(ArgumentMatchers.anyInt())).thenReturn(fwTrackRecord);
+        Mockito.when(firmwareServiceInterface.getCustomerFirmwareTrackRecord(ArgumentMatchers.anyInt()))
+                .thenReturn(fwTrackRecord);
 
         OvsdbSession session = Mockito.mock(OvsdbSession.class);
 
@@ -326,7 +337,7 @@ public class OpensyncExternalIntegrationCloudTest {
         Mockito.verify(customerServiceInterface).getOrNull(ArgumentMatchers.anyInt());
         Mockito.verify(equipmentServiceInterface).getByInventoryIdOrNull("Test_Client_21P10C68818122");
         Mockito.verify(firmwareServiceInterface).getDefaultCustomerTrackSetting();
-        Mockito.verify(locationServiceInterface, Mockito.times(2)).getOrNull(ArgumentMatchers.anyLong());
+        Mockito.verify(locationServiceInterface).get(ArgumentMatchers.anyLong());
 
     }
 
@@ -339,19 +350,18 @@ public class OpensyncExternalIntegrationCloudTest {
         ssidProfile.setDetails(SsidConfiguration.createWithDefaults());
 
         apProfile.setChildProfileIds(ImmutableSet.of(ssidProfile.getId()));
-        Mockito.when(profileServiceInterface.create(ArgumentMatchers.any(Profile.class))).thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(profileServiceInterface.create(ArgumentMatchers.any(Profile.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
         // .thenReturn(ssidProfile);
-        Mockito.when(profileServiceInterface.update(ArgumentMatchers.any(Profile.class))).thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(profileServiceInterface.update(ArgumentMatchers.any(Profile.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
 
         Location location = new Location();
         location.setId(8L);
         location.setCustomerId(2);
-        LocationDetails details = LocationDetails.createWithDefaults();
+        location.setDetails(LocationDetails.createWithDefaults());
-        details.setCountryCode(CountryCode.CA);
-        location.setDetails(details);
         location.setName("Location-UT");
         location.setLocationType(LocationType.BUILDING);
-        Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);
 
         Equipment equipment = new Equipment();
         equipment.setCustomerId(2);
@@ -363,20 +373,26 @@ public class OpensyncExternalIntegrationCloudTest {
         equipment.setDetails(ApElementConfiguration.createWithDefaults());
         Status fwStatus = new Status();
         fwStatus.setDetails(new EquipmentUpgradeStatusData());
-        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(), ArgumentMatchers.eq(StatusDataType.FIRMWARE)))
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
-                .thenReturn(fwStatus);
+                ArgumentMatchers.eq(StatusDataType.FIRMWARE))).thenReturn(fwStatus);
 
-        Mockito.when(firmwareServiceInterface.getDefaultCustomerTrackSetting()).thenReturn(new CustomerFirmwareTrackSettings());
+        Mockito.when(firmwareServiceInterface.getDefaultCustomerTrackSetting())
+                .thenReturn(new CustomerFirmwareTrackSettings());
         CustomerFirmwareTrackRecord fwTrackRecord = new CustomerFirmwareTrackRecord();
         fwTrackRecord.setSettings(new CustomerFirmwareTrackSettings());
         fwTrackRecord.setTrackRecordId(3);
         fwTrackRecord.setCustomerId(2);
-        Mockito.when(firmwareServiceInterface.getCustomerFirmwareTrackRecord(ArgumentMatchers.anyInt())).thenReturn(fwTrackRecord);
+        Mockito.when(firmwareServiceInterface.getCustomerFirmwareTrackRecord(ArgumentMatchers.anyInt()))
+                .thenReturn(fwTrackRecord);
         Mockito.when(equipmentServiceInterface.get(1L)).thenReturn(equipment);
 
-        Mockito.when(equipmentServiceInterface.create(ArgumentMatchers.any(Equipment.class))).thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(equipmentServiceInterface.create(ArgumentMatchers.any(Equipment.class)))
-        Mockito.when(equipmentServiceInterface.update(ArgumentMatchers.any(Equipment.class))).thenAnswer(i -> i.getArguments()[0]);
+                .thenAnswer(i -> i.getArguments()[0]);
-        Mockito.when(equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122"))).thenReturn(equipment);
+        Mockito.when(equipmentServiceInterface.update(ArgumentMatchers.any(Equipment.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(
+                equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
+                .thenReturn(equipment);
 
         Customer customer = new Customer();
         customer.setId(2);
@@ -422,7 +438,8 @@ public class OpensyncExternalIntegrationCloudTest {
         ssidProfile.setDetails(SsidConfiguration.createWithDefaults());
 
         List<Profile> profileWithChildren = ImmutableList.of(apProfile, ssidProfile);
-        Mockito.when(profileServiceInterface.getProfileWithChildren(ArgumentMatchers.anyLong())).thenReturn(profileWithChildren);
+        Mockito.when(profileServiceInterface.getProfileWithChildren(ArgumentMatchers.anyLong()))
+                .thenReturn(profileWithChildren);
 
         assertNotNull(opensyncExternalIntegrationCloud.getApConfig("Test_Client_21P10C68818122"));
 
@@ -448,7 +465,8 @@ public class OpensyncExternalIntegrationCloudTest {
     @Test
     public void testProcessMqttMessageStringReport() {
 
-        Report report = Report.newBuilder().setNodeID("21P10C68818122").addAllClients(getOpensyncStatsClientReportsList())
+        Report report = Report.newBuilder().setNodeID("21P10C68818122")
+                .addAllClients(getOpensyncStatsClientReportsList())
                 .addAllEventReport(getOpensyncStatsEventReportsList()).build();
 
         String topic = "/ap/Test_Client_21P10C68818122/opensync";
@@ -461,8 +479,8 @@ public class OpensyncExternalIntegrationCloudTest {
         activeBssidsDetails.setActiveBSSIDs(getActiveBssidList());
         bssidStatus.setDetails(activeBssidsDetails);
 
-        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(), ArgumentMatchers.eq(StatusDataType.ACTIVE_BSSIDS)))
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
-                .thenReturn(bssidStatus);
+                ArgumentMatchers.eq(StatusDataType.ACTIVE_BSSIDS))).thenReturn(bssidStatus);
 
         Mockito.when(statusServiceInterface.update(ArgumentMatchers.any(Status.class))).thenReturn(bssidStatus);
         com.telecominfraproject.wlan.client.models.Client clientInstance = new com.telecominfraproject.wlan.client.models.Client();
@@ -471,10 +489,12 @@ public class OpensyncExternalIntegrationCloudTest {
         com.telecominfraproject.wlan.client.models.Client clientInstance2 = new com.telecominfraproject.wlan.client.models.Client();
         clientInstance2.setMacAddress(MacAddress.valueOf("C0:9A:D0:76:A9:69"));
         clientInstance2.setDetails(new ClientInfoDetails());
-        Mockito.when(clientServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.any(MacAddress.class))).thenReturn(clientInstance)
+        Mockito.when(
-                .thenReturn(clientInstance2);
+                clientServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.any(MacAddress.class)))
-        Mockito.when(clientServiceInterface.update(ArgumentMatchers.any(com.telecominfraproject.wlan.client.models.Client.class))).thenReturn(clientInstance)
+                .thenReturn(clientInstance).thenReturn(clientInstance2);
-                .thenReturn(clientInstance2);
+        Mockito.when(clientServiceInterface
+                .update(ArgumentMatchers.any(com.telecominfraproject.wlan.client.models.Client.class)))
+                .thenReturn(clientInstance).thenReturn(clientInstance2);
 
         ClientSession clientSession = new ClientSession();
         clientSession.setMacAddress(MacAddress.valueOf("7C:AB:60:E6:EA:4D"));
@@ -482,10 +502,16 @@ public class OpensyncExternalIntegrationCloudTest {
         ClientSession clientSession2 = new ClientSession();
         clientSession2.setMacAddress(MacAddress.valueOf("C0:9A:D0:76:A9:69"));
         clientSession2.setDetails(new ClientSessionDetails());
-        Mockito.when(clientServiceInterface.getSessionOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(), ArgumentMatchers.any(MacAddress.class)))
+        Mockito.when(clientServiceInterface.getSessionOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
+                ArgumentMatchers.any(MacAddress.class))).thenReturn(clientSession).thenReturn(clientSession2);
+
+        Mockito.when(clientServiceInterface.updateSession(ArgumentMatchers.any(ClientSession.class)))
                 .thenReturn(clientSession).thenReturn(clientSession2);
 
-        Mockito.when(clientServiceInterface.updateSession(ArgumentMatchers.any(ClientSession.class))).thenReturn(clientSession).thenReturn(clientSession2);
+        opensyncExternalIntegrationCloud.processMqttMessage(topic, report);
+
+        Mockito.verify(opensyncExternalIntegrationMqttProcessor, Mockito.times(1)).processMqttMessage(topic, report);
+
     }
 
     @Ignore
@@ -553,10 +579,10 @@ public class OpensyncExternalIntegrationCloudTest {
 
         OvsdbSession session = Mockito.mock(OvsdbSession.class);
         Mockito.when(session.getEquipmentId()).thenReturn(1L);
+        Mockito.when(session.getCustomerId()).thenReturn(2);
 
         Equipment equipment = new Equipment();
-        equipment.setCustomerId(2);
+        equipment.setCustomerId(1);
-        equipment.setId(1L);
         equipment.setEquipmentType(EquipmentType.AP);
         equipment.setInventoryId(apId);
         equipment.setProfileId(1);
@@ -588,13 +614,15 @@ public class OpensyncExternalIntegrationCloudTest {
 
         Mockito.when(ovsdbSessionMapInterface.getSession(apId)).thenReturn(session);
 
-        opensyncExternalIntegrationCloud.wifiVIFStateDbTableUpdate(ImmutableList.of(vifState1, vifState2, vifState3), apId);
+        opensyncExternalIntegrationCloud.wifiVIFStateDbTableUpdate(ImmutableList.of(vifState1, vifState2, vifState3),
+                apId);
 
+        Mockito.verify(session).getCustomerId();
         Mockito.verify(session).getEquipmentId();
         Mockito.verify(ovsdbSessionMapInterface).getSession(apId);
         Mockito.verify(equipmentServiceInterface).getOrNull(1L);
-        Mockito.verify(statusServiceInterface).getOrNull(2, 1L, StatusDataType.CLIENT_DETAILS);
 
+        Mockito.verify(statusServiceInterface).getOrNull(2, 1L, StatusDataType.CLIENT_DETAILS);
         Mockito.verify(statusServiceInterface).getOrNull(2, 1L, StatusDataType.ACTIVE_BSSIDS);
         Mockito.verify(statusServiceInterface).update(clientStatus);
 
@@ -626,7 +654,8 @@ public class OpensyncExternalIntegrationCloudTest {
         radioState3.setChannel(149);
         radioState3.setVifStates(ImmutableSet.of(new Uuid(UUID.randomUUID())));
         radioState3.setFreqBand(RadioType.is5GHzL);
-        radioState3.setAllowedChannels(ImmutableSet.of(00, 104, 108, 112, 116, 132, 136, 140, 144, 149, 153, 157, 161, 165));
+        radioState3.setAllowedChannels(
+                ImmutableSet.of(00, 104, 108, 112, 116, 132, 136, 140, 144, 149, 153, 157, 161, 165));
         radioState3.setTxPower(32);
         radioState3.setEnabled(true);
         radioState3.setCountry("CA");
@@ -650,18 +679,6 @@ public class OpensyncExternalIntegrationCloudTest {
 
         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);
@@ -672,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);
@@ -683,22 +702,24 @@ 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);
+        Mockito.when(session.getCustomerId()).thenReturn(2);
 
         Mockito.when(ovsdbSessionMapInterface.getSession(apId)).thenReturn(session);
 
-        opensyncExternalIntegrationCloud.wifiRadioStatusDbTableUpdate(ImmutableList.of(radioState1, radioState2, radioState3), apId);
+        opensyncExternalIntegrationCloud
+                .wifiRadioStatusDbTableUpdate(ImmutableList.of(radioState1, radioState2, radioState3), apId);
 
+        Mockito.verify(session).getCustomerId();
         Mockito.verify(session).getEquipmentId();
 
         Mockito.verify(ovsdbSessionMapInterface).getSession(apId);
         Mockito.verify(equipmentServiceInterface, Mockito.times(1)).getByInventoryIdOrNull(apId);
-        Mockito.verify(statusServiceInterface, Mockito.times(1)).getOrNull(1, 1L, StatusDataType.RADIO_CHANNEL);
 
-        Mockito.verify(statusServiceInterface, Mockito.times(3)).getOrNull(1, 1L, StatusDataType.PROTOCOL);
+        Mockito.verify(statusServiceInterface, Mockito.times(3)).getOrNull(2, 1L, StatusDataType.PROTOCOL);
         Mockito.verify(statusServiceInterface, Mockito.never()).update(bssidStatus);
 
     }
@@ -720,23 +741,6 @@ public class OpensyncExternalIntegrationCloudTest {
 
     @Test
     public void testWifiVIFStateDbTableDelete() {
-        String apId = "Test_Client_21P10C68818122";
-
-        Equipment equipment = new Equipment();
-        equipment.setCustomerId(2);
-        equipment.setId(1L);
-        equipment.setEquipmentType(EquipmentType.AP);
-        equipment.setInventoryId(apId);
-        equipment.setProfileId(1);
-        equipment.setDetails(ApElementConfiguration.createWithDefaults());
-
-        Mockito.when(equipmentServiceInterface.getByInventoryIdOrNull(apId)).thenReturn(equipment);
-        Mockito.when(equipmentServiceInterface.getOrNull(1L)).thenReturn(equipment);
-
-        OvsdbSession session = new OvsdbSession();
-        session.setApId(apId);
-        session.setEquipmentId(1L);
-        Mockito.when(ovsdbSessionMapInterface.getSession(apId)).thenReturn(session);
 
         Status bssidStatus = new Status();
         bssidStatus.setStatusDataType(StatusDataType.ACTIVE_BSSIDS);
@@ -746,36 +750,16 @@ public class OpensyncExternalIntegrationCloudTest {
         activeBssidsDetails.setActiveBSSIDs(getActiveBssidList());
         bssidStatus.setDetails(activeBssidsDetails);
 
-        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(), ArgumentMatchers.eq(StatusDataType.ACTIVE_BSSIDS)))
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
-                .thenReturn(bssidStatus);
+                ArgumentMatchers.eq(StatusDataType.ACTIVE_BSSIDS))).thenReturn(bssidStatus);
-        PaginationResponse<ClientSession> pr = Mockito.mock(PaginationResponse.class,Mockito.RETURNS_MOCKS);
-        Mockito.when(clientServiceInterface.getSessionsForCustomer(Mockito.anyInt(), Mockito.anySet(),
-                Mockito.anySet(), Mockito.isNull(), Mockito.isNull(),  Mockito.any())).thenReturn(pr);
 
-
+        opensyncExternalIntegrationCloud.wifiVIFStateDbTableDelete(ImmutableList.of(new OpensyncAPVIFState()), "apId");
-        opensyncExternalIntegrationCloud.wifiVIFStateDbTableDelete(ImmutableList.of(new OpensyncAPVIFState()), "Test_Client_21P10C68818122");
     }
 
     @Test
     public void testWifiAssociatedClientsDbTableDelete() {
-        String apId = "Test_Client_21P10C68818122";
 
-        Equipment equipment = new Equipment();
+        opensyncExternalIntegrationCloud.wifiAssociatedClientsDbTableDelete("7C:AB:60:E6:EA:4D", "apId");
-        equipment.setCustomerId(2);
-        equipment.setId(1L);
-        equipment.setEquipmentType(EquipmentType.AP);
-        equipment.setInventoryId(apId);
-        equipment.setProfileId(1);
-        equipment.setDetails(ApElementConfiguration.createWithDefaults());
-
-        Mockito.when(equipmentServiceInterface.getByInventoryIdOrNull(apId)).thenReturn(equipment);
-        Mockito.when(equipmentServiceInterface.getOrNull(1L)).thenReturn(equipment);
-
-        OvsdbSession session = new OvsdbSession();
-        session.setApId(apId);
-        session.setEquipmentId(1L);
-        Mockito.when(ovsdbSessionMapInterface.getSession(apId)).thenReturn(session);
-        opensyncExternalIntegrationCloud.wifiAssociatedClientsDbTableDelete("7C:AB:60:E6:EA:4D", "Test_Client_21P10C68818122");
     }
 
     // Helper methods
@@ -803,9 +787,11 @@ public class OpensyncExternalIntegrationCloudTest {
         return bssidList;
     }
 
+
     private List<EventReport> getOpensyncStatsEventReportsList() {
 
-        sts.OpensyncStats.EventReport.ClientAssocEvent.Builder clientAssocBuilder = EventReport.ClientAssocEvent.getDefaultInstance().toBuilder();
+        sts.OpensyncStats.EventReport.ClientAssocEvent.Builder clientAssocBuilder = EventReport.ClientAssocEvent
+                .getDefaultInstance().toBuilder();
         clientAssocBuilder.setAssocType(AssocType.ASSOC);
         clientAssocBuilder.setBand(RadioBandType.BAND5GU);
         clientAssocBuilder.setRssi(-65);
@@ -833,26 +819,29 @@ public class OpensyncExternalIntegrationCloudTest {
 
         eventReportList.add(eventReportBuilder.build());
 
+
         return eventReportList;
 
+
     }
 
     private List<ClientReport> getOpensyncStatsClientReportsList() {
         int rssi = Long.valueOf(4294967239L).intValue();
 
-        Client.Stats clientStats = Client.Stats.getDefaultInstance().toBuilder().setRssi(rssi).setRxBytes(225554786).setRxRate(24000.0).setTxBytes(1208133026)
+        Client.Stats clientStats = Client.Stats.getDefaultInstance().toBuilder().setRssi(rssi).setRxBytes(225554786)
-                .setTxRate(433300.0).setRssi(758722570).setRxFrames(10000).setTxFrames(10000).setTxRate(24000.0).build();
+                .setRxRate(24000.0).setTxBytes(1208133026).setTxRate(433300.0).setRssi(758722570).setRxFrames(10000)
-        Client client2g = Client.getDefaultInstance().toBuilder().setMacAddress("7C:AB:60:E6:EA:4D").setSsid("ssid-1").setConnected(true).setDurationMs(59977)
+                .setTxFrames(10000).setTxRate(24000.0).build();
-                .setStats(clientStats).build();
+        Client client2g = Client.getDefaultInstance().toBuilder().setMacAddress("7C:AB:60:E6:EA:4D").setSsid("ssid-1")
-        Client client5gu = Client.getDefaultInstance().toBuilder().setMacAddress("C0:9A:D0:76:A9:69").setSsid("ssid-3").setConnected(true).setDurationMs(298127)
+                .setConnected(true).setDurationMs(59977).setStats(clientStats).build();
-                .setStats(clientStats).build();
+        Client client5gu = Client.getDefaultInstance().toBuilder().setMacAddress("C0:9A:D0:76:A9:69").setSsid("ssid-3")
+                .setConnected(true).setDurationMs(298127).setStats(clientStats).build();
 
-        ClientReport clientReport2g =
+        ClientReport clientReport2g = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND2G)
-                ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND2G).setChannel(6).addAllClientList(ImmutableList.of(client2g)).build();
+                .setChannel(6).addAllClientList(ImmutableList.of(client2g)).build();
-        ClientReport clientReport5gl =
+        ClientReport clientReport5gl = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GL)
-                ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GL).setChannel(36).addAllClientList(new ArrayList<Client>()).build();
+                .setChannel(36).addAllClientList(new ArrayList<Client>()).build();
-        ClientReport clientReport5gu = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GU).setChannel(157)
+        ClientReport clientReport5gu = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GU)
-                .addAllClientList(ImmutableList.of(client5gu)).build();
+                .setChannel(157).addAllClientList(ImmutableList.of(client5gu)).build();
 
         List<ClientReport> clients = new ArrayList<>();
         clients.add(clientReport2g);
@@ -881,7 +870,8 @@ public class OpensyncExternalIntegrationCloudTest {
         connectNodeInfo.skuNumber = "connectus.ai_21P10C68818122";
         connectNodeInfo.redirectorAddr = "ssl:opensync.zone1.art2wave.com:6643";
         connectNodeInfo.platformVersion = "OPENWRT_EA8300";
-        connectNodeInfo.wifiRadioStates = ImmutableMap.of("2.4G", "home-ap-24", "5GL", "home-ap-l50", "5GU", "home-ap-u50");
+        connectNodeInfo.wifiRadioStates = ImmutableMap.of("2.4G", "home-ap-24", "5GL", "home-ap-l50", "5GU",
+                "home-ap-u50");
 
         Map<String, String> versionMatrix = new HashMap<>();
         versionMatrix.put("DATE", "Thu Jul 16 18:52:06 UTC 2020");

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

@@ -116,7 +116,7 @@ public class MqttStatsPublisherTest {
     static class Config {
 
         @Bean
-        public StatsPublisherInterface mqttStatsPublisher() {
+        public MqttStatsPublisher mqttStatsPublisher() {
             return new MqttStatsPublisher();
         }
 
@@ -125,7 +125,7 @@ public class MqttStatsPublisherTest {
     @Before
     public void setUp() throws Exception {
 
-        mockito = Mockito.mockitoSession().initMocks(this).strictness(Strictness.LENIENT).startMocking();
+        mockito = Mockito.mockitoSession().initMocks(this).strictness(Strictness.STRICT_STUBS).startMocking();
 
     }
 
@@ -148,12 +148,8 @@ public class MqttStatsPublisherTest {
     public void testExtractCustomerIdFromTopic() {
         String topic = "/ap/Test_Client_21P10C68818122/opensync";
         OvsdbSession session = Mockito.mock(OvsdbSession.class);
-        Equipment ce = Mockito.mock(Equipment.class);
+        Mockito.when(session.getCustomerId()).thenReturn(2);
-        Mockito.when(ce.getCustomerId()).thenReturn(2);
 
-        Mockito.when(
-                equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
-                .thenReturn(ce);
         Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(session);
 
         assertEquals(2, opensyncExternalIntegrationMqttProcessor.extractCustomerIdFromTopic(topic));
@@ -177,7 +173,8 @@ public class MqttStatsPublisherTest {
         Equipment equipment = new Equipment();
 
         equipment.setDetails(ApElementConfiguration.createWithDefaults());
-        equipment.setId(1L); equipment.setCustomerId(2);
+
+        equipment.setId(1L);
 
         Mockito.when(
                 equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
@@ -196,6 +193,7 @@ public class MqttStatsPublisherTest {
 
         OvsdbSession session = Mockito.mock(OvsdbSession.class);
         Mockito.when(session.getEquipmentId()).thenReturn(1L);
+        Mockito.when(session.getCustomerId()).thenReturn(2);
 
         Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(session);
 

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

@@ -159,6 +159,130 @@ public class RealtimeEventPublisherTest {
         // TODO: implement
     }
 
+    @Test
+    public void testPublishDhcpTransactionEvents() throws Exception {
+        
+        long timestamp = System.currentTimeMillis();
+        List<DhcpTransaction> dhcpTransactionList = new ArrayList<>();
+        DhcpAckEvent ackEvent = DhcpAckEvent.newBuilder()
+                .setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                        .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
+                        .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                        .setDeviceMacAddress("c0:9a:d0:76:a9:69")
+                        .setXId(123456789)
+                        .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build())
+                .setGatewayIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setPrimaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.204").getAddress()))
+                .setSecondaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.198").getAddress()))
+                .setSubnetMask(ByteString.copyFrom(InetAddress.getByName("255.255.255.0").getAddress()))
+                .setLeaseTime(172800).setTimeOffset(10).build();
+        
+        DhcpAckEvent ackEvent2 = DhcpAckEvent.newBuilder()
+                .setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                        .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
+                        .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                        .setDeviceMacAddress("f6:f0:65:99:e2:33")
+                        .setXId(123456789)
+                        .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build())
+                .setGatewayIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setPrimaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.204").getAddress()))
+                .setSecondaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.198").getAddress()))
+                .setSubnetMask(ByteString.copyFrom(InetAddress.getByName("255.255.255.0").getAddress()))
+                .setLeaseTime(172800).setTimeOffset(10).build();
+        
+        List<DhcpAckEvent> ackEventList = List.of(ackEvent, ackEvent2);
+        
+        DhcpNakEvent nakEvent1 = DhcpNakEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                        .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.129").getAddress()))
+                        .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                        .setDeviceMacAddress("24:f5:a2:ef:2e:53")
+                        .setXId(123456789)
+                        .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
+        
+        List<DhcpNakEvent> nakEventList = List.of(nakEvent1);
+        
+        DhcpOfferEvent offerEvent1 = DhcpOfferEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
+                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
+                .setXId(123456789)
+                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
+        
+        DhcpOfferEvent offerEvent2 = DhcpOfferEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
+                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setDeviceMacAddress("f6:f0:65:99:e2:33")
+                .setXId(123456789)
+                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
+
+        List<DhcpOfferEvent> offerEventList = List.of(offerEvent1,offerEvent2);
+        
+        DhcpDiscoverEvent discoverEvent1 = DhcpDiscoverEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
+                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
+                .setXId(123456789)
+                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPhone").build();
+        
+        DhcpDiscoverEvent discoverEvent2 = DhcpDiscoverEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
+                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setDeviceMacAddress("f6:f0:65:99:e2:33")
+                .setXId(123456789)
+                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPad").build();
+
+        List<DhcpDiscoverEvent> discoverEventList = List.of(discoverEvent1,discoverEvent2);
+        
+        DhcpRequestEvent requestEvent1 = DhcpRequestEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
+                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
+                .setXId(123456789)
+                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPhone").build();
+        
+        DhcpRequestEvent requestEvent2 = DhcpRequestEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
+                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setDeviceMacAddress("f6:f0:65:99:e2:33")
+                .setXId(123456789)
+                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPad").build();
+
+        List<DhcpRequestEvent> requestEventList = List.of(requestEvent1,requestEvent2);
+        
+        DhcpInformEvent informEvent = DhcpInformEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
+                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
+                .setXId(123456789)
+                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).build();
+        
+        List<DhcpInformEvent> informEventList = List.of(informEvent);
+
+        
+        DhcpDeclineEvent declineEvent = DhcpDeclineEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
+                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.129").getAddress()))
+                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
+                .setDeviceMacAddress("24:f5:a2:ef:2e:53")
+                .setXId(123456789)
+                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).build();
+
+        List<DhcpDeclineEvent> declineEventList = List.of(declineEvent);
+        
+        
+        DhcpTransaction dhcpTransaction = DhcpTransaction.newBuilder(DhcpTransaction.getDefaultInstance())
+                .addAllDhcpAckEvent(ackEventList).addAllDhcpNakEvent(nakEventList).addAllDhcpOfferEvent(offerEventList)
+                .addAllDhcpInformEvent(informEventList).addAllDhcpDeclineEvent(declineEventList)
+                .addAllDhcpDiscoverEvent(discoverEventList).addAllDhcpRequestEvent(requestEventList).setXId(123456789)
+                .build();
+
+        dhcpTransactionList.add(dhcpTransaction);
+        
+        realtimeEventPublisher.publishDhcpTransactionEvents(2, 1L, 0L, dhcpTransactionList);
+
+        Mockito.verify(cloudEventDispatcherInterface,Mockito.times(1)).publishEventsBulk(Mockito.anyList());
+
+    }
+
     @Test
     public void testPublishSipCallEvents() throws Exception {
 

opensync-ext-interface/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-ext-interface</artifactId>
@@ -13,33 +13,33 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>tip-wlan-opensync-protobuf</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<artifactId>equipment-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>profile-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>location-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>routing-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		
 

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

@@ -36,24 +36,21 @@ public interface OpensyncExternalIntegrationInterface {
 
     void wifiInetStateDbTableDelete(List<OpensyncAPInetState> inetStateTables, String apId);
     
+    void processMqttMessage(String topic, Report report);
+
+    void processMqttMessage(String topic, FlowReport flowReport);
+
+    void processMqttMessage(String topic, WCStatsReport wcStatsReport);
+
     void wifiAssociatedClientsDbTableUpdate(List<OpensyncWifiAssociatedClients> wifiAssociatedClients, String apId);
 
     void wifiAssociatedClientsDbTableDelete(String deletedClientMac, String apId);
 
     void awlanNodeDbTableUpdate(OpensyncAWLANNode opensyncAPState, String apId);
     
-    void dhcpLeasedIpDbTableUpdate(List<Map<String, String>> dhcpAttributes, String apId,
+    void dhcpLeasedIpDbTableUpdate(List<Map<String,String>> dhcpAttributes, String apId, RowUpdateOperation rowUpdateOperation);
-            RowUpdateOperation rowUpdateOperation);
 
-    void commandStateDbTableUpdate(List<Map<String, String>> commandStateAttributes, String apId,
+    void commandStateDbTableUpdate(List<Map<String,String>> commandStateAttributes, String apId, RowUpdateOperation rowUpdateOperation);
-            RowUpdateOperation rowUpdateOperation);
-
-    void apcStateDbTableUpdate(Map<String, String> apcStateAttributes, String apId,
-            RowUpdateOperation rowUpdateOperation);
-    
-    void nodeStateDbTableUpdate(List<Map<String, String>> nodeStateAttributes, String apId);
     
     void clearEquipmentStatus(String apId);
-    
-    void processMqttMessage(String topic, Report report);
 }

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

@@ -6,7 +6,6 @@ import java.util.Set;
 
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
-import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
 
 public interface OvsdbClientInterface {
 
@@ -18,8 +17,6 @@ public interface OvsdbClientInterface {
 
     String stopDebugEngine(String apId);
 
-    String processBlinkRequest(String apId, boolean blinkAllLEDs);
-
     void processConfigChanged(String apId);
 
     void processClientBlocklistChange(String apId, List<MacAddress> blockList);
@@ -36,6 +33,4 @@ public interface OvsdbClientInterface {
     
     String processNewChannelsRequest(String apId, Map<RadioType,Integer> backupChannelMap, Map<RadioType,Integer> primaryChannelMap);
 
-    String processCellSizeAttributesRequest(String apId, Map<RadioType, CellSizeAttributes> cellSizeAttributeMap);
-
 }

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

@@ -7,6 +7,7 @@ public class OvsdbSession {
     private String apId;
     private long routingId;
     private long equipmentId;
+    private int customerId;
     
     public OvsdbClient getOvsdbClient() {
         return ovsdbClient;
@@ -32,5 +33,12 @@ public class OvsdbSession {
     public void setEquipmentId(long equipmentId) {
         this.equipmentId = equipmentId;
     }
+    public int getCustomerId() {
+        return customerId;
+    }
+    public void setCustomerId(int customerId) {
+        this.customerId = customerId;
+    }
+    
     
 }

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() {
+    public boolean equals(Object obj) {
-        return Objects.hash(certificationRegion, country, firmwareVersion, ifName, ifType, ipV4Address, lanIfName, lanIfType, lanIpV4Address, lanMacAddress,
+        if (this == obj) {
-                macAddress, managerAddr, manufacturerDate, manufacturerName, manufacturerUrl, model, modelDescription, mqttSettings, platformVersion, qrCode,
+            return true;
-                redirectorAddr, referenceDesign, revision, serialNumber, skuNumber, versionMatrix, wifiRadioStates);
+        }
+        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) {
+    public int hashCode() {
-        if (this == obj)
+        return Objects.hash(country, firmwareVersion, ifName, ifType, ipV4Address, lanIfName, lanIfType, lanIpV4Address,
-            return true;
+                lanMacAddress, macAddress, managerAddr, model, mqttSettings, platformVersion, redirectorAddr, revision,
-        if (obj == null)
+                serialNumber, skuNumber, versionMatrix, wifiRadioStates);
-            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);
     }
 
     @Override
     public String toString() {
-        return "ConnectNodeInfo [mqttSettings=" + mqttSettings + ", versionMatrix=" + versionMatrix + ", wifiRadioStates=" + wifiRadioStates
+        return "ConnectNodeInfo [mqttSettings=" + mqttSettings + ", versionMatrix=" + versionMatrix
-                + ", redirectorAddr=" + redirectorAddr + ", managerAddr=" + managerAddr + ", skuNumber=" + skuNumber + ", serialNumber=" + serialNumber
+                + ", wifiRadioStates=" + wifiRadioStates + ", redirectorAddr=" + redirectorAddr + ", managerAddr="
-                + ", macAddress=" + macAddress + ", ipV4Address=" + ipV4Address + ", platformVersion=" + platformVersion + ", firmwareVersion="
+                + managerAddr + ", skuNumber=" + skuNumber + ", serialNumber=" + serialNumber + ", macAddress="
-                + firmwareVersion + ", revision=" + revision + ", model=" + model + ", ifName=" + ifName + ", ifType=" + ifType + ", country=" + country
+                + macAddress + ", ipV4Address=" + ipV4Address + ", platformVersion=" + platformVersion
-                + ", lanIpV4Address=" + lanIpV4Address + ", lanIfName=" + lanIfName + ", lanIfType=" + lanIfType + ", lanMacAddress=" + lanMacAddress
+                + ", firmwareVersion=" + firmwareVersion + ", revision=" + revision + ", model=" + model + ", ifName="
-                + ", referenceDesign=" + referenceDesign + ", qrCode=" + qrCode + ", modelDescription=" + modelDescription + ", manufacturerUrl="
+                + ifName + ", ifType=" + ifType + ", country=" + country + ", lanIpV4Address=" + lanIpV4Address
-                + manufacturerUrl + ", manufacturerName=" + manufacturerName + ", manufacturerDate=" + manufacturerDate + ", certificationRegion="
+                + ", lanIfName=" + lanIfName + ", lanIfType=" + lanIfType + ", lanMacAddress=" + lanMacAddress + "]";
-                + certificationRegion + "]";
     }
 
 }

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) {
+        if ((map.get("id") != null)
-            this.setId(getSingleValueFromSet(row, "id"));
+                && map.get("id").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
-        }
+            this.setId(row.getStringColumn("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("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-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/StatsPublisherInterface.java

@@ -1,14 +0,0 @@
-
-package com.telecominfraproject.wlan.opensync.external.integration.utils;
-
-import com.telecominfraproject.wlan.systemevent.models.SystemEvent;
-
-import sts.OpensyncStats.Report;
-
-public interface StatsPublisherInterface {
-
-    void processMqttMessage(String topic, Report report);
-
-    void publishSystemEventFromTableStateMonitor(SystemEvent event);
-
-}

opensync-ext-static/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-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>1.3.0-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

@@ -85,6 +85,7 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
                     .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);
             equipment.setLocationId(location.getId());
@@ -119,6 +120,7 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
             LOG.info("Received EventReport {}", e);
         });
 
+
     }
 
     public void processMqttMessage(String topic, FlowReport flowReport) {
@@ -196,20 +198,8 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 
     @Override
     public void clearEquipmentStatus(String apId) {
-        LOG.info("Received clearEquipmentStatus for ap {}", 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);
-
-    }
-
-    @Override
-    public void nodeStateDbTableUpdate(List<Map<String, String>> nodeStateAttributes, String apId) {
-        LOG.info("nodeStateDbTableUpdate 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>1.3.0-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>1.3.0-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>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway-cloud-docker/src/main/docker/app/opensync/logback.xml

@@ -30,22 +30,6 @@
     </triggeringPolicy>
   </appender>
   
-    <appender name="mqttMsgTracer" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>/app/logs/mqttMsgTracer.log</file>
-    <append>true</append>
-    <encoder>
-      <pattern>%date %msg%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>/app/logs/mqttMsgTracer.%i.log.gz</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>3</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>20MB</maxFileSize>
-    </triggeringPolicy>
-  </appender>
-  
   <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>/app/logs/opensyncgw.log</file>
     <append>true</append>
@@ -83,7 +67,7 @@
   <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
   <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>
 
-  <logger name="MQTT_DATA" level="INFO" additivity="false">
+  <logger name="MQTT_DATA" level="DEBUG" additivity="false">
     <appender-ref ref="mqttDataFile"/>
   </logger>
 

opensync-gateway-cloud-docker/src/main/docker/app/run.sh

@@ -22,8 +22,6 @@ FILE_STORE_DIRECTORY="${FILE_STORE_DIRECTORY_INTERNAL:=/tmp/filestore}"
 FILE_STORE_EXTERNAL_URL="${FILE_STORE_URL}"
 MQTT_BROKER_EXTERNAL_PORT="${MQTT_BROKER_EXTERNAL_PORT}"
 OVSDB_EXTERNAL_PORT="${OVSDB_EXTERNAL_PORT}"
-OFF_CHANNEL_REPORTING_INTERVAL_SECONDS="${OFF_CHANNEL_REPORTING_INTERVAL_SECONDS:=120}"
-REPORTING_INTERVAL_SECONDS="${REPORTING_INTERVAL_SECONDS:=60}"
 
 
 
@@ -108,8 +106,6 @@ PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_wan_type=$DEFAULT_WAN_TYPE"
 PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_wan_name=$DEFAULT_WAN_NAME"
 PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_lan_type=$DEFAULT_LAN_TYPE"
 PROV_PROPS+=" -Dtip.wlan.ovsdb.wifi-iface.default_lan_name=$DEFAULT_LAN_NAME"
-PROV_PROPS+=" -Dtip.wlan.defaultOffChannelReportingIntervalSeconds=$OFF_CHANNEL_REPORTING_INTERVAL_SECONDS"
-PROV_PROPS+=" -Dtip.wlan.defaultReportingIntervalSeconds=$REPORTING_INTERVAL_SECONDS"
 
 PROV_PROPS+=" -Dtip.wlan.ovsdb.autoProvisionedCustomerId=$AUTO_PROV_CUSTOMER_ID"
 

opensync-gateway-cloud-process/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway-cloud-process</artifactId>
@@ -20,95 +20,95 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-cloud</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <artifactId>filestore-service</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 		<dependency>
 			<artifactId>customer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>location-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>equipment-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>profile-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>portal-user-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>service-metric-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>system-event-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>alarm-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>client-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>routing-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>firmware-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>manufacturer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-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-cloud-process/src/main/resources/logback.xml

@@ -63,7 +63,7 @@
   <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
   <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>
   
-  <logger name="MQTT_DATA" level="INFO"/>
+  <logger name="MQTT_DATA" level="DEBUG"/>
 
   <!--   
   <logger name="org.springframework.security.web.authentication.preauth" level="DEBUG"/>

opensync-gateway-static-docker/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-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>1.3.0-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>1.3.0-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>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway</artifactId>
@@ -14,22 +14,22 @@
 		<dependency>
 			<artifactId>base-container</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>client-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>customer-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vmware.ovsdb</groupId>
@@ -47,13 +47,13 @@
 		<dependency>
 			<artifactId>service-metric-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-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/mqtt/OpensyncMqttClient.java

@@ -1,4 +1,3 @@
-
 package com.telecominfraproject.wlan.opensync.mqtt;
 
 import java.nio.charset.Charset;
@@ -6,7 +5,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.fusesource.mqtt.client.BlockingConnection;
+import org.fusesource.mqtt.client.FutureConnection;
 import org.fusesource.mqtt.client.MQTT;
 import org.fusesource.mqtt.client.Message;
 import org.fusesource.mqtt.client.QoS;
@@ -21,8 +20,9 @@ import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.stereotype.Component;
 
 import com.google.protobuf.Descriptors;
-import com.google.protobuf.TypeRegistry;
+import com.google.protobuf.MessageOrBuilder;
 import com.google.protobuf.util.JsonFormat;
+import com.google.protobuf.util.JsonFormat.TypeRegistry;
 import com.netflix.servo.DefaultMonitorRegistry;
 import com.netflix.servo.monitor.BasicCounter;
 import com.netflix.servo.monitor.BasicTimer;
@@ -33,11 +33,14 @@ import com.netflix.servo.monitor.Timer;
 import com.netflix.servo.tag.TagList;
 import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
 import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface;
-import com.telecominfraproject.wlan.opensync.external.integration.utils.StatsPublisherInterface;
 import com.telecominfraproject.wlan.opensync.util.ZlibUtil;
 
 import sts.OpensyncStats;
 import sts.OpensyncStats.Report;
+import traffic.NetworkMetadata;
+import traffic.NetworkMetadata.FlowReport;
+import wc.stats.IpDnsTelemetry;
+import wc.stats.IpDnsTelemetry.WCStatsReport;
 
 @Profile("mqtt_receiver")
 @Component
@@ -51,14 +54,18 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
 
     private final TagList tags = CloudMetricsTags.commonTags;
 
-    private final Counter messagesReceived = new BasicCounter(MonitorConfig.builder("osgw-mqtt-messagesReceived").withTags(tags).build());
+    private final Counter messagesReceived = new BasicCounter(
+            MonitorConfig.builder("osgw-mqtt-messagesReceived").withTags(tags).build());
 
-    private final Counter messageBytesReceived = new BasicCounter(MonitorConfig.builder("osgw-mqtt-messageBytesReceived").withTags(tags).build());
+    private final Counter messageBytesReceived = new BasicCounter(
+            MonitorConfig.builder("osgw-mqtt-messageBytesReceived").withTags(tags).build());
+    
+    private final Timer timerMessageProcess = new BasicTimer(
+            MonitorConfig.builder("osgw-mqtt-messageProcessTimer").withTags(tags).build());
 
-    private final Timer timerMessageProcess = new BasicTimer(MonitorConfig.builder("osgw-mqtt-messageProcessTimer").withTags(tags).build());
 
     @Autowired
-    private OpensyncExternalIntegrationInterface opensyncExternalIntegrationInterface;
+    private OpensyncExternalIntegrationInterface extIntegrationInterface;
 
     // dtop: use anonymous constructor to ensure that the following code always
     // get executed,
@@ -78,7 +85,8 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
 
     public OpensyncMqttClient(@Autowired io.netty.handler.ssl.SslContext sslContext,
             @Value("${tip.wlan.mqttBroker.address.internal:testportal.123wlan.com}") String mqttBrokerAddress,
-            @Value("${tip.wlan.mqttBroker.listenPort:1883}") int mqttBrokerListenPort, @Value("${tip.wlan.mqttBroker.user:admin}") String username,
+            @Value("${tip.wlan.mqttBroker.listenPort:1883}") int mqttBrokerListenPort,
+            @Value("${tip.wlan.mqttBroker.user:admin}") String username,
             @Value("${tip.wlan.mqttBroker.password:admin}") String password,
             @Value("${mqtt.javax.net.ssl.keyStore:/opt/tip-wlan/certs/client_keystore.jks}") String jdkKeyStoreLocation,
             @Value("${mqtt.javax.net.ssl.keyStorePassword:mypassword}") String jdkKeyStorePassword,
@@ -106,9 +114,9 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
             @Override
             public void run() {
                 while (keepReconnecting) {
-                    BlockingConnection blockingConnection = null;
+                    FutureConnection futureConnection = null;
                     try {
-                        // Thread.sleep(5000);
+                        Thread.sleep(5000);
 
                         // Create a new MQTT connection to the broker.
                         /*
@@ -136,71 +144,139 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
                          */
 
                         MQTT mqtt = new MQTT();
+                        // mqtt.setHost("tcp://192.168.0.137:61616");
                         mqtt.setHost("tls://" + mqttBrokerAddress + ":" + mqttBrokerListenPort);
                         LOG.info("Connecting to MQTT broker at {}", mqtt.getHost());
                         mqtt.setClientId("opensync_mqtt");
                         mqtt.setUserName(username);
                         mqtt.setPassword(password);
-                        blockingConnection = mqtt.blockingConnection();
+                        // Note: the following does not work with the
-                        blockingConnection.connect();
+                        // serverContext,
+                        // it has to be the
+                        // clientContext
+                        // mqtt.setSslContext(((JdkSslContext)
+                        // sslContext).context());
+                        // For now we'll rely on regular SSLContext from the JDK
 
-                        LOG.debug("Connected to MQTT broker at {}", mqtt.getHost());
+                        // TODO: revisit this blocking connection, change it to
+                        // futureConnection
+                        futureConnection = mqtt.futureConnection();
+                        futureConnection.connect();
 
-                        // NB. setting to AT_MOST_ONCE to match the APs message level
+                        LOG.info("Connected to MQTT broker at {}", mqtt.getHost());
-                        Topic[] topics = {new Topic("/ap/#", QoS.AT_MOST_ONCE),};
 
-                        blockingConnection.subscribe(topics);
+                        // Subscribe to topics:
+                        //
+                        // new Topic("mqtt/example/publish", QoS.AT_LEAST_ONCE),
+                        // new Topic("#", QoS.AT_LEAST_ONCE),
+                        // new Topic("test/#", QoS.EXACTLY_ONCE),
+                        // new Topic("foo/+/bar", QoS.AT_LEAST_ONCE)
+                        Topic[] topics = { new Topic("#", QoS.AT_LEAST_ONCE), };
+
+                        futureConnection.subscribe(topics);
                         LOG.info("Subscribed to mqtt topics {}", Arrays.asList(topics));
 
                         // prepare a JSONPrinter to format protobuf messages as
                         // json
                         List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>();
                         protobufDescriptors.addAll(OpensyncStats.getDescriptor().getMessageTypes());
+                        protobufDescriptors.addAll(IpDnsTelemetry.getDescriptor().getMessageTypes());
+                        protobufDescriptors.addAll(NetworkMetadata.getDescriptor().getMessageTypes());
                         TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build();
-                        JsonFormat.Printer jsonPrinter =
+                        JsonFormat.Printer jsonPrinter = JsonFormat.printer().includingDefaultValueFields()
-                                JsonFormat.printer().includingDefaultValueFields().omittingInsignificantWhitespace().usingTypeRegistry(oldRegistry);
+                                .omittingInsignificantWhitespace().usingTypeRegistry(oldRegistry);
 
                         // main loop - receive messages
                         while (true) {
-                            LOG.debug("{} awaiting mqtt message from broker",mqttClientThread.getName());
+                            Message mqttMsg = futureConnection.receive().await();
-                            Message mqttMsg = blockingConnection.receive();
 
                             if (mqttMsg == null) {
-                                if (LOG.isTraceEnabled())
-                                    LOG.trace("NULL message received for blocking connection");
                                 continue;
                             }
-                            Stopwatch stopwatchTimerMessageProcess = timerMessageProcess.start();
-                            try {
-                                byte payload[] = mqttMsg.getPayload();
-                                messagesReceived.increment();
-                                messageBytesReceived.increment(payload.length);
 
-                                if (payload[0] == 0x78) {
+                            LOG.debug("MQTT Topic {}", mqttMsg.getTopic());
-                                    // looks like zlib-compressed data, let's
+
-                                    // decompress
+                            byte payload[] = mqttMsg.getPayload();
-                                    // it before deserializing
+                            // we acknowledge right after receive because:
-                                    payload = ZlibUtil.decompress(payload);
+                            // a. none of the stats messages are so important
-                                }
+                            // that
-                                // Only supported protobuf on the TIP opensync APs is Report
+                            // we cannot skip one
-                                Report statsReport = Report.parseFrom(payload);
+                            // b. if there's some kind of problem with the
-                                mqttMsg.ack();
+                            // message
-                                MQTT_LOG.info("Topic {}\n{}", mqttMsg.getTopic(), jsonPrinter.print(statsReport));
+                            // (decoding or processing)
-                                opensyncExternalIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), statsReport);                           
+                            // - we want to move on as quickly as possible and
-                                LOG.debug("Dispatched report for topic {} to backend for processing", mqttMsg.getTopic());
+                            // not
+                            // let it get stuck in the
+                            // queue
+                            mqttMsg.ack();
+
+                            messagesReceived.increment();
+                            messageBytesReceived.increment(payload.length);
+                            Stopwatch stopwatchTimerMessageProcess = timerMessageProcess.start();
+                            
+                            LOG.trace("received message on topic {} size {}", mqttMsg.getTopic(), payload.length);
+
+                            if (payload[0] == 0x78) {
+                                // looks like zlib-compressed data, let's
+                                // decompress
+                                // it before deserializing
+                                payload = ZlibUtil.decompress(payload);
+                            }
+
+
+                            // attempt to parse the message as protobuf
+                            MessageOrBuilder encodedMsg = null;
+                            try {
+
+                                encodedMsg = Report.parseFrom(payload);
+
+                                MQTT_LOG.info("topic = {} Report = {}", mqttMsg.getTopic(),
+                                        jsonPrinter.print(encodedMsg));
+
+                                extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), (Report) encodedMsg);
 
                             } catch (Exception e) {
-                                LOG.error("Exception processing topic for message {}",mqttMsg, e);
+                                try {
+                                    // not a opensync_stats report, attempt to
+                                    // deserialize as network_metadata
+                                    encodedMsg = FlowReport.parseFrom(payload);
+
+                                    MQTT_LOG.info("topic = {} FlowReport = {}", mqttMsg.getTopic(),
+                                            jsonPrinter.print(encodedMsg));
+
+                                    extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(),
+                                            (FlowReport) encodedMsg);
+                                } catch (Exception e1) {
+
+                                    try {
+                                        // not a opensync_stats report and not
+                                        // network_metadata report, attempt to
+                                        // deserialize as WCStatsReport
+                                        encodedMsg = WCStatsReport.parseFrom(payload);
+
+                                        MQTT_LOG.info("topic = {} IpDnsTelemetry = {}", mqttMsg.getTopic(),
+                                                jsonPrinter.print(encodedMsg));
+
+
+                                        extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(),
+                                                (WCStatsReport) encodedMsg);
+                                    } catch (Exception e2) {
+                                        String msgStr = new String(mqttMsg.getPayload(), utf8);
+                                        MQTT_LOG.info("topic = {} message = {}", mqttMsg.getTopic(), msgStr);
+                                    }
+                                }
                             } finally {
                                 stopwatchTimerMessageProcess.stop();
                             }
+
                         }
+
                     } catch (Exception e) {
                         LOG.error("Exception in MQTT receiver", e);
                     } finally {
                         try {
-                            if (blockingConnection != null) {
+                            if (futureConnection != null) {
-                                blockingConnection.disconnect();
+                                futureConnection.disconnect();
                             }
                         } catch (Exception e1) {
                             // do nothing
@@ -226,5 +302,4 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
             mqttClientThread.interrupt();
         }
     }
-
 }

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

@@ -1,4 +1,3 @@
-
 package com.telecominfraproject.wlan.opensync.ovsdb;
 
 import com.google.common.collect.ImmutableMap;
@@ -11,7 +10,6 @@ import com.netflix.servo.tag.TagList;
 import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
-import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
 import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface;
 import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface.RowUpdateOperation;
 import com.telecominfraproject.wlan.opensync.external.integration.OvsdbClientInterface;
@@ -19,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;
@@ -28,7 +25,6 @@ import com.vmware.ovsdb.callback.ConnectionCallback;
 import com.vmware.ovsdb.exception.OvsdbClientException;
 import com.vmware.ovsdb.protocol.methods.*;
 import com.vmware.ovsdb.protocol.operation.notation.Row;
-import com.vmware.ovsdb.protocol.operation.notation.Value;
 import com.vmware.ovsdb.service.OvsdbClient;
 import com.vmware.ovsdb.service.OvsdbPassiveConnectionListener;
 import io.netty.handler.ssl.SslContext;
@@ -42,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
@@ -52,13 +47,18 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
     private final TagList tags = CloudMetricsTags.commonTags;
 
-    private final Counter connectionsAttempted = new BasicCounter(MonitorConfig.builder("osgw-connectionsAttempted").withTags(tags).build());
+    private final Counter connectionsAttempted = new BasicCounter(
+            MonitorConfig.builder("osgw-connectionsAttempted").withTags(tags).build());
 
-    private final Counter connectionsFailed = new BasicCounter(MonitorConfig.builder("osgw-connectionsFailed").withTags(tags).build());
+    private final Counter connectionsFailed = new BasicCounter(
+            MonitorConfig.builder("osgw-connectionsFailed").withTags(tags).build());
 
-    private final Counter connectionsCreated = new BasicCounter(MonitorConfig.builder("osgw-connectionsCreated").withTags(tags).build());
+    private final Counter connectionsCreated = new BasicCounter(
+            MonitorConfig.builder("osgw-connectionsCreated").withTags(tags).build());
+
+    private final Counter connectionsDropped = new BasicCounter(
+            MonitorConfig.builder("osgw-connectionsDropped").withTags(tags).build());
     
-    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,7 +117,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                 connectionsAttempted.increment();
                 
-                if (!(ovsdbClient instanceof OvsdbClientWithMetrics)) {
+                if(! (ovsdbClient instanceof OvsdbClientWithMetrics )) {
                     ovsdbClient = new OvsdbClientWithMetrics(ovsdbClient, ovsdbMetrics);
                 }
                 
@@ -125,7 +125,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                 int localPort = ovsdbClient.getConnectionInfo().getLocalPort();
                 String subjectDn;
                 try {
-                    subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
+                    subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate())
+                            .getSubjectDN().getName();
 
                     String clientCn = SslUtil.extractCN(subjectDn);
                     LOG.info("ovsdbClient connecting from {} on port {} clientCn {}", remoteHost, localPort, clientCn);
@@ -186,7 +187,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     localPort = ovsdbClient.getConnectionInfo().getLocalPort();
                     String subjectDn = null;
                     try {
-                        subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
+                        subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate())
+                                .getSubjectDN().getName();
                     } catch (Exception e) {
                         // do nothing
                     }
@@ -200,13 +202,15 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                             LOG.debug("Unable to process ap disconnect. {}", e.getMessage());
                         }
                     }
-                    LOG.info("ovsdbClient disconnected from {} on port {} clientCn {} AP {} ", remoteHost, localPort, clientCn, key);
+                    LOG.info("ovsdbClient disconnected from {} on port {} clientCn {} AP {} ", remoteHost, localPort,
+                            clientCn, key);
                     LOG.info("ovsdbClient connectedClients = {}", ovsdbSessionMapInterface.getNumSessions());
                 } finally {
                     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);
                     }
 
                 }
@@ -220,10 +224,12 @@ 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, preventClientCnAlteration);
+        connectNodeInfo = ovsdbDao.updateConnectNodeInfoOnConnect(ovsdbClient, clientCn, connectNodeInfo,
+                preventClientCnAlteration);
 
         // successfully connected - register it in our
         // connectedClients table
@@ -235,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);
@@ -243,11 +248,10 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
 
         if (opensyncAPConfig != null) {
-            ovsdbDao.configureNode(ovsdbClient, opensyncAPConfig);
+            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);
@@ -260,7 +264,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
                 ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
             }
-            ovsdbDao.enableNetworkProbeForSyntheticClient(ovsdbClient);
             ovsdbDao.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
 
         } else {
@@ -290,15 +293,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         return ovsdbDao.changeRedirectorAddress(ovsdbSession.getOvsdbClient(), apId, newRedirectorAddress);
     }
 
-    public String processBlinkRequest(String apId, boolean blinkAllLEDs) {
-        OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
-        if (ovsdbSession == null) {
-            throw new IllegalStateException("AP with id " + apId + " is not connected");
-        }
-
-        return ovsdbDao.processBlinkRequest(ovsdbSession.getOvsdbClient(), apId, blinkAllLEDs);
-    }
-
     @Override
     public void processConfigChanged(String apId) {
         LOG.debug("Starting processConfigChanged for {}", apId);
@@ -320,16 +314,13 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         ovsdbDao.removeAllSsids(ovsdbClient); // always
         ovsdbDao.removeAllInetConfigs(ovsdbClient);
         ovsdbDao.removeWifiRrm(ovsdbClient);
-        ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
-        ovsdbDao.removeAllStatsConfigs(ovsdbClient);
 
         extIntegrationInterface.clearEquipmentStatus(apId);
-
+        ovsdbDao.configureNtpServer(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureNode(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);
@@ -337,15 +328,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
         ovsdbDao.configureInterfaces(ovsdbClient);
         ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
-        
-        ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig);
-        if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
-            ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
-        }
-        ovsdbDao.enableNetworkProbeForSyntheticClient(ovsdbClient);
-        ovsdbDao.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
-        
         LOG.debug("Finished processConfigChanged for {}", apId);
+
     }
 
     @Override
@@ -421,28 +405,23 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         }
         
         try {
-            monitorNodeStateTable(ovsdbClient, key);
+            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);
-        }
         LOG.debug("Finished (re)setting monitors for AP {}", key);
     }
 
     private void monitorDhcpLeasedIpDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.dhcpLeasedIpDbTable + "_" + key,
+        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.dhcpLeasedIpDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
+                OvsdbDao.dhcpLeasedIpDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.dhcpLeasedIpDbTable,
+                        new MonitorRequest(new MonitorSelect(true, true, true, true)))),
                 tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.dhcpLeasedIpDbTable + "_" + key + " monitor callback received {}", tableUpdates);
+                        LOG.info(OvsdbDao.dhcpLeasedIpDbTable + "_" + key + " monitor callback received {}",
+                                tableUpdates);
 
                         List<Map<String, String>> insert = new ArrayList<>();
                         List<Map<String, String>> delete = new ArrayList<>();
@@ -480,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) {
@@ -504,10 +486,13 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
     private void monitorCommandStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> csCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.commandStateDbTable + "_" + key,
+        CompletableFuture<TableUpdates> csCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.commandStateDbTable, new MonitorRequest())), tableUpdates -> {
+                OvsdbDao.commandStateDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.commandStateDbTable, new MonitorRequest())),
+                tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.commandStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
+                        LOG.info(OvsdbDao.commandStateDbTable + "_" + key + " monitor callback received {}",
+                                tableUpdates);
 
                         List<Map<String, String>> insert = new ArrayList<>();
                         List<Map<String, String>> delete = new ArrayList<>();
@@ -545,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) {
@@ -568,27 +556,35 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     }
 
     private void monitorAwlanNodeDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.awlanNodeDbTable + "_" + key,
+        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.awlanNodeDbTable, new MonitorRequest(new MonitorSelect(true, false, false, true)))),
+                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);
+                        extIntegrationInterface.awlanNodeDbTableUpdate(
+                                ovsdbDao.getOpensyncAWLANNode(tableUpdates, key, ovsdbClient), key);
                     } catch (Exception e) {
                         LOG.error("awlanNodeDbTableUpdate failed", e);
                     }
                 });
 
-        extIntegrationInterface.awlanNodeDbTableUpdate(ovsdbDao.getOpensyncAWLANNode(awCf.join(), key, ovsdbClient), key);
+        extIntegrationInterface.awlanNodeDbTableUpdate(ovsdbDao.getOpensyncAWLANNode(awCf.join(), key, ovsdbClient),
+                key);
     }
 
     private void monitorWifiAssociatedClientsDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> acCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiAssociatedClientsDbTable + "_" + key,
+        CompletableFuture<TableUpdates> acCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiAssociatedClientsDbTable, new MonitorRequest())), tableUpdates -> {
+                OvsdbDao.wifiAssociatedClientsDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiAssociatedClientsDbTable, new MonitorRequest())),
+                tableUpdates -> {
 
                     try {
-                        LOG.info(OvsdbDao.wifiAssociatedClientsDbTable + "_" + key + " monitor callback received {}", tableUpdates);
+                        LOG.info(
+                                OvsdbDao.wifiAssociatedClientsDbTable + "_" + key + " monitor callback received {}",
+                                tableUpdates);
 
                         List<OpensyncWifiAssociatedClients> associatedClients = new ArrayList<>();
 
@@ -603,9 +599,11 @@ 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));
+                                    associatedClients.addAll(
+                                            ovsdbDao.getOpensyncWifiAssociatedClients(rowUpdate, key, ovsdbClient));
                                 }
                             }
 
@@ -619,13 +617,16 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                 });
 
-        extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(ovsdbDao.getInitialOpensyncWifiAssociatedClients(acCf.join(), key, ovsdbClient), key);
+        extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(
+                ovsdbDao.getInitialOpensyncWifiAssociatedClients(acCf.join(), key, ovsdbClient), key);
 
     }
 
     private void monitorWifiInetStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> isCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiInetStateDbTable + "_" + key,
+        CompletableFuture<TableUpdates> isCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiInetStateDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
+                OvsdbDao.wifiInetStateDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiInetStateDbTable,
+                        new MonitorRequest(new MonitorSelect(true, true, true, true)))),
                 tableUpdates -> {
                     try {
                         LOG.info(OvsdbDao.wifiInetStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
@@ -638,9 +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));
                                 }
 
                             }
@@ -657,129 +660,103 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                 });
 
-        extIntegrationInterface.wifiInetStateDbTableUpdate(ovsdbDao.getInitialOpensyncApInetStateForRowUpdate(isCf.join(), key, ovsdbClient), key);
+        extIntegrationInterface.wifiInetStateDbTableUpdate(
+                ovsdbDao.getInitialOpensyncApInetStateForRowUpdate(isCf.join(), key, ovsdbClient), key);
 
     }
 
     private void monitorWifiRadioStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> rsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiRadioStateDbTable + "_" + key,
+        CompletableFuture<TableUpdates> rsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiRadioStateDbTable, new MonitorRequest(new MonitorSelect(true, false, false, true)))),
+                OvsdbDao.wifiRadioStateDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiRadioStateDbTable,
+                        new MonitorRequest(new MonitorSelect(true, false, false, true)))),
                 tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.wifiRadioStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
+                        LOG.info(OvsdbDao.wifiRadioStateDbTable + "_" + key + " monitor callback received {}",
+                                tableUpdates);
 
-                        extIntegrationInterface.wifiRadioStatusDbTableUpdate(ovsdbDao.getOpensyncAPRadioState(tableUpdates, key, ovsdbClient), key);
+                        extIntegrationInterface.wifiRadioStatusDbTableUpdate(
+                                ovsdbDao.getOpensyncAPRadioState(tableUpdates, key, ovsdbClient), key);
                     } catch (Exception e) {
                         LOG.error("wifiRadioStatusDbTableUpdate failed", e);
                     }
                 });
-        extIntegrationInterface.wifiRadioStatusDbTableUpdate(ovsdbDao.getOpensyncAPRadioState(rsCf.join(), key, ovsdbClient), key);
+        extIntegrationInterface
+                .wifiRadioStatusDbTableUpdate(ovsdbDao.getOpensyncAPRadioState(rsCf.join(), key, ovsdbClient), key);
     }
 
     private void monitorWifiVifStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> vsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiVifStateDbTable + "_" + key,
+        CompletableFuture<TableUpdates> vsCf = ovsdbClient
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable, new MonitorRequest(new MonitorSelect(false, true, true, true)))),
+                .monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiVifStateDbTable + "_" + key,
-                tableUpdates -> {
+                        new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable,
-                    try {
+                                new MonitorRequest(new MonitorSelect(false, true, true, true)))),
-                        LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
+                        tableUpdates -> {
+                            try {
+                                LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}",
+                                        tableUpdates);
 
-                        List<OpensyncAPVIFState> vifsToDelete = new ArrayList<>();
+                                List<OpensyncAPVIFState> vifsToDelete = new ArrayList<>();
-                        List<OpensyncAPVIFState> vifsToInsertOrUpdate = new ArrayList<>();
+                                List<OpensyncAPVIFState> vifsToInsertOrUpdate = new ArrayList<>();
-                        for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
+                                for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
 
-                            for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+                                    for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
 
-                                if (rowUpdate.getNew() == null) {
+                                        if (rowUpdate.getNew() == null) {
-                                    // this is a deletion
+                                            // this is a deletion
-                                    vifsToDelete.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                            vifsToDelete.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(
+                                                    rowUpdate, key, ovsdbClient));
 
-                                } else {
+                                        } else {
-                                    // either an insert or
+                                            // either an insert or
-                                    // mutuate/update
+                                            // mutuate/update
-                                    vifsToInsertOrUpdate.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                            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();
 
     }
 
     private void monitorNodeStateTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.nodeStateTable + "_" + key,
+        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.nodeStateTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))), tableUpdates -> {
+                OvsdbDao.ovsdbName, OvsdbDao.nodeStateTable + "_" + key, new MonitorRequests(ImmutableMap
+                        .of(OvsdbDao.nodeStateTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
+                tableUpdates -> {
                     LOG.info(OvsdbDao.nodeStateTable + "_" + key + " monitor callback received {}");
-                    extIntegrationInterface.nodeStateDbTableUpdate(processNodeStateTableUpdate(key, tableUpdates), key);
-                    
-                });
-        extIntegrationInterface.nodeStateDbTableUpdate(processNodeStateTableUpdate(key, nsCf.join()), key);
-    }
-
-    private List<Map<String,String>> processNodeStateTableUpdate(String key, TableUpdates tableUpdates) {
-        List<Map<String, String>> updates = new ArrayList<>();
-        tableUpdates.getTableUpdates().forEach((key1, value) -> {
-            LOG.info("TableUpdate for {}", key1);
-            value.getRowUpdates().values().forEach(r -> {
-                if (r.getOld() != null) {
-                    LOG.info("Node_State old row {}", r.getOld().getColumns());
-                }
-                if (r.getNew() != null) {
-                    LOG.info("Node_State new row {}", r.getNew().getColumns());
-                    Map<String, Value> columns = r.getNew().getColumns();
-                    Map<String, String> update = new HashMap<>();
-                    update.put("key", columns.get("key").toString());
-                    update.put("module", columns.get("module").toString());
-                    update.put("persist", columns.get("persist").toString());
-                    update.put("value", columns.get("value").toString());
-                    updates.add(update);
-                }
-            });
-
-        });
-        
-        return updates;
-    }
-
-    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, true, true, 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 -> {
-
+                            if (r.getOld() != null) {
-                            Map<String, String> apcStateAttributes = ovsdbDao.getAPCState(r, key);
+                                LOG.info("Node_State old row {}", r.getOld().getColumns());
-
+                            }
-                            extIntegrationInterface.apcStateDbTableUpdate(apcStateAttributes, key, RowUpdateOperation.MODIFY);
+                            if (r.getNew() != null) {
-
+                                LOG.info("Node_State new row {}", r.getNew().getColumns());
+                            }
                         });
 
                     });
                 });
-        try {
+        nsCf.join();
-            extIntegrationInterface.apcStateDbTableUpdate(
-                    ovsdbDao.getAPCState(nsCf.join().getTableUpdates().entrySet().iterator().next().getValue().getRowUpdates().values().iterator().next(), key),
-                    key, RowUpdateOperation.INIT);
-        } catch (Exception e) {
-            LOG.error("Could not get INIT state for {}", OvsdbDao.apcStateDbTable, e);
-        }
     }
 
     @Override
@@ -829,7 +806,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
     @Override
     public String startDebugEngine(String apId, String gatewayHostname, Integer gatewayPort) {
-        LOG.debug("TipWlanOvsdbClient::startDebugEngine apId {} gatewayHostname {} gatewayPort {}", apId, gatewayHostname, gatewayPort);
+        LOG.debug("TipWlanOvsdbClient::startDebugEngine apId {} gatewayHostname {} gatewayPort {}", apId,
+                gatewayHostname, gatewayPort);
 
         try {
             OvsdbSession session = ovsdbSessionMapInterface.getSession(apId);
@@ -837,14 +815,17 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             Map<String, String> payload = new HashMap<>();
             payload.put("gateway_hostname", gatewayHostname);
             payload.put("gateway_port", gatewayPort.toString());
-            ovsdbDao.configureCommands(ovsdbClient, OvsdbDao.StartDebugEngineApCommand, payload, 0L, defaultCommandDurationSec);
+            ovsdbDao.configureCommands(ovsdbClient, OvsdbDao.StartDebugEngineApCommand, payload, 0L,
+                    defaultCommandDurationSec);
 
             LOG.debug("Started debug engine on AP {} with gateway {} port {}", apId, gatewayHostname, gatewayPort);
             return "Started debug engine on AP " + apId + " with gateway " + gatewayHostname + " port " + gatewayPort;
         } catch (Exception e) {
-            LOG.error("TipWlanOvsdbClient::startDebugEngine Failed to start debug engine on AP {} with gateway {} port {}", apId, gatewayHostname, gatewayPort,
+            LOG.error(
-                    e);
+                    "TipWlanOvsdbClient::startDebugEngine Failed to start debug engine on AP {} with gateway {} port {}",
-            return "Failed to start debug engine on AP " + apId + " with gateway " + gatewayHostname + " port " + gatewayPort;
+                    apId, gatewayHostname, gatewayPort, e);
+            return "Failed to start debug engine on AP " + apId + " with gateway " + gatewayHostname + " port "
+                    + gatewayPort;
         }
     }
 
@@ -889,7 +870,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             }
         } catch (Exception e) {
             if (switchBanks) {
-                LOG.debug("TipWlanOvsdbClient::processRebootRequest failed to trigger switch software bank on AP {}", apId, e);
+                LOG.debug("TipWlanOvsdbClient::processRebootRequest failed to trigger switch software bank on AP {}",
+                        apId, e);
                 return "failed to trigger switch software bank on AP " + apId;
             } else {
                 LOG.error("TipWlanOvsdbClient::processRebootRequest failed to trigger reboot of AP {}", apId, e);
@@ -935,34 +917,23 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         return key;
     }
 
-    public String processNewChannelsRequest(String apId, Map<RadioType, Integer> backupChannelMap, Map<RadioType, Integer> primaryChannelMap) {
+    public String processNewChannelsRequest(String apId, Map<RadioType, Integer> backupChannelMap,
+            Map<RadioType, Integer> primaryChannelMap) {
         LOG.info("TipWlanOvsdbClient::processNewChannelsRequest for AP {}", apId);
 
         try {
             OvsdbSession session = ovsdbSessionMapInterface.getSession(apId);
             OvsdbClient ovsdbClient = session.getOvsdbClient();
             ovsdbDao.processNewChannelsRequest(ovsdbClient, backupChannelMap, primaryChannelMap);
-            LOG.info("TipWlanOvsdbClient::processNewChannelsRequest change backup and/or primary channels for AP {}", apId);
+            LOG.info("TipWlanOvsdbClient::processNewChannelsRequest change backup and/or primary channels for AP {}",
+                    apId);
             return " change backup and/or primary channels for AP " + apId;
         } catch (Exception e) {
-            LOG.error("TipWlanOvsdbClient::processNewChannelsRequest failed to change backup and/or primary channels for AP {}", apId, e);
+            LOG.error(
+                    "TipWlanOvsdbClient::processNewChannelsRequest failed to change backup and/or primary channels for AP {}",
+                    apId, e);
             return "failed to change backup and/or primary channels for AP " + apId;
         }
     }
 
-    public String processCellSizeAttributesRequest(String apId, Map<RadioType, CellSizeAttributes> cellSizeAttributeMap) {
-        LOG.info("TipWlanOvsdbClient::processCellSizeAttributesRequest for AP {}", apId);
-
-        try {
-            OvsdbSession session = ovsdbSessionMapInterface.getSession(apId);
-            OvsdbClient ovsdbClient = session.getOvsdbClient();
-            ovsdbDao.processCellSizeAttributesRequest(ovsdbClient, cellSizeAttributeMap);
-            LOG.info("TipWlanOvsdbClient::processCellSizeAttributesRequest change cellSizeAttributes for AP {}", apId);
-            return " change cell size attributes for AP " + apId;
-        } catch (Exception e) {
-            LOG.error("TipWlanOvsdbClient::processCellSizeAttributesRequest failed to change cell size attributes for AP {}", apId, e);
-            return "failed to change cell size attributes for AP " + apId;
-        }
-    }
-
 }

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

@@ -9,8 +9,6 @@ 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.ApElementConfiguration;
-import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
 import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPInetState;
@@ -48,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);
@@ -62,7 +58,7 @@ public class OvsdbDao extends OvsdbDaoBase {
 
     public void configureCommands(OvsdbClient ovsdbClient, String startdebugengineapcommand,
             Map<String, String> payload, long l, long defaultCommandDurationSec) {
-        ovsdbCommand.configureCommands(ovsdbClient, startdebugengineapcommand, payload, l, defaultCommandDurationSec);
+	    ovsdbCommand.configureCommands(ovsdbClient, startdebugengineapcommand, payload, l, defaultCommandDurationSec);
     }
 
     public void configureFirmwareDownload(OvsdbClient ovsdbClient, String apId, String firmwareUrl,
@@ -86,25 +82,10 @@ public class OvsdbDao extends OvsdbDaoBase {
         ovsdbNetwork.configureInterfaces(ovsdbClient);
     }
     
-    public void configureNode(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
+    public void configureNtpServer(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-        configureNtpServer(ovsdbClient, opensyncAPConfig);
-        configureSyslog(ovsdbClient, opensyncAPConfig);
-        processBlinkRequest(ovsdbClient, opensyncAPConfig.getCustomerEquipment().getInventoryId(),
-                ((ApElementConfiguration) opensyncAPConfig.getCustomerEquipment().getDetails()).isBlinkAllLEDs());
-    }
-    
-    void configureNtpServer(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
         ovsdbNodeConfig.configureNtpServer(ovsdbClient, opensyncAPConfig);
     }
 
-    void configureSyslog(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-        ovsdbNodeConfig.configureSyslog(ovsdbClient, opensyncAPConfig);
-    }
-
-    public void configureRadsecRadiusAndRealm(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-        ovsdbRadiusProxyConfig.configureRadius(ovsdbClient, opensyncAPConfig);
-    }
-
     public void configureSsids(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
         ovsdbSsid.configureSsids(ovsdbClient, opensyncAPConfig);
     }
@@ -171,10 +152,6 @@ public class OvsdbDao extends OvsdbDaoBase {
         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) {
         ovsdbSsid.getRadiusAccountingConfiguration(apConfig, ssidConfig, security);
@@ -194,10 +171,6 @@ public class OvsdbDao extends OvsdbDaoBase {
         ovsdbRrm.processNewChannelsRequest(ovsdbClient, backupChannelMap, primaryChannelMap);
     }
 
-    public void processCellSizeAttributesRequest(OvsdbClient ovsdbClient, Map<RadioType, CellSizeAttributes> cellSizeAttributeMap) {
-        ovsdbRrm.processCellSizeAttributesRequest(ovsdbClient, cellSizeAttributeMap);
-    }
-
     public void rebootOrResetAp(OvsdbClient ovsdbClient, String ovsdbAwlanApSwitchSoftwareBank) {
         ovsdbNode.rebootOrResetAp(ovsdbClient, ovsdbAwlanApSwitchSoftwareBank);
     }
@@ -218,10 +191,6 @@ public class OvsdbDao extends OvsdbDaoBase {
         ovsdbStats.removeAllStatsConfigs(ovsdbClient);
     }
 
-    public void removeRadsecRadiusAndRealmConfigs(OvsdbClient ovsdbClient) {
-        ovsdbRadiusProxyConfig.removeRadiusConfigurations(ovsdbClient);
-    }
-
     public void removeWifiRrm(OvsdbClient ovsdbClient) {
         ovsdbRrm.removeWifiRrm(ovsdbClient);
     }
@@ -241,8 +210,4 @@ public class OvsdbDao extends OvsdbDaoBase {
         ovsdbStats.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
     }
 
-    public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
-        return ovsdbNodeConfig.processBlinkRequest(ovsdbClient,apId,blinkAllLEDs);
-    }
-
 }

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";
 
@@ -145,12 +142,6 @@ public class OvsdbDaoBase {
     @org.springframework.beans.factory.annotation.Value("${tip.wlan.fileStoreDirectory:/tmp/tip-wlan-filestore}")
     String fileStoreDirectoryName;
 
-    @org.springframework.beans.factory.annotation.Value("${tip.wlan.defaultReportingIntervalSeconds:60}")
-    public int defaultReportingIntervalSeconds;
-    
-    @org.springframework.beans.factory.annotation.Value("${tip.wlan.defaultOffChannelReportingIntervalSeconds:120}")
-    public int defaultOffChannelReportingIntervalSeconds;
-
     public OvsdbDaoBase() {
     }
 
@@ -265,7 +256,7 @@ public class OvsdbDaoBase {
         }
     }
 
-    void fillInRadioInterfaceNamesAndCountry(OvsdbClient ovsdbClient, ConnectNodeInfo ret) {
+    void fillInRadioInterfaceNames(OvsdbClient ovsdbClient, ConnectNodeInfo ret) {
         try {
             List<Operation> operations = new ArrayList<>();
             List<Condition> conditions = new ArrayList<>();
@@ -273,7 +264,6 @@ public class OvsdbDaoBase {
 
             columns.add("freq_band");
             columns.add("if_name");
-            columns.add("country");
 
             operations.add(new Select(wifiRadioStateDbTable, conditions, columns));
             CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
@@ -293,7 +283,6 @@ public class OvsdbDaoBase {
                 for (Row row : ((SelectResult) result[0]).getRows()) {
                     ret.wifiRadioStates.put(getSingleValueFromSet(row, "freq_band"),
                             getSingleValueFromSet(row, "if_name"));
-                    ret.country = getSingleValueFromSet(row, "country");
 
                 }
 

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()) {
-                if (ssidProfile.getId() == hs2Profile.getOsuSsidProfileId()) {
+                rowColumns.put("osu_ssid", new Atom<>(((SsidConfiguration) ssidProfile.getDetails()).getSsid()));
-                    rowColumns.put("osu_ssid", new Atom<>(((SsidConfiguration) ssidProfile.getDetails()).getSsid()));
+                break;
-                    break;
-                }
             }
         }
     }
@@ -538,63 +536,42 @@ 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
+                                .forEach(c -> connectionCapabilities
-                                .add(new Atom<>(c.getConnectionCapabilitiesIpProtocol().getId() + ":"
+                                        .add(new Atom<>(c.getConnectionCapabilitiesIpProtocol().getId() + ":"
-                                        + c.getConnectionCapabilitiesPortNumber() + ":"
+                                                + c.getConnectionCapabilitiesPortNumber() + ":"
-                                        + c.getConnectionCapabilitiesStatus().getId())));
+                                                + 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) 
+                        // # (ipv4_type & 0x3f) << 2 | (ipv6_type & 0x3) << 2
                         // 0x3f = 63 in decimal
                         // 0x3 = 3 in decimal
                         if (PasspointIPv6AddressType.getByName(
                                 hs2Profile.getIpAddressTypeAvailability()) != PasspointIPv6AddressType.UNSUPPORTED) {
                             int availability = PasspointIPv6AddressType
                                     .getByName(hs2Profile.getIpAddressTypeAvailability()).getId();
-                            String hexString = String.format("%02x", (availability & 0x3));
+                            String hexString = Integer.toHexString((availability & 3) << 2);
                             rowColumns.put("ipaddr_type_availability", new Atom<>(hexString));
-                        }else  if (PasspointIPv4AddressType.getByName(
+                        } else if (PasspointIPv4AddressType.getByName(
                                 hs2Profile.getIpAddressTypeAvailability()) != PasspointIPv4AddressType.UNSUPPORTED) {
                             int availability = PasspointIPv4AddressType
                                     .getByName(hs2Profile.getIpAddressTypeAvailability()).getId();
-                            String hexString = String.format("%02x", ((availability & 0x3f) << 2));
+                            String hexString = Integer.toHexString((availability & 63) << 2);
                             rowColumns.put("ipaddr_type_availability", new Atom<>(hexString));
                         }
+
                         Row row = new Row(rowColumns);
 
                         Insert newHs20Config = new Insert(hotspot20ConfigDbTable, row);
@@ -675,8 +652,8 @@ public class OvsdbHotspotConfig extends OvsdbDaoBase {
                             operations.add(newOsuProvider);
                         } else {
                             List<Condition> conditions = new ArrayList<>();
-                            conditions.add(new Condition("osu_provider_name", Function.EQUALS,
+                            conditions.add(new Condition("server_uri", Function.EQUALS,
-                                    new Atom<>(apOsuProviderName)));
+                                    new Atom<>(providerProfile.getOsuServerUri())));
                             Update updatedOsuProvider = new Update(hotspot20OsuProvidersDbTable, conditions, row);
                             operations.add(updatedOsuProvider);
                         }

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;
 
@@ -171,18 +169,4 @@ public class OvsdbMonitor extends OvsdbDaoBase {
             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/OvsdbNetworkConfig.java

@@ -212,8 +212,34 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
             List<Operation> operations = new ArrayList<>();
             Map<String, Value> tableColumns = new HashMap<>();
             Map<String, WifiInetConfigInfo> inetConfigMap = ovsdbGet.getProvisionedWifiInetConfigs(ovsdbClient);
+            WifiInetConfigInfo parentLanInterface = inetConfigMap.get(defaultLanInterfaceName);
+            if (parentLanInterface == null) {
+                throw new RuntimeException(
+                        "Cannot get lan interface " + defaultLanInterfaceName + " for vlan " + vlanId);
+            }
+            tableColumns.put("if_type", new Atom<>("vlan"));
+            tableColumns.put("vlan_id", new Atom<>(vlanId));
+            tableColumns.put("if_name", new Atom<>(parentLanInterface.ifName + "_" + Integer.toString(vlanId)));
+            tableColumns.put("parent_ifname", new Atom<>(parentLanInterface.ifName));
+            tableColumns.put("enabled", new Atom<>(true));
+            tableColumns.put("network", new Atom<>(true));
+            tableColumns.put("ip_assign_scheme", new Atom<>(parentLanInterface.ipAssignScheme));
+            tableColumns.put("NAT", new Atom<>(parentLanInterface.nat));
+            tableColumns.put("mtu", new Atom<>(1500));
+            String[] inetAddress = parentLanInterface.inetAddr.split("\\.");
+            String vlanAddress = inetAddress[0] + "." + inetAddress[1] + "." + vlanId + "." + inetAddress[3];
+            tableColumns.put("inet_addr", new Atom<>(vlanAddress));
+            tableColumns.put("netmask", new Atom<>(parentLanInterface.netmask));
+            tableColumns.put("dhcpd", com.vmware.ovsdb.protocol.operation.notation.Map.of(parentLanInterface.dhcpd));
             Row row = new Row(tableColumns);
-
+            if (inetConfigMap.containsKey(parentLanInterface.ifName + "_" + Integer.toString(vlanId))) {
+                List<Condition> conditions = new ArrayList<>();
+                conditions.add(new Condition("vlan_id", Function.EQUALS, new Atom<>(vlanId)));
+                conditions.add(new Condition("parent_ifname", Function.EQUALS, new Atom<>(parentLanInterface.ifName)));
+                operations.add(new Update(wifiInetConfigDbTable, conditions, row));
+            } else {
+                operations.add(new Insert(wifiInetConfigDbTable, row));
+            }
             WifiInetConfigInfo parentWanInterface = inetConfigMap.get(defaultWanInterfaceName);
             if (parentWanInterface == null) {
                 throw new RuntimeException(
@@ -225,7 +251,8 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
             tableColumns.put("if_name", new Atom<>(parentWanInterface.ifName + "_" + Integer.toString(vlanId)));
             tableColumns.put("parent_ifname", new Atom<>(parentWanInterface.ifName));
             tableColumns.put("enabled", new Atom<>(true));
-            tableColumns.put("ip_assign_scheme", new Atom<>("none"));
+            tableColumns.put("network", new Atom<>(true));
+            tableColumns.put("ip_assign_scheme", new Atom<>(parentWanInterface.ipAssignScheme));
             tableColumns.put("NAT", new Atom<>(parentWanInterface.nat));
             tableColumns.put("mtu", new Atom<>(1500));
             row = new Row(tableColumns);
@@ -251,7 +278,8 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
             }
             inetConfigMap = ovsdbGet.getProvisionedWifiInetConfigs(ovsdbClient);
             LOG.debug("Provisioned vlan on wan {} and lan {}",
-                    inetConfigMap.get(parentWanInterface.ifName + "_" + Integer.toString(vlanId)));
+                    inetConfigMap.get(parentWanInterface.ifName + "_" + Integer.toString(vlanId)),
+                    inetConfigMap.get(parentLanInterface.ifName + "_" + Integer.toString(vlanId)));
         } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
             LOG.error("Error in provisioning Vlan", e);
             throw new RuntimeException(e);

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,19 +166,6 @@ 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);
@@ -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,12 +207,13 @@ 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);
 
-            fillInRadioInterfaceNamesAndCountry(ovsdbClient, ret);
+            fillInRadioInterfaceNames(ovsdbClient, ret);
 
         } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
@@ -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,
+            LOG.info("Redirecting AP Node: clientCn {} serialNumber {} model {} firmwareVersion {} skuNumber {}",
-                    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,
+    ConnectNodeInfo updateConnectNodeInfoOnConnect(OvsdbClient ovsdbClient, String clientCn,
-            boolean preventCnAlteration) {
+            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.skuNumber == null) || ret.skuNumber.isEmpty()) {
-                if ((ret.certificationRegion != null && !ret.certificationRegion.equals("unknown") ) && (ret.model != null && !ret.model.equals("unknown"))) {
+                ret.skuNumber = "tip.wlan_" + ret.serialNumber;
-                    if (ret.model.endsWith("-" + ret.certificationRegion)) {
+                updateColumns.put("sku_number", new Atom<>(ret.skuNumber));
-                        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;
-                }
             }
 
             // 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<String, String> mgttSettings = com.vmware.ovsdb.protocol.operation.notation.Map
-                        com.vmware.ovsdb.protocol.operation.notation.Map.of(newMqttSettings);
+                        .of(newMqttSettings);
                 ret.mqttSettings = newMqttSettings;
                 updateColumns.put("mqtt_settings", mgttSettings);
             }

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

@@ -1,4 +1,3 @@
-
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import java.util.ArrayList;
@@ -16,8 +15,6 @@ import org.springframework.stereotype.Component;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
 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;
@@ -25,9 +22,7 @@ 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.InsertResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
-import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
 import com.vmware.ovsdb.service.OvsdbClient;
 
 @Component
@@ -38,7 +33,8 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
 
     public void configureNtpServer(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
         try {
-            ApNetworkConfiguration apNetworkConfig = (ApNetworkConfiguration) opensyncAPConfig.getApProfile().getDetails();
+            ApNetworkConfiguration apNetworkConfig = (ApNetworkConfiguration) opensyncAPConfig.getApProfile()
+                    .getDetails();
             if (apNetworkConfig.getNtpServer() == null || apNetworkConfig.getNtpServer().getValue() == null) {
                 LOG.info("Cannot configure NTP server to null value. {}", apNetworkConfig);
                 return;
@@ -47,7 +43,8 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
             Map<String, Value> updateColumns = new HashMap<>();
             updateColumns.put("value", new Atom<>(apNetworkConfig.getNtpServer().getValue()));
             List<Operation> operations = new ArrayList<>();
-            operations.add(new Update(nodeConfigTable, List.of(new Condition("module", Function.EQUALS, new Atom<>("ntp"))), new Row(updateColumns)));
+            operations.add(new Update(nodeConfigTable,
+                    List.of(new Condition("module", Function.EQUALS, new Atom<>("ntp"))), new Row(updateColumns)));
             CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
             OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
             for (OperationResult res : result) {
@@ -57,114 +54,4 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
             throw new RuntimeException(e);
         }
     }
-
-    public void configureSyslog(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-        // /usr/opensync/tools/ovsh insert Node_Config module:="syslog" key:="remote" value:="udp:192.168.178.9:1000:4"
-        // The format is a colon delimited list. log_proto:log_ip:log_port:log_priority
-        try {
-            ApNetworkConfiguration apNetworkConfig = (ApNetworkConfiguration) opensyncAPConfig.getApProfile().getDetails();
-            if (apNetworkConfig.getSyslogRelay() == null) {
-                LOG.info("Cannot configure syslog to null value. {}", apNetworkConfig);
-                return;
-            }
-
-            if (apNetworkConfig.getSyslogRelay().isEnabled()) {
-
-                if (apNetworkConfig.getSyslogRelay().getSrvHostIp() == null || apNetworkConfig.getSyslogRelay().getSeverity() == null) {
-                    LOG.info("Cannot configure syslog remote_logging without SrvHostIp and Severity values. {}", apNetworkConfig);
-                    return;
-                }
-                LOG.debug("configureSyslog remote_logging to {}", apNetworkConfig.getSyslogRelay());
-                Map<String, Value> columns = new HashMap<>();
-                columns.put("key", new Atom<>("remote"));
-                columns.put("module", new Atom<>("syslog"));
-                String delimitedValue = "udp:" + apNetworkConfig.getSyslogRelay().getSrvHostIp().getHostAddress() + ":" + String.valueOf(
-                        apNetworkConfig.getSyslogRelay().getSrvHostPort() + ":" + String.valueOf(apNetworkConfig.getSyslogRelay().getSeverity().getId()));
-                columns.put("value", new Atom<>(delimitedValue));
-                List<Operation> operations = new ArrayList<>();
-                operations.add(new Update(nodeConfigTable, List.of(new Condition("module", Function.EQUALS, new Atom<>("syslog"))), new Row(columns)));
-                CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-                OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-                long numUpdates = 0;
-                for (OperationResult res : result) {
-                    if (res instanceof UpdateResult) {
-                        numUpdates += ((UpdateResult) res).getCount();
-                        LOG.debug("configureSyslog update result {}", res);
-                    }
-                }
-                if (numUpdates == 0) {
-                    // no records existed, insert the row instead
-                    operations.clear();
-                    operations.add(new Insert(nodeConfigTable, new Row(columns)));
-                    fResult = ovsdbClient.transact(ovsdbName, operations);
-                    result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-                    for (OperationResult res : result) {
-                        LOG.debug("configureSyslog insert result {}", res);
-                    }
-                }
-            } else {
-                LOG.debug("Disable remote_logging", apNetworkConfig.getSyslogRelay());
-                List<Operation> operations = new ArrayList<>();
-                operations.add(new Delete(nodeConfigTable, List.of(new Condition("module", Function.EQUALS, new Atom<>("syslog")))));
-                CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-                OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-                for (OperationResult res : result) {
-                    if (res instanceof UpdateResult) {
-                        LOG.debug("configureSyslog disabled remote_logging {}", res);
-                    }
-                }
-            }
-        } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-    public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
-
-        String ret = null;
-        try {
-
-            LOG.debug("processBlinkRequest set BlinkLEDs to {}", blinkAllLEDs);
-            Map<String, Value> columns = new HashMap<>();
-            if (blinkAllLEDs) {
-                columns.put("module", new Atom<>("led"));
-                columns.put("key", new Atom<>("led_blink"));
-                columns.put("value", new Atom<>("on"));
-            } else {
-                columns.put("module", new Atom<>("led"));
-                columns.put("key", new Atom<>("led_off"));
-                columns.put("value", new Atom<>("off"));
-            }
-            List<Operation> operations = new ArrayList<>();
-            operations.add(new Update(nodeConfigTable, List.of(new Condition("module", Function.EQUALS, new Atom<>("led"))), new Row(columns)));
-            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-            long numUpdates = 0;
-            for (OperationResult res : result) {
-                if (res instanceof UpdateResult) {
-                    numUpdates += ((UpdateResult) res).getCount();
-                    LOG.debug("processBlinkRequest update result {}", res);
-                    ret = "processBlinkRequest update result " + res;
-                }
-            }
-            if (numUpdates == 0) {
-                // no records existed, insert the row instead
-                operations.clear();
-                operations.add(new Insert(nodeConfigTable, new Row(columns)));
-                fResult = ovsdbClient.transact(ovsdbName, operations);
-                result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-                for (OperationResult res : result) {
-                    if (res instanceof InsertResult) {
-                        LOG.debug("processBlinkRequest insert result {}", res);
-                        ret = "processBlinkRequest insert result " + res;
-                    }
-                }
-            }
-            
-            return ret;
-        } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }

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

@@ -1,8 +1,8 @@
-
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
+import com.telecominfraproject.wlan.core.model.equipment.SourceType;
 import com.telecominfraproject.wlan.equipment.models.*;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiRadioConfigInfo;
@@ -14,7 +14,6 @@ import com.vmware.ovsdb.protocol.operation.Operation;
 import com.vmware.ovsdb.protocol.operation.Update;
 import com.vmware.ovsdb.protocol.operation.notation.*;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
-import com.vmware.ovsdb.protocol.schema.DatabaseSchema;
 import com.vmware.ovsdb.service.OvsdbClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -35,174 +34,154 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
 
     void configureWifiRadios(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
         String country = opensyncAPConfig.getCountryCode(); // should be the
-        ApElementConfiguration apElementConfiguration = (ApElementConfiguration) opensyncAPConfig.getCustomerEquipment().getDetails();
+        ApElementConfiguration apElementConfiguration = (ApElementConfiguration) opensyncAPConfig.getCustomerEquipment()
+                .getDetails();
         RfConfiguration rfConfig = (RfConfiguration) opensyncAPConfig.getRfProfile().getDetails();
         Map<String, WifiRadioConfigInfo> provisionedRadioConfigs = ovsdbGet.getProvisionedWifiRadioConfigs(ovsdbClient);
         Map<String, WifiVifConfigInfo> vifConfigs = ovsdbGet.getProvisionedWifiVifConfigs(ovsdbClient);
         List<Operation> operations = new ArrayList<>();
-        try {
+        for (RadioType radioType : apElementConfiguration.getRadioMap().keySet()) {
-            CompletableFuture<DatabaseSchema> cfDatabaseSchema = ovsdbClient.getSchema(ovsdbName);
+            Map<String, String> hwConfig = new HashMap<>();
-            DatabaseSchema databaseSchema = cfDatabaseSchema.get();
+            ElementRadioConfiguration elementRadioConfig = apElementConfiguration.getRadioMap().get(radioType);
-            Set<String> columnNames = databaseSchema.getTables().get(wifiRadioConfigDbTable).getColumns().keySet();
+            RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
- 
+            boolean autoChannelSelection = rfElementConfig.getAutoChannelSelection();
-            for (RadioType radioType : apElementConfiguration.getRadioMap().keySet()) {
+            int channel = elementRadioConfig.getActiveChannel(autoChannelSelection);
-                Map<String, String> hwConfig = new HashMap<>();
+            LOG.debug("configureWifiRadios autoChannelSelection {} activeChannel {} getChannelNumber {} ",
-                ElementRadioConfiguration elementRadioConfig = apElementConfiguration.getRadioMap().get(radioType);
+                    autoChannelSelection, channel, elementRadioConfig.getChannelNumber());
-                RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
+            ChannelBandwidth bandwidth = rfElementConfig.getChannelBandwidth();
-                if (elementRadioConfig == null || rfElementConfig == null) {
+            String ht_mode = getBandwidth(bandwidth);
-                    continue;
+            RadioConfiguration radioConfig = apElementConfiguration.getAdvancedRadioMap().get(radioType);
-                }
+            int beaconInterval = rfElementConfig.getBeaconInterval();
-                boolean autoChannelSelection = rfElementConfig.getAutoChannelSelection();
+            boolean enabled = radioConfig.getRadioAdminState().equals(StateSetting.enabled);
-                int channel = elementRadioConfig.getActiveChannel(autoChannelSelection);
+            int txPower;
-                ChannelBandwidth bandwidth = rfElementConfig.getChannelBandwidth();
+            if (elementRadioConfig.getEirpTxPower().getSource() == SourceType.profile) {
-                String ht_mode = getBandwidth(bandwidth);
+                txPower = rfElementConfig.getEirpTxPower();
-                RadioConfiguration radioConfig = apElementConfiguration.getAdvancedRadioMap().get(radioType);
+            } else {
-                int beaconInterval = rfElementConfig.getBeaconInterval();
+                txPower = elementRadioConfig.getEirpTxPower().getValue();
-                boolean enabled = radioConfig.getRadioAdminState().equals(StateSetting.enabled);
+            }
-                boolean autoCellSizeSelection = rfElementConfig.getAutoCellSizeSelection();
+            String hwMode = getHwMode(rfElementConfig);
-                int txPower = 0;
+            String freqBand = getHwConfigAndFreq(radioType, hwConfig);
-                if (autoCellSizeSelection) {
+            String radioName = null;
-                    if (elementRadioConfig.getEirpTxPower() != null) {
+            for (String key : provisionedRadioConfigs.keySet()) {
-                        txPower = elementRadioConfig.getEirpTxPower().getValue();
+                if (provisionedRadioConfigs.get(key).freqBand.equals(freqBand)) {
-                    }
+                    radioName = key;
-                } else {
+                    break;
-                    txPower = rfElementConfig.getEirpTxPower();
-                }
-                String hwMode = getHwMode(rfElementConfig);
-                String freqBand = getHwConfigAndFreq(radioType, hwConfig);
-                String radioName = null;
-                for (String key : provisionedRadioConfigs.keySet()) {
-                    if (provisionedRadioConfigs.get(key).freqBand.equals(freqBand)) {
-                        radioName = key;
-                        break;
-                    }
-                }
-                LOG.debug(
-                        "configureWifiRadios for AP {} autoChannelSelection={} activeChannel={} getChannelNumber={} radioName={} freqBand={} hwMode={} txPower={} enabled={} adminStateSetting={} autoCellSizeSelection={}",
-                        opensyncAPConfig.getCustomerEquipment().getInventoryId(), autoChannelSelection, channel, elementRadioConfig.getChannelNumber(), radioName, freqBand, hwMode, txPower,
-                        enabled, radioConfig.getRadioAdminState(), autoCellSizeSelection);
-                if (radioName == null)
-                    continue;
-                String ifName = null; // for vifConfigs
-                if (radioName.equals(radio0)) {
-                    ifName = defaultRadio0;
-                } else if (radioName.equals(radio1)) {
-                    ifName = defaultRadio1;
-                } else if (radioName.equals(radio2)) {
-                    ifName = defaultRadio2;
-                }
-                if (ifName == null)
-                    continue;
-                Set<Uuid> vifUuidsForRadio = new HashSet<>();
-                for (String key : vifConfigs.keySet()) {
-                    if (key.contains(ifName))
-                        vifUuidsForRadio.add(vifConfigs.get(key).uuid);
-                }
-                int mimoMode = MimoMode.none.getId();
-                if (rfElementConfig.getMimoMode() != null) {
-                    mimoMode = rfElementConfig.getMimoMode().getId();
-                }
-                int maxNumClients = 0;
-                if (rfElementConfig.getMaxNumClients() != null) {
-                    maxNumClients = rfElementConfig.getMaxNumClients();
-                }
-                try {
-                    configureWifiRadios(freqBand, channel, hwConfig, country.toUpperCase(), beaconInterval, enabled, hwMode, ht_mode, txPower, mimoMode,
-                            vifUuidsForRadio, operations, maxNumClients,columnNames);
-                } catch (OvsdbClientException e) {
-                    LOG.error("ConfigureWifiRadios failed with OvsdbClient exception.", e);
-                    throw new RuntimeException(e);
-                } catch (TimeoutException e) {
-                    LOG.error("ConfigureWifiRadios failed with Timeout.", e);
-                    throw new RuntimeException(e);
-                } catch (ExecutionException e) {
-                    LOG.error("ConfigureWifiRadios excecution failed.", e);
-                    throw new RuntimeException(e);
-                } catch (InterruptedException e) {
-                    LOG.error("ConfigureWifiRadios interrupted.", e);
-                    throw new RuntimeException(e);
                 }
             }
-
+            if (radioName == null) continue;
+            String ifName = null; // for vifConfigs
+            if (radioName.equals(radio0)) {
+                ifName = defaultRadio0;
+            } else if (radioName.equals(radio1)) {
+                ifName = defaultRadio1;
+            } else if (radioName.equals(radio2)) {
+                ifName = defaultRadio2;
+            }
+            if (ifName == null) continue;
+            Set<Uuid> vifUuidsForRadio = new HashSet<>();
+            for (String key : vifConfigs.keySet()) {
+                if (key.contains(ifName))
+                    vifUuidsForRadio.add(vifConfigs.get(key).uuid);
+            }
+            int mimoMode = MimoMode.none.getId();
+            if (rfElementConfig.getMimoMode() != null) {
+                mimoMode = rfElementConfig.getMimoMode().getId();
+            }           
+            int maxNumClients = 0;          
+            if (rfElementConfig.getMaxNumClients() != null) {
+                maxNumClients = rfElementConfig.getMaxNumClients();
+            }
+            try {
+                configureWifiRadios(freqBand, channel, hwConfig, country.toUpperCase(), beaconInterval,
+                        enabled, hwMode, ht_mode, txPower, mimoMode, vifUuidsForRadio, operations, maxNumClients);
+            } catch (OvsdbClientException e) {
+                LOG.error("ConfigureWifiRadios failed with OvsdbClient exception.", e);
+                throw new RuntimeException(e);
+            } catch (TimeoutException e) {
+                LOG.error("ConfigureWifiRadios failed with Timeout.", e);
+                throw new RuntimeException(e);
+            } catch (ExecutionException e) {
+                LOG.error("ConfigureWifiRadios excecution failed.", e);
+                throw new RuntimeException(e);
+            } catch (InterruptedException e) {
+                LOG.error("ConfigureWifiRadios interrupted.", e);
+                throw new RuntimeException(e);
+            }
+        }
+        try {
             CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
             OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
             for (OperationResult res : result) {
-                LOG.trace("configureWifiRadios Op Result {}", res);
+                LOG.debug("Op Result {}", res);
             }
-            
-            ovsdbGet.getProvisionedWifiRadioConfigs(ovsdbClient).entrySet().forEach(r -> {
-                LOG.debug("configureWifiRadios for AP {} Wifi_Radio_Config for if_name:{}\n{}",  opensyncAPConfig.getCustomerEquipment().getInventoryId(), r.getKey(),r.getValue());
-            });
-
         } catch (OvsdbClientException | ExecutionException | InterruptedException | TimeoutException e) {
-            LOG.error("configureWifiRadios error", e);
+            LOG.error("configureWifiRadios error", e); throw new RuntimeException(e);
-            throw new RuntimeException(e);
         }
 
     }
 
     String getHwConfigAndFreq(RadioType radioType, Map<String, String> hwConfig) {
         switch (radioType) {
-            case is2dot4GHz:
+        case is2dot4GHz:
-                return "2.4G";
+            return "2.4G";
-            case is5GHz:
+        case is5GHz:
-                // 802.11h dfs (Dynamic Frequency Selection) aka military
+            // 802.11h dfs (Dynamic Frequency Selection) aka military
-                // and
+            // and
-                // weather radar
+            // weather radar
-                // avoidance protocol
+            // avoidance protocol
-                // Must not be disabled (by law)
+            // Must not be disabled (by law)
-                // NA for 2.4GHz
+            // NA for 2.4GHz
-                hwConfig.put("dfs_enable", "1");
+            hwConfig.put("dfs_enable", "1");
-                hwConfig.put("dfs_ignorecac", "0");
+            hwConfig.put("dfs_ignorecac", "0");
-                hwConfig.put("dfs_usenol", "1");
+            hwConfig.put("dfs_usenol", "1");
-                return "5G";
+            return "5G";
-            case is5GHzL:
+        case is5GHzL:
-                // 802.11h dfs (Dynamic Frequency Selection) aka military
+            // 802.11h dfs (Dynamic Frequency Selection) aka military
-                // and
+            // and
-                // weather radar
+            // weather radar
-                // avoidance protocol
+            // avoidance protocol
-                // Must not be disabled (by law)
+            // Must not be disabled (by law)
-                // NA for 2.4GHz
+            // NA for 2.4GHz
-                hwConfig.put("dfs_enable", "1");
+            hwConfig.put("dfs_enable", "1");
-                hwConfig.put("dfs_ignorecac", "0");
+            hwConfig.put("dfs_ignorecac", "0");
-                hwConfig.put("dfs_usenol", "1");
+            hwConfig.put("dfs_usenol", "1");
-                return "5GL";
+            return "5GL";
-            case is5GHzU:
+        case is5GHzU:
-                // 802.11h dfs (Dynamic Frequency Selection) aka military
+            // 802.11h dfs (Dynamic Frequency Selection) aka military
-                // and
+            // and
-                // weather radar
+            // weather radar
-                // avoidance protocol
+            // avoidance protocol
-                // Must not be disabled (by law)
+            // Must not be disabled (by law)
-                // NA for 2.4GHz
+            // NA for 2.4GHz
-                hwConfig.put("dfs_enable", "1");
+            hwConfig.put("dfs_enable", "1");
-                hwConfig.put("dfs_ignorecac", "0");
+            hwConfig.put("dfs_ignorecac", "0");
-                hwConfig.put("dfs_usenol", "1");
+            hwConfig.put("dfs_usenol", "1");
-                return "5GU";
+            return "5GU";
-            default: // don't know this interface
+        default: // don't know this interface
-                return null;
+            return null;
         }
     }
 
     private String getBandwidth(ChannelBandwidth bandwidth) {
         String ht_mode;
         switch (bandwidth) {
-            case is20MHz:
+        case is20MHz:
-                ht_mode = "HT20";
+            ht_mode = "HT20";
-                break;
+            break;
-            case is40MHz:
+        case is40MHz:
-                ht_mode = "HT40";
+            ht_mode = "HT40";
-                break;
+            break;
-            case is80MHz:
+        case is80MHz:
-                ht_mode = "HT80";
+            ht_mode = "HT80";
-                break;
+            break;
-            case is160MHz:
+        case is160MHz:
-                ht_mode = "HT160";
+            ht_mode = "HT160";
-                break;
+            break;
-            case auto:
+        case auto:
-                ht_mode = "0";
+            ht_mode = "0";
-                break;
+            break;
-            default:
+        default:
-                ht_mode = null;
+            ht_mode = null;
         }
         return ht_mode;
     }
@@ -210,45 +189,43 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
     String getHwMode(RfElementConfiguration rfElementConfig) {
         String hwMode = null;
         switch (rfElementConfig.getRadioMode()) {
-            case modeA:
+        case modeA:
-                hwMode = "11a";
+            hwMode = "11a";
-                break;
+            break;
-            case modeAB:
+        case modeAB:
-                hwMode = "11ab";
+            hwMode = "11ab";
-                break;
+            break;
-            case modeAC:
+        case modeAC:
-                hwMode = "11ac";
+            hwMode = "11ac";
-                break;
+            break;
-            case modeB:
+        case modeB:
-                hwMode = "11b";
+            hwMode = "11b";
-                break;
+            break;
-            case modeG:
+        case modeG:
-                hwMode = "11g";
+            hwMode = "11g";
-                break;
+            break;
-            case modeAX:
+        case modeAX:
-                hwMode = "11ax";
+            hwMode = "11ax";
-                break;
+            break;
-            case modeN:
+        case modeN:
-                hwMode = "11n";
+            hwMode = "11n";
-                break;
+            break;
-            case auto:
+        default:
-                hwMode = "auto";
-                break;
-            default:
         }
         return hwMode;
     }
 
-    void configureWifiRadios(String freqBand, int channel, Map<String, String> hwConfig, String country, int beaconInterval, boolean enabled, String hwMode,
+    void configureWifiRadios(String freqBand, int channel, Map<String, String> hwConfig,
-            String ht_mode, int txPower, int mimoMode, Set<Uuid> vifUuidsForRadio, List<Operation> operations, int maxNumClients, Set<String> tableColumns)
+                             String country, int beaconInterval, boolean enabled, String hwMode, String ht_mode, int txPower,
-            throws OvsdbClientException, TimeoutException, ExecutionException, InterruptedException {
+                             int mimoMode, Set<Uuid> vifUuidsForRadio, List<Operation> operations, int maxNumClients) throws OvsdbClientException, TimeoutException, ExecutionException, InterruptedException {
         Map<String, Value> updateColumns = new HashMap<>();
         List<Condition> conditions = new ArrayList<>();
         conditions.add(new Condition("freq_band", Function.EQUALS, new Atom<>(freqBand)));
         updateColumns.put("channel", new Atom<>(channel));
         updateColumns.put("country", new Atom<>(country));
         @SuppressWarnings("unchecked")
-        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> hwConfigMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(hwConfig);
+        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> hwConfigMap = com.vmware.ovsdb.protocol.operation.notation.Map
+                .of(hwConfig);
         updateColumns.put("hw_config", hwConfigMap);
         updateColumns.put("bcn_int", new Atom<>(beaconInterval));
         updateColumns.put("enabled", new Atom<>(enabled));
@@ -266,9 +243,10 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
             updateColumns.put("hw_mode", new Atom<>(hwMode));
         }
         configureCustomOptionsMap(maxNumClients, updateColumns);
-        setTxAndRxChainmask(mimoMode, updateColumns,tableColumns);
+        setTxAndRxChainmask(mimoMode, updateColumns);
         if (vifUuidsForRadio.size() > 0) {
-            com.vmware.ovsdb.protocol.operation.notation.Set vifConfigUuids = com.vmware.ovsdb.protocol.operation.notation.Set.of(vifUuidsForRadio);
+            com.vmware.ovsdb.protocol.operation.notation.Set vifConfigUuids = com.vmware.ovsdb.protocol.operation.notation.Set
+                    .of(vifUuidsForRadio);
             updateColumns.put("vif_configs", vifConfigUuids);
         }
         Row row = new Row(updateColumns);
@@ -276,60 +254,31 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
     }
 
     void configureCustomOptionsMap(int maxNumClients, Map<String, Value> updateColumns) {
-        Map<String, String> customOptions = new HashMap<>();
+        Map<String,String> customOptions = new HashMap<>();
         customOptions.put("max_clients", String.valueOf(maxNumClients));
         @SuppressWarnings("unchecked")
-        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> customOptionsMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(customOptions);
+        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> customOptionsMap = com.vmware.ovsdb.protocol.operation.notation.Map
+        .of(customOptions);           
         updateColumns.put("custom_options", customOptionsMap);           
     }
 
-    void setTxAndRxChainmask(int mimoMode, Map<String, Value> updateColumns, Set<String> tableColumns) {
+    void setTxAndRxChainmask(int mimoMode, Map<String, Value> updateColumns) {
         /*
          * Chainmask is a bitmask, so map mimo mode values accordingly
          * Note values 0, 1 remain unchanged 
          * 
-         * mimoMode bitmask
+         * mimoMode  bitmask 
-         * 0       0 
+         *    0         0 
-         * 1       1        1
+         *    1         1 
-         * 2       3        2
+         *    2         3 
-         * 3       7        4
+         *    3         7 
-         * 4     15        8
+         *    4        15
-         * 5      31     16
-         * 6      63     32
-         * 7    127     64
-         * 8     255   128     
          */
-        switch (mimoMode) {
+        if (mimoMode == 2) {mimoMode = 3;}
-            case 0: // unchanged
+        else if (mimoMode == 3) {mimoMode = 7;}
-                break;
+        else if (mimoMode == 4) {mimoMode = 15;}
-            case 1: // unchanged
-                break;
-            case 2:
-                mimoMode = 3;
-                break;
-            case 3:
-                mimoMode = 7;
-                break;
-            case 4:
-                mimoMode = 15;
-                break;
-            case 5:
-                mimoMode = 31;
-                break;
-            case 6:
-                mimoMode = 63;
-                break;
-            case 7:
-                mimoMode = 127;
-                break;
-            case 8:
-                mimoMode = 255;
-                break;
-        }
         updateColumns.put("tx_chainmask", new Atom<>(mimoMode));
-        if (tableColumns.contains("rx_chainmask")) {
+        updateColumns.put("rx_chainmask", new Atom<>(mimoMode));       
-            updateColumns.put("rx_chainmask", new Atom<>(mimoMode));
-        }
     }
 
 }

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

@@ -1,199 +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.protocol.schema.DatabaseSchema;
-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);
-        }
-    }
-
-    /*
-     * root@OpenAp-ab1f4d:~# ovsdb-client list-columns Radius_Proxy_Config
-     * 
-     * Column Type
-     * ------------------ ---------------------------------------------------------------
-     * realm {"key":{"maxLength":256,"type":"string"},"max":16,"min":0}
-     * radius_config_name "string"
-     * _uuid "uuid"
-     * acct_port {"key":"integer","min":0}
-     * client_key {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
-     * server "string"
-     * _version "uuid"
-     * port "integer"
-     * radsec "boolean"
-     * client_cert {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
-     * acct_server {"key":"string","min":0}
-     * passphrase {"key":{"maxLength":128,"type":"string"},"min":0}
-     * acct_secret {"key":"string","min":0}
-     * ca_cert {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
-     * auto_discover "boolean"
-     * secret "string"
-     */
-    private void configureRadiusServers(OvsdbClient ovsdbClient, OpensyncAPConfig apConfig, List<Operation> operations)
-            throws OvsdbClientException, InterruptedException, ExecutionException, TimeoutException {
-
-        // TODO: remove the schema check when AP load available
-        DatabaseSchema databaseSchema = ovsdbClient.getSchema(ovsdbName).get();
-
-        for (RadiusProxyConfiguration rsc : ((ApNetworkConfiguration) apConfig.getApProfile().getDetails()).getRadiusProxyConfigurations()) {
-            Map<String, Value> updateColumns = new HashMap<>();
-            if (rsc.getServer() != null)
-                updateColumns.put("server", new Atom<>(rsc.getServer().getHostAddress()));
-            if (rsc.getName() != null)
-                updateColumns.put("radius_config_name", new Atom<>(rsc.getName()));
-            if (rsc.getPort() != null)
-                updateColumns.put("port", new Atom<>(rsc.getPort()));
-            if (rsc.getRealm() != null)
-                updateColumns.put("realm", Set.of(rsc.getRealm()));
-            if (rsc.getUseRadSec() != null) {
-                updateColumns.put("radsec", new Atom<>(rsc.getUseRadSec()));
-                if (rsc.getUseRadSec()) {
-                    getCertificateUrls(rsc, updateColumns);
-                    updateColumns.put("passphrase", new Atom<>(rsc.getPassphrase()));
-                }
-            }
-            if (rsc.getSharedSecret() != null)
-                updateColumns.put("secret", new Atom<>(rsc.getSharedSecret()));
-            if (rsc.getAcctServer() != null) {
-                updateColumns.put("acct_server", new Atom<>(rsc.getAcctServer().getHostAddress()));
-            }
-            if (rsc.getSharedSecret() != null) {
-                updateColumns.put("acct_secret", new Atom<>(rsc.getSharedSecret()));
-            }
-            if (rsc.getAcctPort() != null) {
-                updateColumns.put("acct_port", new Atom<>(rsc.getAcctPort()));
-            }
-            if (databaseSchema.getTables().get(radiusConfigDbTable).getColumns().containsKey("auto_discover")) {
-                if (rsc.getUseRadSec() != null && rsc.getUseRadSec() && rsc.getDynamicDiscovery() != null &&  rsc.getDynamicDiscovery()) {
-                    // if useRadSec && dynamicDiscovery enabled, do not send server information
-                    updateColumns.put("auto_discover", new Atom<>(true));
-                    updateColumns.remove("acct_server");
-                    updateColumns.remove("acct_secret");
-                    updateColumns.remove("acct_port");
-                    updateColumns.remove("server");
-                    updateColumns.remove("port");
-                    updateColumns.remove("secret");
-                } else {
-                    // if !useRadSec, auto_discover is false regardless of it's desired setting
-                    // retain server information
-                    updateColumns.put("auto_discover", new Atom<>(false));
-                }
-            }
-            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

@@ -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;
@@ -14,12 +12,10 @@ import java.util.concurrent.TimeoutException;
 import org.springframework.stereotype.Component;
 
 import com.telecominfraproject.wlan.core.model.equipment.AutoOrManualValue;
-import com.telecominfraproject.wlan.core.model.equipment.OBSSHopMode;
 import com.telecominfraproject.wlan.core.model.equipment.RadioBestApSettings;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
 import com.telecominfraproject.wlan.core.model.equipment.SourceType;
 import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
-import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
 import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration;
 import com.telecominfraproject.wlan.equipment.models.ManagementRate;
 import com.telecominfraproject.wlan.equipment.models.MulticastRate;
@@ -42,16 +38,15 @@ import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
 import com.vmware.ovsdb.protocol.operation.result.InsertResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
-import com.vmware.ovsdb.protocol.schema.DatabaseSchema;
 import com.vmware.ovsdb.service.OvsdbClient;
 
 @Component
 public class OvsdbRrmConfig extends OvsdbDaoBase {
     void configureWifiRrm(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
 
-        ApElementConfiguration apElementConfig = (ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails();
+        ApElementConfiguration apElementConfig = (ApElementConfiguration) opensyncApConfig.getCustomerEquipment()
+                .getDetails();
         RfConfiguration rfConfig = (RfConfiguration) opensyncApConfig.getRfProfile().getDetails();
-
         for (RadioType radioType : apElementConfig.getRadioMap().keySet()) {
             String freqBand = null;
             if (radioType == RadioType.is2dot4GHz) {
@@ -71,24 +66,28 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
             ElementRadioConfiguration elementRadioConfig = apElementConfig.getRadioMap().get(radioType);
             RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
             if (elementRadioConfig == null || rfElementConfig == null) {
-                continue; // don't have a radio of this kind in the map
+            	continue; // don't have a radio of this kind in the map
             }
             
             boolean autoChannelSelection = rfElementConfig.getAutoChannelSelection();
             int backupChannel = elementRadioConfig.getActiveBackupChannel(autoChannelSelection);
+            LOG.debug("configureWifiRadios autoChannelSelection {} activeBackupChannel {}",
+                    autoChannelSelection, backupChannel);
             
-            boolean autoCellSizeSelection = rfElementConfig.getAutoCellSizeSelection();
+            AutoOrManualValue probeResponseThresholdDb = null;
-            Integer probeResponseThresholdDb = null;
+            AutoOrManualValue clientDisconnectThresholdDb = null;
-            Integer clientDisconnectThresholdDb = null;
             
             if (elementRadioConfig.getProbeResponseThresholdDb() != null) {
-                probeResponseThresholdDb = getSourcedValue(autoCellSizeSelection, rfElementConfig.getProbeResponseThresholdDb(),
+	            probeResponseThresholdDb = getSourcedValue(elementRadioConfig.getProbeResponseThresholdDb().getSource(),
-                        elementRadioConfig.getProbeResponseThresholdDb().getValue());
+	                    rfElementConfig.getProbeResponseThresholdDb(),
+	                    elementRadioConfig.getProbeResponseThresholdDb().getValue());
             }
             
             if (elementRadioConfig.getClientDisconnectThresholdDb() != null) {
-                clientDisconnectThresholdDb = getSourcedValue(autoCellSizeSelection, rfElementConfig.getClientDisconnectThresholdDb(),
+	            clientDisconnectThresholdDb = getSourcedValue(
-                        elementRadioConfig.getClientDisconnectThresholdDb().getValue());
+	                    elementRadioConfig.getClientDisconnectThresholdDb().getSource(),
+	                    rfElementConfig.getClientDisconnectThresholdDb(),
+	                    elementRadioConfig.getClientDisconnectThresholdDb().getValue());
             }
 
             RadioConfiguration radioConfig = apElementConfig.getAdvancedRadioMap().get(radioType);
@@ -96,30 +95,62 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
             ManagementRate managementRate = null;
             RadioBestApSettings bestApSettings = null;
             if (radioConfig != null) {
-                if (radioConfig.getMulticastRate() != null) {
+            	if (radioConfig.getMulticastRate() != null) {
-                    multicastRate = autoCellSizeSelection ? radioConfig.getMulticastRate().getValue() : rfElementConfig.getMulticastRate();
+            		multicastRate = radioConfig.getMulticastRate().getSource() == SourceType.profile
-                }
+                        ? rfElementConfig.getMulticastRate()
+                        : radioConfig.getMulticastRate().getValue();
+            	}
             	
-                if (radioConfig.getManagementRate() != null) {
+            	if (radioConfig.getManagementRate() != null) {
-                    managementRate = autoCellSizeSelection ? radioConfig.getManagementRate().getValue() : rfElementConfig.getManagementRate();
+                	managementRate = radioConfig.getManagementRate().getSource() == SourceType.profile
-                }
+                        ? rfElementConfig.getManagementRate()
+                        : radioConfig.getManagementRate().getValue();
+            	}
             	
-                if (radioConfig.getBestApSettings() != null) {
+            	if (radioConfig.getBestApSettings() != null) {
-                    bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile ? rfElementConfig.getBestApSettings()
+                	bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile
-                            : radioConfig.getBestApSettings().getValue();
+                        ? rfElementConfig.getBestApSettings()
+                        : radioConfig.getBestApSettings().getValue();
+            	}
+            }
+
+            int multicastRateMbps = 0;
+            if (multicastRate != null) {
+                switch (multicastRate) {
+                case rate6mbps:
+                    multicastRateMbps = 6;
+                    break;
+                case rate9mbps:
+                    multicastRateMbps = 9;
+                    break;
+                case rate12mbps:
+                    multicastRateMbps = 12;
+                    break;
+                case rate18mbps:
+                    multicastRateMbps = 18;
+                    break;
+                case rate24mbps:
+                    multicastRateMbps = 24;
+                    break;
+                case rate36mbps:
+                    multicastRateMbps = 36;
+                    break;
+                case rate48mbps:
+                    multicastRateMbps = 48;
+                    break;
+                case rate54mbps:
+                    multicastRateMbps = 54;
+                    break;
+                case auto:
+                default:
+                    multicastRateMbps = 0;
                 }
             }
 
-            OBSSHopMode obssHopMode = rfElementConfig.getChannelHopSettings().getObssHopMode();
-            int noiseFloorThresholdInDB = rfElementConfig.getChannelHopSettings().getNoiseFloorThresholdInDB();
-            int noiseFloorThresholdTimeInSeconds = rfElementConfig.getChannelHopSettings().getNoiseFloorThresholdTimeInSeconds();
-            int nonWifiThresholdInPercentage = rfElementConfig.getChannelHopSettings().getNonWifiThresholdInPercentage();
-            int nonWifiThresholdTimeInSeconds = rfElementConfig.getChannelHopSettings().getNonWifiThresholdTimeInSeconds();
             if (freqBand != null) {
                 try {
-                    configureWifiRrm(ovsdbClient, freqBand, backupChannel, probeResponseThresholdDb, clientDisconnectThresholdDb, managementRate,
+                    configureWifiRrm(ovsdbClient, freqBand, backupChannel, probeResponseThresholdDb, 
-                            bestApSettings, multicastRate, obssHopMode, noiseFloorThresholdInDB, noiseFloorThresholdTimeInSeconds, nonWifiThresholdInPercentage,
+                    		clientDisconnectThresholdDb, managementRate, bestApSettings, multicastRateMbps);
-                            nonWifiThresholdTimeInSeconds);
                 } catch (OvsdbClientException e) {
                     LOG.error("configureRrm failed with OvsdbClient exception.", e);
                     throw new RuntimeException(e);
@@ -136,43 +167,37 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
         }
     }
 
-    void configureWifiRrm(OvsdbClient ovsdbClient, String freqBand, int backupChannel, Integer probeResponseThreshold, Integer clientDisconnectThreshold,
+    void configureWifiRrm(OvsdbClient ovsdbClient, String freqBand, int backupChannel,
-            ManagementRate managementRate, RadioBestApSettings bestApSettings, MulticastRate multicastRate, OBSSHopMode obssHopMode,
+            AutoOrManualValue probeResponseThreshold, AutoOrManualValue clientDisconnectThreshold,
-            int noiseFloorThresholdInDB, int noiseFloorThresholdTimeInSeconds, int nonWifiThresholdInPercentage, int nonWifiThresholdTimeInSeconds)
+            ManagementRate managementRate, RadioBestApSettings bestApSettings, int multicastRate)
             throws OvsdbClientException, TimeoutException, ExecutionException, InterruptedException {
 
-        CompletableFuture<DatabaseSchema> cfDatabaseSchema = ovsdbClient.getSchema(ovsdbName);
-        DatabaseSchema databaseSchema = cfDatabaseSchema.get();
-        Set<String> columnNames = databaseSchema.getTables().get(wifiRrmConfigDbTable).getColumns().keySet();
-
         List<Operation> operations = new ArrayList<>();
         Map<String, Value> updateColumns = new HashMap<>();
 
-        if (columnNames.contains("freq_band")) updateColumns.put("freq_band", new Atom<>(freqBand));
+        updateColumns.put("freq_band", new Atom<>(freqBand));
-        if (columnNames.contains("backup_channel")) updateColumns.put("backup_channel", new Atom<>(backupChannel));
+        updateColumns.put("backup_channel", new Atom<>(backupChannel));
-        if (columnNames.contains("mcast_rate")) {
+
-            if (multicastRate == null || multicastRate == MulticastRate.auto) {
+        if (ovsdbClient.getSchema(ovsdbName).get().getTables().get(wifiRadioConfigDbTable).getColumns()
-                updateColumns.put("mcast_rate", new Atom<>(0));
+                .containsKey("mcast_rate")) {
-            } else {
+
-                updateColumns.put("mcast_rate", new Atom<>(multicastRate.getId()));
+            updateColumns.put("mcast_rate", new Atom<>(multicastRate));
-            }
         }
 
-        if (columnNames.contains("probe_resp_threshold")) {
+        if (probeResponseThreshold == null || probeResponseThreshold.isAuto()) {
-            if (probeResponseThreshold == null) {
+            updateColumns.put("probe_resp_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
-                updateColumns.put("probe_resp_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
+        } else {
-            } else {
+            updateColumns.put("probe_resp_threshold", new Atom<>(probeResponseThreshold.getValue()));
-                updateColumns.put("probe_resp_threshold", new Atom<>(probeResponseThreshold.intValue()));
-            }
         }
-        if (columnNames.contains("client_disconnect_threshold")) {
+
-            if (clientDisconnectThreshold == null) {
+        if (probeResponseThreshold == null || clientDisconnectThreshold.isAuto()) {
-                updateColumns.put("client_disconnect_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
+            updateColumns.put("client_disconnect_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
-            } else {
+        } else {
-                updateColumns.put("client_disconnect_threshold", new Atom<>(clientDisconnectThreshold.intValue()));
+            updateColumns.put("client_disconnect_threshold", new Atom<>(clientDisconnectThreshold.getValue()));
-            }
         }
-        if (columnNames.contains("beacon_rate")) {
+
+        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 {
@@ -180,38 +205,22 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
             }
         }
 
-        if (columnNames.contains("min_load") && columnNames.contains("snr_percentage_drop")) {
+        if (bestApSettings == null) {
-            if (bestApSettings == null) {
+            updateColumns.put("min_load", new com.vmware.ovsdb.protocol.operation.notation.Set());
-                updateColumns.put("min_load", new com.vmware.ovsdb.protocol.operation.notation.Set());
+            updateColumns.put("snr_percentage_drop", new com.vmware.ovsdb.protocol.operation.notation.Set());
+        } else {
+            if (bestApSettings.getDropInSnrPercentage() == null) {
                 updateColumns.put("snr_percentage_drop", new com.vmware.ovsdb.protocol.operation.notation.Set());
             } else {
-                if (bestApSettings.getDropInSnrPercentage() == null) {
+                updateColumns.put("snr_percentage_drop", new Atom<>(bestApSettings.getDropInSnrPercentage()));
-                    updateColumns.put("snr_percentage_drop", new com.vmware.ovsdb.protocol.operation.notation.Set());
+            }
-                } else {
+            if (bestApSettings.getMinLoadFactor() == null) {
-                    updateColumns.put("snr_percentage_drop", new Atom<>(bestApSettings.getDropInSnrPercentage()));
+                updateColumns.put("min_load", new com.vmware.ovsdb.protocol.operation.notation.Set());
-                }
+            } else {
-                if (bestApSettings.getMinLoadFactor() == null) {
+                updateColumns.put("min_load", new Atom<>(bestApSettings.getMinLoadFactor()));
-                    updateColumns.put("min_load", new com.vmware.ovsdb.protocol.operation.notation.Set());
-                } else {
-                    updateColumns.put("min_load", new Atom<>(bestApSettings.getMinLoadFactor()));
-                }
             }
         }
 
-        if (obssHopMode != null && columnNames.contains("obss_hop_mode"))
-
-        {
-            updateColumns.put("obss_hop_mode", new Atom<>(obssHopMode.equals(OBSSHopMode.NON_WIFI) ? 1 : 2));
-        }
-        if (columnNames.contains("noise_floor_thresh"))
-            updateColumns.put("noise_floor_thresh", new Atom<>(noiseFloorThresholdInDB));
-        if (columnNames.contains("noise_floor_time"))
-            updateColumns.put("noise_floor_time", new Atom<>(noiseFloorThresholdTimeInSeconds));
-        if (columnNames.contains("non_wifi_thresh"))
-            updateColumns.put("non_wifi_thresh", new Atom<>(nonWifiThresholdInPercentage));
-        if (columnNames.contains("non_wifi_time"))
-            updateColumns.put("non_wifi_time", new Atom<>(nonWifiThresholdTimeInSeconds));
-
         Row row = new Row(updateColumns);
         operations.add(new Insert(wifiRrmConfigDbTable, row));
 
@@ -229,8 +238,10 @@ 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());
             }
+
         }
     }
 
@@ -243,17 +254,8 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
         return AutoOrManualValue.createManualInstance(equipmentValue);
     }
 
-    // For cell size related attributes, the “manual" mode is not supported any more,
+    void processNewChannelsRequest(OvsdbClient ovsdbClient, Map<RadioType, Integer> backupChannelMap,
-    // user can create a new RF profile with desired values to achieve it
+            Map<RadioType, Integer> primaryChannelMap) {
-    int getSourcedValue(boolean autoCellSizeSelection, int profileValue, int equipmentValue) {
-        if (autoCellSizeSelection) {
-            return equipmentValue;
-        } else {
-            return profileValue;
-        }
-    }
-
-    void processNewChannelsRequest(OvsdbClient ovsdbClient, Map<RadioType, Integer> backupChannelMap, Map<RadioType, Integer> primaryChannelMap) {
 
         LOG.info("OvsdbDao::processNewChannelsRequest backup {} primary {}", backupChannelMap, primaryChannelMap);
         try {
@@ -296,87 +298,6 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
 
     }
 
-    void processCellSizeAttributesRequest(OvsdbClient ovsdbClient, Map<RadioType, CellSizeAttributes> cellSizeAttributesMap) {
-
-        LOG.info("OvsdbDao::processCellSizeAttributesRequest cellSizeAttributes {}", cellSizeAttributesMap);
-        try {
-            List<Operation> operations = new ArrayList<>();
-
-            cellSizeAttributesMap.entrySet().stream().forEach(c -> {
-                String freqBand = OvsdbToWlanCloudTypeMappingUtility.getOvsdbRadioFreqBandForRadioType(c.getKey());
-                List<Condition> conditions = new ArrayList<>();
-                conditions.add(new Condition("freq_band", Function.EQUALS, new Atom<>(freqBand)));
-                Map<String, Value> updateRrmColumns = new HashMap<>();
-
-                CellSizeAttributes cellSizeAttributes = c.getValue();
-                MulticastRate multicastRate = cellSizeAttributes.getMulticastRate();
-                if (multicastRate == null || multicastRate == MulticastRate.auto) {
-                    updateRrmColumns.put("mcast_rate", new Atom<>(0));
-                } else {
-                    updateRrmColumns.put("mcast_rate", new Atom<>(multicastRate.getId()));
-                }
-
-                Integer probeResponseThreshold = cellSizeAttributes.getProbeResponseThresholdDb();
-                if (probeResponseThreshold == null) {
-                    updateRrmColumns.put("probe_resp_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
-                } else {
-                    updateRrmColumns.put("probe_resp_threshold", new Atom<>(probeResponseThreshold.intValue()));
-                }
-
-                Integer clientDisconnectThreshold = cellSizeAttributes.getClientDisconnectThresholdDb();
-                if (clientDisconnectThreshold == null) {
-                    updateRrmColumns.put("client_disconnect_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
-                } else {
-                    updateRrmColumns.put("client_disconnect_threshold", new Atom<>(clientDisconnectThreshold.intValue()));
-                }
-
-                ManagementRate managementRate = cellSizeAttributes.getManagementRate();
-                if (managementRate == null || managementRate == ManagementRate.auto) {
-                    updateRrmColumns.put("beacon_rate", new Atom<>(0));
-                } else {
-                    updateRrmColumns.put("beacon_rate", new Atom<>(managementRate.getId() * 10));
-                }
-
-                Row rowRrm = new Row(updateRrmColumns);
-                operations.add(new Update(wifiRrmConfigDbTable, conditions, rowRrm));
-
-                Map<String, Value> updateRadioColumns = new HashMap<>();
-                Integer txPower = cellSizeAttributes.getEirpTxPowerDb();
-                if (txPower != null && txPower > 0) {
-                    updateRadioColumns.put("tx_power", new Atom<>(txPower));
-                } else {
-                    updateRadioColumns.put("tx_power", new com.vmware.ovsdb.protocol.operation.notation.Set());
-                }
-                Row rowRadio = new Row(updateRadioColumns);
-                operations.add(new Update(wifiRadioConfigDbTable, conditions, rowRadio));
-            });
-
-            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 InsertResult) {
-                    LOG.info("processCellSizeAttributesRequest insert new row result {}", (res));
-                    // for insert, make sure it is actually in the table
-                    confirmRowExistsInTable(ovsdbClient, ((InsertResult) res).getUuid(), wifiRrmConfigDbTable);
-                } else if (res instanceof ErrorResult) {
-                    LOG.error("processCellSizeAttributesRequest error {}", (res));
-                    throw new RuntimeException("processCellSizeAttributesRequest " + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
-                }
-            }
-
-            LOG.info("Updated ovsdb config for cell size attributes.");
-        } catch (ExecutionException e) {
-            LOG.error("Error in processCellSizeAttributesRequest", e);
-        } catch (OvsdbClientException | TimeoutException | InterruptedException e) {
-            LOG.error("Error in processCellSizeAttributesRequest", e);
-            throw new RuntimeException(e);
-        }
-
-    }
-
     void removeWifiRrm(OvsdbClient ovsdbClient) {
         try {
             List<Operation> operations = new ArrayList<>();

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.Delete;
-import com.vmware.ovsdb.protocol.operation.notation.*;
+import com.vmware.ovsdb.protocol.operation.Insert;
-import com.vmware.ovsdb.protocol.operation.result.*;
+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":
+                    case "2.4G":
-                            radios.add(RadioType.is2dot4GHz);
+                        radios.add(RadioType.is2dot4GHz);
-                            break;
+                        break;
-                        case "5G":
+                    case "5G":
-                            radios.add(RadioType.is5GHz);
+                        radios.add(RadioType.is5GHz);
-                            break;
+                        break;
-                        case "5GL":
+                    case "5GL":
-                            radios.add(RadioType.is5GHzL);
+                        radios.add(RadioType.is5GHzL);
-                            break;
+                        break;
-                        case "5GU":
+                    case "5GU":
-                            radios.add(RadioType.is5GHzU);
+                        radios.add(RadioType.is5GHzU);
-                            break;
+                        break;
-                        default:
+                    default:
-                            LOG.debug("Unsupported or unrecognized radio band type {}", radioFrequencyBand);
+                        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,
+    void configureCustomOptionsForRadiusNas(OvsdbClient ovsdbClient, String radiusNasId, String radiusNasIp,
-            Map<String, String> customOptions) {
+            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) {
+            if (radiusNasId.equals(NasIdType.DEFAULT.toString())) {
-                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);
                 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,8 +221,6 @@ 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
@@ -217,28 +230,22 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param rtsCtsThreshold
      * @param customOptions
      */
-    void configureCustomOptionsForRatesAndLimits(boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit,
+    void configureCustomOptionsForRatesAndLimits(boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit,
-            int rtsCtsThreshold, Map<String, String> customOptions) {
+            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_ul_limit", String.valueOf(ssidUlLimit * 1000));
-        customOptions.put("ssid_dl_limit", String.valueOf(0));
+        customOptions.put("ssid_dl_limit", String.valueOf(ssidDlLimit * 1000));
-        customOptions.put("client_dl_limit", String.valueOf(ssidDlLimit * 1000));
+        customOptions.put("client_dl_limit", String.valueOf(clientDlLimit * 1000));
-        customOptions.put("client_ul_limit", String.valueOf(ssidUlLimit * 1000));
+        customOptions.put("client_ul_limit", String.valueOf(clientUlLimit * 1000));
         customOptions.put("rts_threshold", String.valueOf(rtsCtsThreshold));
     }
 
-    void configureCustomOptionsForUseRadiusProxyAndHotspot(boolean useRadiusProxy, boolean enableProxyArpForHotspot, Map<String, String> customOptions) {
-        customOptions.put("radproxy", useRadiusProxy ? "1" : "0");
-        customOptions.put("proxy_arp", enableProxyArpForHotspot ? "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
@@ -251,101 +258,107 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param radiusOperatorName
      * @param updateColumns
      * @param dynamicVlan
-     * @param useRadiusProxy
-     * @param enableProxyArpForHotspot TODO
      */
-    void configureCustomOptionsForSsid(OvsdbClient ovsdbClient, boolean enable80211k, boolean enable80211r, boolean rateLimitEnable, int ssidDlLimit,
+    void configureCustomOptionsForSsid(OvsdbClient ovsdbClient, boolean enable80211k, boolean rateLimitEnable,
-            int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int dtimPeriod, String radiusNasId, String radiusNasIp,
+                                       int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold,
-            String radiusOperatorName, Map<String, Value> updateColumns, int dynamicVlan, Boolean useRadiusProxy, Boolean enableProxyArpForHotspot) {
+                                       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);
 
-        configureCustomOptionsForUseRadiusProxyAndHotspot(useRadiusProxy, enableProxyArpForHotspot, customOptions);
+        configureCustomOptionsForRadiusNas(ovsdbClient, radiusNasId, radiusNasIp, radiusOperatorName, customOptions);
-
-        configureCustomOptionsForRatesAndLimits(rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, customOptions);
-
-        configureCustomOptionsForRadiusNas(ovsdbClient, radiusNasId, radiusNasIp, radiusOperatorName, enable80211r, 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,
+    void configureSingleSsid(OvsdbClient ovsdbClient, String vifInterfaceName, String ssid, boolean ssidBroadcast,
-            boolean rrmEnabled, boolean enable80211r, int mobilityDomain, boolean enable80211v, boolean enable80211k, String minHwMode, boolean enabled,
+                             Map<String, String> security, int vlanId, boolean rrmEnabled, boolean enable80211r,
-            int keyRefresh, boolean uapsdEnabled, boolean apBridge, NetworkForwardMode networkForwardMode, List<MacAddress> macBlockList,
+                             int mobilityDomain, boolean enable80211v, boolean enable80211k, String minHwMode, boolean enabled,
-            boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int dtimPeriod,
+                             int keyRefresh, boolean uapsdEnabled, boolean apBridge, NetworkForwardMode networkForwardMode,
-            Map<String, String> captiveMap, List<String> walledGardenAllowlist, String radiusNasId, String radiusNasIp, String radiusOperatorName,
+                             List<MacAddress> macBlockList,
-            String greTunnelName, int dynamicVlan, Boolean useRadiusProxy, List<Operation> operations, Boolean enableProxyArpForHotspot) {
+                             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 we are doing a NAT SSID, no bridge, else yes
-        // If gre tunnel and vlanId > 1 use vlan if name for bridge
+            // If gre tunnel and vlanId > 1 use vlan if name for bridge
-        String bridgeInterfaceName = defaultWanInterfaceName;
+            String bridgeInterfaceName = defaultWanInterfaceName;
-        if (greTunnelName != null && vlanId > 1) {
+            if (greTunnelName != null && vlanId > 1) {
-            bridgeInterfaceName = greTunnelName + "_" + vlanId;
+                bridgeInterfaceName = greTunnelName + "_" + vlanId;
-        } else if (networkForwardMode == NetworkForwardMode.NAT) {
+            } else if (networkForwardMode == NetworkForwardMode.NAT) {
-            bridgeInterfaceName = defaultLanInterfaceName;
+                bridgeInterfaceName = defaultLanInterfaceName;
-        }
+            }
 
-        if (vlanId > 1) {
+            if (vlanId > 1) {
-            updateColumns.put("vlan_id", new Atom<>(vlanId));
+                updateColumns.put("vlan_id", new Atom<>(vlanId));
-        } else {
+            } else {
-            updateColumns.put("vlan_id", new Atom<>(1));
+                updateColumns.put("vlan_id", new Atom<>(1));
-        }
+            }
 
-        updateColumns.put("mode", new Atom<>("ap"));
+            updateColumns.put("mode", new Atom<>("ap"));
-        @SuppressWarnings("unchecked")
+            @SuppressWarnings("unchecked")
-        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> captivePortalMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(captiveMap);
+            com.vmware.ovsdb.protocol.operation.notation.Map<String, String> captivePortalMap = com.vmware.ovsdb.protocol.operation.notation.Map
-        updateColumns.put("captive_portal", captivePortalMap);
+                    .of(captiveMap);
+            updateColumns.put("captive_portal", captivePortalMap);
 
-        if (walledGardenAllowlist != null && !walledGardenAllowlist.isEmpty()) {
+            if (walledGardenAllowlist != null && !walledGardenAllowlist.isEmpty()) {
-            Set<Atom<String>> atomMacList = new HashSet<>();
+                Set<Atom<String>> atomMacList = new HashSet<>();
-            walledGardenAllowlist.forEach(allow -> atomMacList.add(new Atom<>(allow)));
+                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);
+                com.vmware.ovsdb.protocol.operation.notation.Set allowListSet = com.vmware.ovsdb.protocol.operation.notation.Set
-            updateColumns.put("captive_allowlist", allowListSet);
+                        .of(atomMacList);
-        } else {
+                updateColumns.put("captive_allowlist", allowListSet);
-            updateColumns.put("captive_allowlist", new com.vmware.ovsdb.protocol.operation.notation.Set());
+            } else {
-        }
+                updateColumns.put("captive_allowlist", new com.vmware.ovsdb.protocol.operation.notation.Set());
-        updateColumns.put("bridge", new Atom<>(bridgeInterfaceName));
+            }
-        if (enable80211v) {
+            updateColumns.put("bridge", new Atom<>(bridgeInterfaceName));
-            updateColumns.put("btm", new Atom<>(1));
+            if (enable80211v) {
-        } else {
+                updateColumns.put("btm", new Atom<>(1));
-            updateColumns.put("btm", new Atom<>(0));
+            } else {
-        }
+                updateColumns.put("btm", new Atom<>(0));
-        updateColumns.put("enabled", new Atom<>(enabled));
+            }
-        if (enable80211r) {
+            updateColumns.put("enabled", new Atom<>(enabled));
-            updateColumns.put("ft_psk", new Atom<>(1));
+            if (enable80211r) {
-            updateColumns.put("ft_mobility_domain", new Atom<>(mobilityDomain));
+                updateColumns.put("ft_psk", new Atom<>(1));
-        } else {
+                updateColumns.put("ft_mobility_domain", new Atom<>(mobilityDomain));
-            updateColumns.put("ft_psk", new Atom<>(0));
+            } else {
-            updateColumns.put("ft_mobility_domain", new com.vmware.ovsdb.protocol.operation.notation.Set());
+                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("if_name", new Atom<>(vifInterfaceName));
-        updateColumns.put("ssid", new Atom<>(ssid));
+            updateColumns.put("rrm", new Atom<>(rrmEnabled ? 1 : 0));
-        updateColumns.put("ssid_broadcast", new Atom<>(ssidBroadcast ? "enabled" : "disabled"));
+            updateColumns.put("ssid", new Atom<>(ssid));
-        updateColumns.put("uapsd_enable", new Atom<>(uapsdEnabled));
+            updateColumns.put("ssid_broadcast", new Atom<>(ssidBroadcast ? "enabled" : "disabled"));
-        updateColumns.put("min_hw_mode", new Atom<>(minHwMode));
+            updateColumns.put("uapsd_enable", new Atom<>(uapsdEnabled));
-        updateColumns.put("group_rekey", new Atom<>(keyRefresh));
+            updateColumns.put("min_hw_mode", new Atom<>(minHwMode));
-        updateColumns.put("ap_bridge", new Atom<>(apBridge));
+            updateColumns.put("group_rekey", new Atom<>(keyRefresh));
-        @SuppressWarnings("unchecked")
+            updateColumns.put("ap_bridge", new Atom<>(apBridge));
-        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> securityMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(security);
+            @SuppressWarnings("unchecked")
-        updateColumns.put("security", securityMap);
+            com.vmware.ovsdb.protocol.operation.notation.Map<String, String> securityMap = com.vmware.ovsdb.protocol.operation.notation.Map
-        configureCustomOptionsForSsid(ovsdbClient, enable80211k, enable80211r, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit,
+                    .of(security);
-                rtsCtsThreshold, dtimPeriod, radiusNasId, radiusNasIp, radiusOperatorName, updateColumns, dynamicVlan, useRadiusProxy, enableProxyArpForHotspot);
+            updateColumns.put("security", securityMap);
-        updateBlockList(updateColumns, macBlockList);
+            configureCustomOptionsForSsid(ovsdbClient, enable80211k, rateLimitEnable, ssidDlLimit, ssidUlLimit,
-        Row row = new Row(updateColumns);
+                    clientDlLimit, clientUlLimit, rtsCtsThreshold, dtimPeriod, radiusNasId,
-        operations.add(new Insert(wifiVifConfigDbTable, row));
+                    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();
@@ -358,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()) {
@@ -391,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 +460,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 if (radioConfiguration != null) {
                     dtimPeriod = radioConfiguration.getDtimPeriod();
                     uapsdEnabled = radioConfiguration.getUapsdState() == StateSetting.enabled;
-                    if (ssidConfig.getNoLocalSubnets()) apBridge = false; // no local access
+                    apBridge = radioConfiguration.getStationIsolation() == StateSetting.disabled; // stationIsolation
                 }
                 
                 String minHwMode = "11n"; // min_hw_mode is 11n
@@ -470,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) {
@@ -505,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)
+                        radiusNasId = ssidConfig.getRadiusClientConfiguration().getNasClientId()
-                                ? ssidConfig.getRadiusClientConfiguration().getUserDefinedNasId()
+                                .equals(NasIdType.USER_DEFINED)
-                                : ssidConfig.getRadiusClientConfiguration().getNasClientId().toString();
+                                        ? ssidConfig.getRadiusClientConfiguration().getUserDefinedNasId()
-                        radiusNasIp = ssidConfig.getRadiusClientConfiguration().getNasClientIp().equals(NasIpType.USER_DEFINED)
+                                        : ssidConfig.getRadiusClientConfiguration().getNasClientId().toString();
-                                ? ssidConfig.getRadiusClientConfiguration().getUserDefinedNasIp()
+                        radiusNasIp = ssidConfig.getRadiusClientConfiguration().getNasClientIp()
-                                : ssidConfig.getRadiusClientConfiguration().getNasClientIp().toString();
+                                .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
@@ -534,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())
+                Optional<GreTunnelConfiguration> tunnelConfiguration = ((ApNetworkConfiguration) opensyncApConfig
-                        .getGreTunnelConfigurations().stream().filter(t -> t.getVlanIdsInGreTunnel().contains(vlanId)).findFirst();
+                        .getApProfile().getDetails()).getGreTunnelConfigurations().stream()
+                                .filter(t -> t.getVlanIdsInGreTunnel().contains(vlanId)).findFirst();
                 String greTunnelName = null;
                 if (tunnelConfiguration.isPresent()) {
                     greTunnelName = tunnelConfiguration.get().getGreTunnelName();
@@ -548,27 +568,16 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                     interfacesPerFreqBand.put(freqBand, 1);
                 }
 
-                boolean useRadiusProxy = false;
-                if (ssidConfig.getUseRadiusProxy() != null) {
-                    useRadiusProxy = ssidConfig.getUseRadiusProxy();
-                }
-                boolean enableProxyArpForHotspot = false;
-                if (ssidConfig.getEnableProxyArpForHotspot() != null) {
-                    enableProxyArpForHotspot = ssidConfig.getEnableProxyArpForHotspot();
-                }
                 try {
-                    configureSingleSsid(ovsdbClient, ifName, ssidConfig.getSsid(), ssidBroadcast, security, vlanId, rrmEnabled, enable80211r, mobilityDomain,
+                    configureSingleSsid(ovsdbClient, ifName, ssidConfig.getSsid(), ssidBroadcast,
-                            enable80211v, enable80211k, minHwMode, enabled, keyRefresh, uapsdEnabled, apBridge, ssidConfig.getForwardMode(), macBlockList,
+                            security, vlanId, rrmEnabled, enable80211r, mobilityDomain, enable80211v,
-                            rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, dtimPeriod, captiveMap,
+                            enable80211k, minHwMode, enabled, keyRefresh, uapsdEnabled, apBridge,
-                            walledGardenAllowlist, radiusNasId, radiusNasIp, radiusOperName, greTunnelName, dynamicVlan, useRadiusProxy, operations, enableProxyArpForHotspot);
+                            ssidConfig.getForwardMode(), macBlockList,
-
+                            rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold,
-                    networkConfig.configureInetVifInterface(ovsdbClient, ifName, enabled, ssidConfig.getForwardMode(), operations);
+                            dtimPeriod, captiveMap, walledGardenAllowlist,
-
+                            radiusNasId, radiusNasIp, radiusOperName, greTunnelName, dynamicVlan,operations);
-                    if (useRadiusProxy) {
-                        // make sure it's enabled if we are going to use it
-                        radsecConfig.configureApc(ovsdbClient, useRadiusProxy, 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);
@@ -586,14 +595,19 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         }
     }
 
-    void getBonjourGatewayConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<Short, Set<String>> bonjourServiceMap) {
+    void getBonjourGatewayConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
-        if ((ssidConfig.getBonjourGatewayProfileId() != null) && (opensyncApConfig.getBonjourGatewayProfiles() != null)) {
+            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())) {
@@ -617,15 +631,15 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      */
     String getCaptiveAuthentication(CaptivePortalAuthenticationType authentication) {
         switch (authentication) {
-            case guest:
+        case guest:
-                return "None";
+            return "None";
-            case username:
+        case username:
-                return "username";
+            return "username";
-            case radius:
+        case radius:
-                return "radius";
+            return "radius";
-            default:
+        default:
-                LOG.error("Unsupported captive portal authentication {}", authentication);
+            LOG.error("Unsupported captive portal authentication {}", authentication);
-                return "None";
+            return "None";
         }
     }
 
@@ -636,61 +650,76 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param captiveMap
      * @param walledGardenAllowlist
      */
-    void getCaptiveConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<String, String> captiveMap,
+    void getCaptiveConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
-            List<String> walledGardenAllowlist) {
+            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)) {
+                if ((ssidConfig.getCaptivePortalId() == profileCaptive.getId())
-                    CaptivePortalConfiguration captiveProfileDetails = ((CaptivePortalConfiguration) profileCaptive.getDetails());
+                        && (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 =
+                        Optional<Profile> optional = opensyncApConfig.getRadiusProfiles().stream()
-                                opensyncApConfig.getRadiusProfiles().stream().filter(p -> p.getId() == captiveProfileDetails.getRadiusServiceId()).findFirst();
+                                .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()));
+                    captiveMap.put("authentication",
-                    if (captiveProfileDetails.getLogoFile() != null) {
+                            getCaptiveAuthentication(captiveProfileDetails.getAuthenticationType()));
-                        String splashLogoUrl = externalFileStoreURL + captiveProfileDetails.getLogoFile().getApExportUrl();
+		    if (!externalFileStoreURL.endsWith("/filestore/")) {
-                        captiveMap.put("splash_page_logo", splashLogoUrl);
+                        externalFileStoreURL = externalFileStoreURL + "/filestore/";
-                    }
-                    if (captiveProfileDetails.getBackgroundFile() != null) {
-                        String splashBackgroundUrl = externalFileStoreURL + captiveProfileDetails.getBackgroundFile().getApExportUrl();
-                        captiveMap.put("splash_page_background_logo", splashBackgroundUrl);
                     }
                     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
-                        captiveMap.put("username_password_file", usernamePasswordFileUrl);
+                                .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());
 
@@ -701,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);
@@ -709,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="
+            byte[] bytes = ("username=" + userRecord.getUsername() + ", password=" + userRecord.getPassword()
-                    + userRecord.getUserDetails().getFirstName() + ", lastname=" + userRecord.getUserDetails().getLastName() + System.lineSeparator())
+                    + ", firstname=" + userRecord.getUserDetails().getFirstName() + ", lastname="
-                            .getBytes();
+                    + userRecord.getUserDetails().getLastName() + System.lineSeparator()).getBytes();
             try {
                 Files.write(path, bytes, StandardOpenOption.APPEND);
                 LOG.debug("Successfully written data to the file {}", path);
@@ -727,6 +757,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
 
     }
     
+    
     /**
      * Maps between the osvdb security definitions and the cloud's security mode
      * for the give SSID being configured.
@@ -761,70 +792,82 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             case "wpa3MixedEAP":
                 opensyncSecurityMode = "WPA3-EAP";
                 break;
-            case "wpa3OnlyEAP192":
-                opensyncSecurityMode = "WPA3-EAP-192";
-                break;
         }
         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 =
+        List<Profile> radiusProfileList = opensyncApConfig.getRadiusProfiles().stream()
-                opensyncApConfig.getRadiusProfiles().stream().filter(t -> t.getId() == ssidConfig.getRadiusServiceId()).collect(Collectors.toList());
+                .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) {
-                security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
+                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 (ssidConfig.getRadiusAcountingServiceInterval() != null && ssidConfig.getRadiusAcountingServiceInterval() > 0) {
                     // 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 {}",
+                LOG.info(
-                        security.get("radius_acct_ip"), security.get("radius_acct_port"), security.get("radius_acct_secret"),
+                        "set Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}",
-                        security.get("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 =
+        List<Profile> radiusProfileList = opensyncApConfig.getRadiusProfiles().stream()
-                opensyncApConfig.getRadiusProfiles().stream().filter(t -> t.getId() == ssidConfig.getRadiusServiceId()).collect(Collectors.toList());
+                .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();
-            security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
+            security.put("radius_server_ip",
-            security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
+                    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"),
+            LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}",
-                    security.get("radius_server_port"), security.get("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());
         }
     }
 
@@ -838,8 +881,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param ssidSecurityMode
      * @param opensyncSecurityMode
      */
-    void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<String, String> security, String ssidSecurityMode,
+    void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
-            String opensyncSecurityMode) {
+            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")) {
@@ -865,41 +908,28 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 case "wpa2OnlyEAP":
                 case "wpa2OnlyRadius":
                     security.put("mode", "2");
-                    if (!ssidConfig.getUseRadiusProxy()) {
+                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                    }
                     break;
                 case "wpa3OnlyEAP":
                     security.put("mode", "3");
-                    if (!ssidConfig.getUseRadiusProxy()) {
+                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+
-                    }
-                    break;
-                case "wpa3OnlyEAP192":
-                    security.put("mode", "3");
-                    if (!ssidConfig.getUseRadiusProxy()) {
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                    }
                     break;
                 case "wpa2EAP":
                 case "wpa2Radius":
                 case "wpa3MixedEAP":
                     security.put("mode", "mixed");
-                    if (!ssidConfig.getUseRadiusProxy()) {
+                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+
-                    }
                     break;
                 case "wpaEAP":
                 case "wpaRadius":
                     security.put("mode", "1");
-                    if (!ssidConfig.getUseRadiusProxy()) {
+                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                    }
                     break;
             }
         }
@@ -922,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");
@@ -949,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/OvsdbStatsConfig.java

@@ -63,6 +63,7 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
 
             provisionWifiStatsConfigClient(radioConfigs, ovsdbGet.getProvisionedWifiStatsConfigs(ovsdbClient),
                     operations);
+
             if (!operations.isEmpty()) {
                 LOG.debug("Sending batch of operations : {} ", operations);
 
@@ -77,7 +78,11 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     }
                 }
             }
+
+            // TODO: when schema support is added, these should be part of the
+            // bulk provisioning operation above.
             provisionVideoVoiceStats(ovsdbClient);
+
         } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -101,7 +106,7 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
             List<Operation> operations = new ArrayList<>();
             Map<String, Value> updateColumns = new HashMap<>();
 
-            updateColumns.put("reporting_interval", new Atom<>(defaultReportingIntervalSeconds));
+            updateColumns.put("reporting_interval", new Atom<>(60));
             updateColumns.put("radio_type", new Atom<>("2.4G"));
             updateColumns.put("stats_type", new Atom<>("network_probe"));
 
@@ -192,7 +197,7 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
             List<Operation> operations = new ArrayList<>();
             Map<String, Value> rowColumns = new HashMap<>();
             rowColumns.put("radio_type", new Atom<>("2.4G"));
-            rowColumns.put("reporting_interval", new Atom<>(defaultReportingIntervalSeconds));
+            rowColumns.put("reporting_interval", new Atom<>(60));
             rowColumns.put("report_type", new Atom<>("raw"));
             rowColumns.put("sampling_interval", new Atom<>(10));
             rowColumns.put("stats_type", new Atom<>("video_voice"));
@@ -239,10 +244,11 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     //
                     Map<String, Value> rowColumns = new HashMap<>();
                     rowColumns.put("radio_type", new Atom<>(rc.freqBand));
-                    rowColumns.put("reporting_interval", new Atom<>(defaultReportingIntervalSeconds));
+                    rowColumns.put("reporting_interval", new Atom<>(60));
                     rowColumns.put("report_type", new Atom<>("raw"));
                     rowColumns.put("sampling_interval", new Atom<>(10));
                     rowColumns.put("stats_type", new Atom<>("client"));
+                    rowColumns.put("survey_interval_ms", new Atom<>(65));
                     Row updateRow = new Row(rowColumns);
                     operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
 
@@ -252,7 +258,6 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
 
     }
 
-
     void provisionWifiStatsConfigNeighbor(Map<String, Set<Integer>> allowedChannels,
             Map<String, WifiRadioConfigInfo> radioConfigs, Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs,
             List<Operation> operations) {
@@ -272,10 +277,9 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     rowColumns.put("channel_list", channels);
 
                     rowColumns.put("radio_type", new Atom<>(rc.freqBand));
-                    rowColumns.put("reporting_interval", new Atom<>(defaultOffChannelReportingIntervalSeconds));
+                    rowColumns.put("reporting_interval", new Atom<>(60));
                     rowColumns.put("stats_type", new Atom<>("neighbor"));
                     rowColumns.put("survey_type", new Atom<>("off-chan"));
-                    rowColumns.put("survey_interval_ms", new Atom<>(10));
 
                     Row updateRow = new Row(rowColumns);
                     operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
@@ -292,10 +296,9 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     //
                     Map<String, Value> rowColumns = new HashMap<>();
                     rowColumns.put("radio_type", new Atom<>(rc.freqBand));
-                    rowColumns.put("reporting_interval", new Atom<>(defaultReportingIntervalSeconds));
+                    rowColumns.put("reporting_interval", new Atom<>(60));
                     rowColumns.put("stats_type", new Atom<>("neighbor"));
                     rowColumns.put("survey_type", new Atom<>("on-chan"));
-                    rowColumns.put("survey_interval_ms", new Atom<>(0));
 
                     Row updateRow = new Row(rowColumns);
                     operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
@@ -318,7 +321,7 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
 
                     Map<String, Value> rowColumns = new HashMap<>();
                     rowColumns.put("radio_type", new Atom<>(rc.freqBand));
-                    rowColumns.put("reporting_interval", new Atom<>(defaultReportingIntervalSeconds));
+                    rowColumns.put("reporting_interval", new Atom<>(60));
                     rowColumns.put("report_type", new Atom<>("raw"));
                     rowColumns.put("sampling_interval", new Atom<>(10));
                     rowColumns.put("stats_type", new Atom<>("survey"));
@@ -347,12 +350,12 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     rowColumns.put("channel_list", channels);
 
                     rowColumns.put("radio_type", new Atom<>(rc.freqBand));
-                    rowColumns.put("reporting_interval", new Atom<>(defaultOffChannelReportingIntervalSeconds));
+                    rowColumns.put("reporting_interval", new Atom<>(120));
                     rowColumns.put("report_type", new Atom<>("raw"));
                     rowColumns.put("stats_type", new Atom<>("survey"));
                     rowColumns.put("survey_type", new Atom<>("off-chan"));
                     rowColumns.put("sampling_interval", new Atom<>(10));
-                    rowColumns.put("survey_interval_ms", new Atom<>(120));
+                    rowColumns.put("survey_interval_ms", new Atom<>(50));
                     rowColumns.put("threshold", thresholds);
                     Row updateRow = new Row(rowColumns);
                     operations.add(new Insert(wifiStatsConfigDbTable, updateRow));

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;
@@ -76,25 +75,4 @@ public class OvsdbClientWithMetrics implements OvsdbClient {
         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/main/java/com/telecominfraproject/wlan/opensync/util/OvsdbStringConstants.java

@@ -13,7 +13,6 @@ public class OvsdbStringConstants {
     public static final String FW_IMAGE_NAME_KEY = "FW_IMAGE_NAME";
     public static final String FW_IMAGE_ACTIVE_KEY = "FW_IMAGE_ACTIVE";
     public static final String FW_IMAGE_INACTIVE_KEY = "FW_IMAGE_INACTIVE";
-    public static final String FW_IMAGE_DATE = "DATE";
 
     // AWLAN_Node values which can be placed in firmware_url column to trigger
     // behavior other than firmware download/flash

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(
+@Import(value = { OvsdbDao.class, OvsdbDaoTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class,
-        value = {OvsdbDao.class, OvsdbDaoTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class, OvsdbHotspotConfig.class, OvsdbCommandConfig.class,
+        OvsdbHotspotConfig.class, OvsdbCommandConfig.class, OvsdbMonitor.class, OvsdbFirmwareConfig.class,
-                OvsdbMonitor.class, OvsdbFirmwareConfig.class, OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
+        OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
-                OvsdbNodeConfig.class, OvsdbRadiusProxyConfig.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)};
+        OperationResult[] operationResult = new OperationResult[] { new SelectResult(rows) };
-        Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList())).thenReturn(selectionFutureResult);
+        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,
+        hotspot20IdProviderProfile = OvsdbDaoTestUtilities.createPasspointIdProviderProfile(DEFAULT_CUSTOMER_ID,
-                "TipWlan-Hotspot20-OSU-Provider", "Rogers AT&T Wireless", "Canada", "ca", 302, 720, "rogers.com", 1);
+                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,
+        hotspot20IdProviderProfile2 = OvsdbDaoTestUtilities.createPasspointIdProviderProfile(DEFAULT_CUSTOMER_ID,
-                "TipWlan-Hotspot20-OSU-Provider-2", "Telus Mobility", "Canada", "ca", 302, 220, "telus.com", 1);
+                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,
+        Profile passpointHotspotConfig = OvsdbDaoTestUtilities.createPasspointHotspotConfig(DEFAULT_CUSTOMER_ID,
-                hotspot20IdProviderProfile, passpointOperatorProfile, passpointVenueProfile, profileSsidPsk, profileSsidOsu);
+                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())
+        Mockito.when(futureResult.get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS)))
-                .thenReturn(OvsdbDaoTestUtilities.hs20InsertIconRows()).thenReturn(OvsdbDaoTestUtilities.hs20OsuProviders())
+                .thenReturn(OvsdbDaoTestUtilities.hs20IconRows()).thenReturn(OvsdbDaoTestUtilities.hs20InsertIconRows())
-                .thenReturn(OvsdbDaoTestUtilities.hs20IconRows()).thenReturn(OvsdbDaoTestUtilities.hs20IconRows())
+                .thenReturn(OvsdbDaoTestUtilities.hs20OsuProviders()).thenReturn(OvsdbDaoTestUtilities.hs20IconRows())
-                .thenReturn(OvsdbDaoTestUtilities.hs20InsertProviderRows()).thenReturn(OvsdbDaoTestUtilities.hs20Config())
+                .thenReturn(OvsdbDaoTestUtilities.hs20IconRows())
-                .thenReturn(OvsdbDaoTestUtilities.hs20OsuProviders()).thenReturn(OvsdbDaoTestUtilities.vifConfigRows())
+                .thenReturn(OvsdbDaoTestUtilities.hs20InsertProviderRows())
-                .thenReturn(OvsdbDaoTestUtilities.vifConfigRows()).thenReturn(OvsdbDaoTestUtilities.hs20Config());
+                .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",
+        OperationResult[] wifiStatsConfigEnableNetworkProbeFail = new OperationResult[] { new ErrorResult(
-                "network_probe is not one of the allowed values ([capacity, client, device, essid, neighbor, quality, radio, rssi, steering, survey])")};
+                "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),
+        OperationResult[] testProcessNewChannelsRequestResult = new OperationResult[] { new UpdateResult(1),
-                new UpdateResult(1), new UpdateResult(1), 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(1), RadioType.is5GHzL, Integer.valueOf(40),
-                Map.of(RadioType.is2dot4GHz, Integer.valueOf(6), RadioType.is5GHzL, Integer.valueOf(36), RadioType.is5GHzU, Integer.valueOf(149)));
+                        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;