WIFI-2988: Ovsdb schema check for Wifi_Radio_Config and Wifi_RRM_Config

Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>

opensync-ext-cloud/pom.xml

@@ -4,136 +4,136 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.1.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>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<artifactId>opensync-ext-interface</artifactId>
-			<version>1.2.0-SNAPSHOT</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>com.telecominfraproject.wlan</groupId> -->
+<!-- 			<artifactId>opensync-ext-interface</artifactId> -->
+<!-- 			<version>0.0.1-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway</artifactId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
  	 
         <dependency>
             <artifactId>base-client</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
       <dependency>
         <artifactId>equipment-gateway-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>
      
       <dependency>
         <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>profile-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>portal-user-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>service-metric-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>status-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
  
        <dependency>
         <artifactId>firmware-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>manufacturer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
       </dependency>      
  
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.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;
@@ -150,16 +149,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);
-                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand, "Unsupported value in command for " + inventoryId, command,
-                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort()));
+                    LOG.error("[{}] Failed to deliver command {}, command contains unsupported value", inventoryId,
+                            command);
+                    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,
-                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort()));
+                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE,
+                            "No session found for " + inventoryId, command, registeredGateway.getHostname(),
+                            registeredGateway.getPort()));
                     return;
                 }
 
@@ -199,7 +201,8 @@ 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));
@@ -207,27 +210,24 @@ public class OpensyncCloudGatewayController {
                     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,
-                                "Invalid command type (" + command.getCommandType() + ") for equipment (" + inventoryId + ")", command,
-                                registeredGateway == null ? null : registeredGateway.getHostname(),
-                                registeredGateway == null ? -1 : registeredGateway.getPort()));
+                        ret.add(new EquipmentCommandResponse(
+                                CEGWCommandResultCode.UnsupportedCommand, "Invalid command type ("
+                                        + command.getCommandType() + ") for equipment (" + inventoryId + ")",
+                                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);
     }
 
@@ -248,8 +248,6 @@ public class OpensyncCloudGatewayController {
         return new GatewayDefaults();
     }
 
-
-
     /**
      * Verify a route to customer equipment
      *
@@ -261,18 +259,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(),
-                        command.getRoutingId());
+                LOG.info("[C:{} E:{} R:{}] Stale routing entry ({}) detected", session.getCustomerId(),
+                        command.getInventoryId(), session.getRoutingId(), command.getRoutingId());
 
-                return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "Inactive Route Identifer", command,
-                        registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+                return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "Inactive Route Identifer",
+                        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);
     }
@@ -282,17 +281,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,
-                    "Failed to send command " + command.getCommandType() + " to " + command.getInventoryId() + ": " + e.getMessage(), command,
-                    registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+            return new EquipmentCommandResponse(
+                    CEGWCommandResultCode.FailedToSend, "Failed to send command " + command.getCommandType() + " to "
+                            + 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,
-                registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+        return new EquipmentCommandResponse(CEGWCommandResultCode.Success,
+                "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);
     }
 
@@ -315,17 +317,15 @@ public class OpensyncCloudGatewayController {
     private EquipmentCommandResponse sendMessage(OvsdbSession session, String inventoryId, EquipmentCommand command) {
 
         LOG.debug("Received command {} for {}", command.getCommandType(), inventoryId);
-        EquipmentCommandResponse response =
-                new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Received Command " + command.getCommandType() + " for " + inventoryId, command,
-                        registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
+        EquipmentCommandResponse response = new EquipmentCommandResponse(CEGWCommandResultCode.Success,
+                "Received Command " + command.getCommandType() + " for " + inventoryId, command,
+                registeredGateway.getHostname(), registeredGateway.getPort());
 
-        if (command instanceof CEGWBlinkRequest) {
-            String resultDetails = tipwlanOvsdbClient.processBlinkRequest(inventoryId, ((CEGWBlinkRequest)command).getBlinkAllLEDs()); 
-            response.setResultDetail(resultDetails);
-        } else if (command instanceof CEGWConfigChangeNotification) {
+        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);
@@ -340,7 +340,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;
@@ -357,7 +357,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);
 
@@ -369,15 +370,15 @@ public class OpensyncCloudGatewayController {
             flashRequest.getInventoryId();
             flashRequest.getUsername();
 
-            String resultDetails =
-                    tipwlanOvsdbClient.processFirmwareFlash(flashRequest.getInventoryId(), flashRequest.getFirmwareVersion(), flashRequest.getUsername());
+            String resultDetails = tipwlanOvsdbClient.processFirmwareFlash(flashRequest.getInventoryId(),
+                    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;
@@ -401,9 +402,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;
@@ -421,14 +423,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,
-            HttpServletRequest httpServletRequest) {
+    public EquipmentCommandResponse sendCommandWithAuthUser(@RequestBody EquipmentCommand command,
+            @AuthenticationPrincipal Object requestUser, HttpServletRequest httpServletRequest) {
 
         // use these properties to get address and port where request has
         // arrived
@@ -461,7 +464,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();
@@ -477,11 +481,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());
             }
         }
     }
@@ -506,7 +512,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());
@@ -517,8 +524,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."
-                    + " Error: {} ", ex.getMessage());
+            LOG.debug("Generic Exception encountered when trying to cleanup "
+                    + "the stale not-reachable GateWays. Continuing to register the new Gateway." + " Error: {} ",
+                    ex.getMessage());
         }
     }
 
@@ -542,13 +550,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,
-                        e.getLocalizedMessage());
+                LOG.error("Failed to deregister Customer Equipment Gateway (name={},id={}) with Routing Service: {}",
+                        getGatewayName(), registeredGwId, e.getLocalizedMessage());
             }
             registeredWithRoutingService = false;
         }
@@ -566,10 +575,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
@@ -581,11 +592,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;
     }
@@ -598,7 +611,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);
@@ -611,17 +624,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);
                     }
                 }
@@ -630,10 +646,9 @@ public class OpensyncCloudGatewayController {
             }
         } catch (Exception genericException) { // Catching Exception to prevent
                                                // crashing the register thread
-            LOG.debug(
-                    "Generic Exception encountered when trying to cleanup "
-                            + "the stale routing records for equipment ID: {}. Continuing to register the new RoutingRecord." + " Error: {} ",
-                    equipmentId, genericException.getMessage());
+            LOG.debug("Generic Exception encountered when trying to cleanup "
+                    + "the stale routing records for equipment ID: {}. Continuing to register the new RoutingRecord."
+                    + " Error: {} ", equipmentId, genericException.getMessage());
         }
     }
 
@@ -642,7 +657,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;
@@ -650,16 +666,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,
-                    e.getLocalizedMessage());
+            LOG.error("Failed to deregister customer equipement (name={},id={}) with route id={}: {}", equipmentName,
+                    equipmentId, routingId, e.getLocalizedMessage());
         }
     }
 

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

@@ -1,365 +0,0 @@
-package com.telecominfraproject.wlan.opensync.external.integration.utils;
-
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-import com.google.common.base.Objects;
-import com.google.protobuf.ByteString;
-import com.telecominfraproject.wlan.client.ClientServiceInterface;
-import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
-import com.telecominfraproject.wlan.client.session.models.AssociationState;
-import com.telecominfraproject.wlan.client.session.models.ClientDhcpDetails;
-import com.telecominfraproject.wlan.client.session.models.ClientSession;
-import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
-import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
-import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
-import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
-import com.telecominfraproject.wlan.servicemetric.models.ServiceMetric;
-
-import sts.OpensyncStats.AssocType;
-import sts.OpensyncStats.DeviceType;
-import sts.OpensyncStats.EventReport;
-import sts.OpensyncStats.FrameType;
-import sts.OpensyncStats.Report;
-import sts.OpensyncStats.EventReport.ClientAssocEvent;
-import sts.OpensyncStats.EventReport.ClientAuthEvent;
-import sts.OpensyncStats.EventReport.ClientDisconnectEvent;
-import sts.OpensyncStats.EventReport.ClientIpEvent;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/***
- * MqttStatsPublisher will use this class to publish Stats and Events asynchronously.
- * We use async to decrease the processing time for the gateway.
- * 
- * Note: @Async only applies on public method and cannot have self-invocation (i.e. cannot
- * calling the async method from within the same class)
- */
-@Service
-public class AsyncPublishService {
-	
-	private static final Logger LOG = LoggerFactory.getLogger(MqttStatsPublisher.class);
-	
-    @Autowired
-    private CloudEventDispatcherInterface cloudEventDispatcherInterface;
-    
-    @Autowired
-    private RealtimeEventPublisher realtimeEventPublisher;
-    
-    @Autowired
-    private ClientServiceInterface clientServiceInterface;
-    
-    
-    @Async
-    public void asyncPublishStats(String apId, List<ServiceMetric> metricRecordList) {
-        try {
-            long publishStart = System.nanoTime();
-            cloudEventDispatcherInterface.publishMetrics(metricRecordList);
-            long publishStop = System.nanoTime();
-            if (LOG.isDebugEnabled())
-                LOG.debug("Elapsed publishing time for metrics records from AP {} is {} milliseconds", apId,
-                        TimeUnit.MILLISECONDS.convert(publishStop - publishStart, TimeUnit.NANOSECONDS));
-        } catch (Exception e) {
-            LOG.error("Exception when trying to publishServiceMetrics.", e);
-        }
-    }
-
-    @Async
-    public void asyncPublishEvents(Report report, int customerId, long equipmentId, String apId, long locationId) {
-        try {
-            long mqttEventsStart = System.nanoTime();
-            publishEvents(report, customerId, equipmentId, apId, locationId);
-            long mqttEventsStop = System.nanoTime();
-            if (LOG.isDebugEnabled())
-                LOG.debug("Elapsed publishing time for mqtt events from AP {} is {} milliseconds", apId,
-                        TimeUnit.MILLISECONDS.convert(mqttEventsStop - mqttEventsStart, TimeUnit.NANOSECONDS));
-        } catch (Exception e) {
-            LOG.error("Exception when trying to publishEvents.", e);
-        }
-    }
-    
-    void publishEvents(Report report, int customerId, long equipmentId, String apId, long locationId) {
-
-        realtimeEventPublisher.publishSipCallEvents(customerId, equipmentId, locationId, report.getVideoVoiceReportList());
-
-        for (EventReport eventReport : report.getEventReportList()) {
-
-            for (sts.OpensyncStats.EventReport.ClientSession apEventClientSession : eventReport.getClientSessionList()) {
-
-                LOG.debug("Processing EventReport::ClientSession for AP {}", apId);
-                // for the following MQTT events, the client/client session is first updated, then the real time event
-                // is published.
-                if (apEventClientSession.hasClientAuthEvent()) {
-                    processClientAuthEvent(customerId, equipmentId, locationId, apEventClientSession);
-                }
-                if (apEventClientSession.hasClientAssocEvent()) {
-                    processClientAssocEvent(customerId, equipmentId, locationId, apEventClientSession);
-                }
-                if (apEventClientSession.hasClientIpEvent()) {
-                    processClientIpEvent(customerId, equipmentId, locationId, apEventClientSession);
-                }
-                if (apEventClientSession.hasClientDisconnectEvent()) {
-                    processClientDisconnectEvent(customerId, equipmentId, locationId, apEventClientSession);
-                }
-            }
-            realtimeEventPublisher.publishChannelHopEvents(customerId, equipmentId, locationId, eventReport);
-        }
-
-    }
-    
-    private void processClientAuthEvent(int customerId, long equipmentId, long locationId, sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
-        ClientAuthEvent apClientEvent = apEventClientSession.getClientAuthEvent();
-        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
-
-        if (client == null) {
-            client = new com.telecominfraproject.wlan.client.models.Client();
-            client.setCustomerId(customerId);
-            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            client.setDetails(new ClientInfoDetails());
-            client = clientServiceInterface.create(client);
-        }
-
-        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
-
-        if (clientSession == null) {
-            clientSession = new ClientSession();
-            clientSession.setCustomerId(customerId);
-            clientSession.setEquipmentId(equipmentId);
-            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            clientSession.setLocationId(locationId);
-            clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
-        }
-        if (clientSession.getDetails().getPriorEquipmentId() == null) {
-            clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
-        }
-        if (clientSession.getDetails().getPriorSessionId() == null) {
-            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
-                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
-            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
-        clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
-        clientSession.getDetails().setSsid(apClientEvent.getSsid());
-        if (apClientEvent.hasAuthStatus()) {
-            clientSession.getDetails().setAssociationStatus(apClientEvent.getAuthStatus());
-        }
-        clientSession.getDetails().setAuthTimestamp(apClientEvent.getTimestampMs());
-        clientSession.getDetails().setAssociationState(AssociationState._802_11_Authenticated);
-        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
-        clientSession = clientServiceInterface.updateSession(clientSession);
-
-        realtimeEventPublisher.publishClientAuthSystemEvent(customerId, equipmentId, locationId, apEventClientSession.getClientAuthEvent());
-
-    }
-    
-    private void processClientAssocEvent(int customerId, long equipmentId, long locationId,
-            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
-        ClientAssocEvent apClientEvent = apEventClientSession.getClientAssocEvent();
-
-        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
-
-        if (client == null) {
-            client = new com.telecominfraproject.wlan.client.models.Client();
-            client.setCustomerId(customerId);
-            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            client.setDetails(new ClientInfoDetails());
-            client = clientServiceInterface.create(client);
-        }
-
-        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
-
-        if (clientSession == null) {
-            clientSession = new ClientSession();
-            clientSession.setCustomerId(customerId);
-            clientSession.setEquipmentId(equipmentId);
-            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            clientSession.setLocationId(locationId);
-            clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
-        }
-        if (clientSession.getDetails().getPriorEquipmentId() == null) {
-            clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
-        }
-        if (clientSession.getDetails().getPriorSessionId() == null) {
-            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
-                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
-            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
-        clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
-        clientSession.getDetails().setSsid(apClientEvent.getSsid());
-        if (apClientEvent.hasStatus()) {
-            clientSession.getDetails().setAssociationStatus(apClientEvent.getStatus());
-        }
-        clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
-        if (apClientEvent.hasUsing11K()) {
-            clientSession.getDetails().setIs11KUsed(apClientEvent.getUsing11K());
-        }
-        if (apClientEvent.hasUsing11R()) {
-            clientSession.getDetails().setIs11RUsed(apClientEvent.getUsing11R());
-        }
-        if (apClientEvent.hasUsing11V()) {
-            clientSession.getDetails().setIs11VUsed(apClientEvent.getUsing11V());
-        }
-        if (apClientEvent.hasAssocType()) {
-            clientSession.getDetails().setIsReassociation(apClientEvent.getAssocType().equals(AssocType.REASSOC));
-        }
-        if (apClientEvent.hasRssi()) {
-            clientSession.getDetails().setAssocRssi(apClientEvent.getRssi());
-        }
-        if (apClientEvent.hasInternalSc()) {
-            clientSession.getDetails().setAssocInternalSC(apClientEvent.getInternalSc());
-        }
-        clientSession.getDetails().setAssocTimestamp(apClientEvent.getTimestampMs());
-        clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
-        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
-        clientSession = clientServiceInterface.updateSession(clientSession);
-        realtimeEventPublisher.publishClientAssocEvent(customerId, equipmentId, locationId, apEventClientSession.getClientAssocEvent());
-
-    }
-    
-    private void processClientIpEvent(int customerId, long equipmentId, long locationId, sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
-        ClientIpEvent apClientEvent = apEventClientSession.getClientIpEvent();
-        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (client == null) {
-            client = new com.telecominfraproject.wlan.client.models.Client();
-            client.setCustomerId(customerId);
-            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            client.setDetails(new ClientInfoDetails());
-            client = clientServiceInterface.create(client);
-        }
-        client = clientServiceInterface.update(client);
-
-        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (clientSession == null) {
-            clientSession = new ClientSession();
-            clientSession.setCustomerId(customerId);
-            clientSession.setEquipmentId(equipmentId);
-            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            clientSession.setLocationId(locationId);
-            clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
-        }
-        if (clientSession.getDetails().getPriorEquipmentId() == null) {
-            clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
-        }
-        if (clientSession.getDetails().getPriorSessionId() == null) {
-            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
-                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
-            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
-        if (apClientEvent.hasIpAddr()) {
-            ByteString ipAddress = apClientEvent.getIpAddr();
-            if (ipAddress != null) {
-                try {
-                    InetAddress inetAddress = InetAddress.getByAddress(ipAddress.toByteArray());
-                    if (inetAddress instanceof Inet4Address) {
-                        clientSession.getDetails().setIpAddress(inetAddress);
-                    } else if (inetAddress instanceof Inet6Address) {
-                        clientSession.getDetails().setIpAddress(inetAddress);
-                    } else {
-                        LOG.error("Invalid IP Address {}", ipAddress);
-                    }
-                    clientSession.getDetails().setIpTimestamp(apClientEvent.getTimestampMs());
-
-                } catch (UnknownHostException ex) {
-                }
-            }
-        }
-        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
-        clientSession = clientServiceInterface.updateSession(clientSession);
-        realtimeEventPublisher.publishClientIpEvent(customerId, equipmentId, locationId, apEventClientSession.getClientIpEvent());
-    }
-    
-    private void processClientDisconnectEvent(int customerId, long equipmentId, long locationId,
-            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
-        ClientDisconnectEvent apClientEvent = apEventClientSession.getClientDisconnectEvent();
-        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (client == null) {
-            client = new com.telecominfraproject.wlan.client.models.Client();
-            client.setCustomerId(customerId);
-            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            client.setDetails(new ClientInfoDetails());
-            client = clientServiceInterface.create(client);
-        }
-        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (clientSession == null) {
-            clientSession = new ClientSession();
-            clientSession.setCustomerId(customerId);
-            clientSession.setEquipmentId(equipmentId);
-            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            clientSession.setLocationId(locationId);
-            clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
-        }
-
-        if (clientSession.getDetails().getPriorSessionId() == null) {
-            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
-                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
-            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
-        clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
-        clientSession.getDetails().setSsid(apClientEvent.getSsid());
-        if (apClientEvent.hasDevType()) {
-            if (apClientEvent.getDevType().equals(DeviceType.DEV_AP)) {
-                clientSession.getDetails().setDisconnectByApTimestamp(apClientEvent.getTimestampMs());
-                if (apClientEvent.hasInternalRc()) {
-                    clientSession.getDetails().setDisconnectByApInternalReasonCode(apClientEvent.getInternalRc());
-                }
-                if (apClientEvent.hasReason()) {
-                    clientSession.getDetails().setDisconnectByApReasonCode(apClientEvent.getReason());
-                }
-            } else {
-                clientSession.getDetails().setDisconnectByClientTimestamp(apClientEvent.getTimestampMs());
-                if (apClientEvent.hasInternalRc()) {
-                    clientSession.getDetails().setDisconnectByClientInternalReasonCode(apClientEvent.getInternalRc());
-                }
-                if (apClientEvent.hasReason()) {
-                    clientSession.getDetails().setDisconnectByClientReasonCode(apClientEvent.getReason());
-                }
-            }
-        }
-        if (apClientEvent.hasFrType()) {
-            if (apClientEvent.getFrType().equals(FrameType.FT_DEAUTH)) {
-            }
-            if (apClientEvent.getFrType().equals(FrameType.FT_DISASSOC)) {
-            }
-        }
-        if (apClientEvent.hasRssi()) {
-            clientSession.getDetails().setAssocRssi(apClientEvent.getRssi());
-        }
-        if (apClientEvent.hasLrcvUpTsInUs()) {
-            clientSession.getDetails().setLastRxTimestamp(apClientEvent.getLrcvUpTsInUs());
-        }
-        if (apClientEvent.hasLsentUpTsInUs()) {
-            clientSession.getDetails().setLastTxTimestamp(apClientEvent.getLsentUpTsInUs());
-        }
-        clientSession.getDetails().setAssociationState(AssociationState.Disconnected);
-        clientSession.getDetails().setAssocTimestamp(apClientEvent.getTimestampMs());
-        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
-        clientSession = clientServiceInterface.updateSession(clientSession);
-        realtimeEventPublisher.publishClientDisconnectEvent(customerId, equipmentId, locationId, apEventClientSession.getClientDisconnectEvent());
-
-    }
-
-}

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.setEventTimestamp(clientConnectEvent.getTimestampMs());
+        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());
@@ -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
@@ -243,7 +347,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
@@ -287,6 +391,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.setEventTimestamp(clientFailureEvent.getTimestampMs());
+        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.setEventTimestamp(clientFirstDataEvent.getTimestampMs());
+        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.setEventTimestamp(clientIdEvent.getTimestampMs());
+        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,16 +473,11 @@ 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(InetAddress.getByAddress(clientIpEvent.getIpAddr().toByteArray()));
-            } catch (UnknownHostException e1) {
-                LOG.error("Invalid Client IP Address for equipmentId {}, clientIpEvent {}", equipmentId, clientIpEvent);
-            }
+            clientEvent.setIpAddr(clientIpEvent.getIpAddr().toByteArray());
         }
-
         clientEvent.setEventTimestamp(clientIpEvent.getTimestampMs());
         clientEvent.setCustomerId(customerId);
         clientEvent.setEquipmentId(equipmentId);
@@ -313,6 +487,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.setEventTimestamp(clientTimeoutEvent.getTimestampMs());
+        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 +849,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 +915,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 +979,7 @@ public class RealtimeEventPublisher {
 
             if (apCallStop.hasSessionId()) {
 
-                cloudSipCallStopEvent.setAssociationId(Long.toUnsignedString(  apCallStop.getSessionId()));
+                cloudSipCallStopEvent.setAssociationId(apCallStop.getSessionId());
 
             }
 
@@ -558,11 +1043,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 +1167,7 @@ public class RealtimeEventPublisher {
             }
 
             if (apStreamVideoSessionStart.hasSessionId()) {
-                rtsStartSessionEvent.setSessionId(Long.toUnsignedString( apStreamVideoSessionStart.getSessionId()));
+                rtsStartSessionEvent.setSessionId(apStreamVideoSessionStart.getSessionId());
 
             }
 
@@ -693,7 +1178,7 @@ public class RealtimeEventPublisher {
             }
 
             if (apStreamVideoSessionStart.hasVideoSessionId()) {
-                rtsStartSessionEvent.setVideoSessionId(Long.toUnsignedString( apStreamVideoSessionStart.getVideoSessionId()));
+                rtsStartSessionEvent.setVideoSessionId(apStreamVideoSessionStart.getVideoSessionId());
             }
             eventsList.add(rtsStartSessionEvent);
         }
@@ -723,7 +1208,7 @@ public class RealtimeEventPublisher {
             }
 
             if (apStreamVideoStop.hasSessionId()) {
-                rtsStopEvent.setSessionId(Long.toUnsignedString( apStreamVideoStop.getSessionId()));
+                rtsStopEvent.setSessionId(apStreamVideoStop.getSessionId());
             }
 
             if (apStreamVideoStop.hasStreamingVideoType()) {
@@ -738,7 +1223,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;
@@ -50,7 +49,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.PaginationResponse;
 import com.telecominfraproject.wlan.customer.models.Customer;
 import com.telecominfraproject.wlan.customer.models.CustomerDetails;
 import com.telecominfraproject.wlan.customer.models.EquipmentAutoProvisioningSettings;
@@ -67,7 +65,6 @@ import com.telecominfraproject.wlan.location.models.LocationType;
 import com.telecominfraproject.wlan.location.service.LocationServiceInterface;
 import com.telecominfraproject.wlan.opensync.external.integration.controller.OpensyncCloudGatewayController;
 import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo;
-import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPInetState;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPRadioState;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPVIFState;
 import com.telecominfraproject.wlan.opensync.external.integration.utils.MqttStatsPublisher;
@@ -85,7 +82,6 @@ import com.telecominfraproject.wlan.status.equipment.models.EquipmentUpgradeStat
 import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSID;
 import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSIDs;
 import com.telecominfraproject.wlan.status.equipment.report.models.ClientConnectionDetails;
-import com.telecominfraproject.wlan.status.equipment.report.models.WiredPortStatus;
 import com.telecominfraproject.wlan.status.models.Status;
 import com.telecominfraproject.wlan.status.models.StatusDataType;
 import com.vmware.ovsdb.protocol.operation.notation.Uuid;
@@ -94,13 +90,15 @@ import sts.OpensyncStats.AssocType;
 import sts.OpensyncStats.Client;
 import sts.OpensyncStats.ClientReport;
 import sts.OpensyncStats.EventReport;
+import sts.OpensyncStats.EventReport.ClientAssocEvent;
 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 +133,7 @@ public class OpensyncExternalIntegrationCloudTest {
     @Autowired
     OpensyncExternalIntegrationCloud opensyncExternalIntegrationCloud;
 
+
     MockitoSession mockito;
 
     @Configuration
@@ -171,12 +170,10 @@ public class OpensyncExternalIntegrationCloudTest {
         Location location = new Location();
         location.setId(8L);
         location.setCustomerId(2);
-        LocationDetails details = LocationDetails.createWithDefaults();
-        details.setCountryCode(CountryCode.CA);
-        location.setDetails(details);
+        location.setDetails(LocationDetails.createWithDefaults());
         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 +192,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)))
-                .thenReturn(fwStatus);
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
+                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 +222,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.update(ArgumentMatchers.any(Equipment.class))).thenAnswer(i -> i.getArguments()[0]);
+        Mockito.when(equipmentServiceInterface.create(ArgumentMatchers.any(Equipment.class)))
+                .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 +248,11 @@ public class OpensyncExternalIntegrationCloudTest {
         Location location = new Location();
         location.setId(8L);
         location.setCustomerId(2);
-        LocationDetails details = LocationDetails.createWithDefaults();
-        details.setCountryCode(CountryCode.CA);
-        location.setDetails(details);
+        location.setDetails(LocationDetails.createWithDefaults());
         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 +285,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 +307,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.update(ArgumentMatchers.any(Equipment.class))).thenAnswer(i -> i.getArguments()[0]);
-        Mockito.when(equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122"))).thenReturn(null);
+        Mockito.when(equipmentServiceInterface.create(ArgumentMatchers.any(Equipment.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
+        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)))
-                .thenReturn(fwStatus);
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
+                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 +339,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 +352,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();
-        details.setCountryCode(CountryCode.CA);
-        location.setDetails(details);
+        location.setDetails(LocationDetails.createWithDefaults());
         location.setName("Location-UT");
         location.setLocationType(LocationType.BUILDING);
-        Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);
 
         Equipment equipment = new Equipment();
         equipment.setCustomerId(2);
@@ -363,20 +375,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)))
-                .thenReturn(fwStatus);
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
+                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.update(ArgumentMatchers.any(Equipment.class))).thenAnswer(i -> i.getArguments()[0]);
-        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.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 +440,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 +467,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 +481,8 @@ public class OpensyncExternalIntegrationCloudTest {
         activeBssidsDetails.setActiveBSSIDs(getActiveBssidList());
         bssidStatus.setDetails(activeBssidsDetails);
 
-        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(), ArgumentMatchers.eq(StatusDataType.ACTIVE_BSSIDS)))
-                .thenReturn(bssidStatus);
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
+                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 +491,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)
-                .thenReturn(clientInstance2);
-        Mockito.when(clientServiceInterface.update(ArgumentMatchers.any(com.telecominfraproject.wlan.client.models.Client.class))).thenReturn(clientInstance)
-                .thenReturn(clientInstance2);
+        Mockito.when(
+                clientServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.any(MacAddress.class)))
+                .thenReturn(clientInstance).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 +504,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 +581,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.setId(1L);
+        equipment.setCustomerId(1);
         equipment.setEquipmentType(EquipmentType.AP);
         equipment.setInventoryId(apId);
         equipment.setProfileId(1);
@@ -588,13 +616,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 +656,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");
@@ -687,42 +718,24 @@ public class OpensyncExternalIntegrationCloudTest {
 
         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);
 
     }
 
-    @Test
-    public void testParseRawDataToWiredPortStatus() {
-    	 Map<String, List<WiredPortStatus>> portStatus = new HashMap<>();
-    	OpensyncAPInetState inetState = new OpensyncAPInetState();
-    	inetState.setIfType("bridge");
-    	@SuppressWarnings("serial")
-		Map<String, String> ethPorts = new HashMap<String, String>(){{
-    	     put("eth0", "up lan 1000Mbps full");
-    	     put("eth1", "up wan 1000Mbps full");
-    	     put("eth2", "incorrect value");
-    	}};
-    	inetState.setIfName("lan");
-    	inetState.setEthPorts(ethPorts);
-    	opensyncExternalIntegrationCloud.parseRawDataToWiredPortStatus(2, 1, portStatus, inetState);
-    	assertEquals(1, portStatus.size());
-    	assertEquals(true, portStatus.containsKey("lan"));
-    	assertEquals(2, portStatus.get("lan").size());
-    	assertEquals("lan", portStatus.get("lan").get(0).getCurrentIfName());
-    }
-
     @Ignore
     public void testWifiInetStateDbTableUpdate() {
         // TODO: implement me
@@ -740,23 +753,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);
@@ -766,36 +762,16 @@ public class OpensyncExternalIntegrationCloudTest {
         activeBssidsDetails.setActiveBSSIDs(getActiveBssidList());
         bssidStatus.setDetails(activeBssidsDetails);
 
-        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(), 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);
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
+                ArgumentMatchers.eq(StatusDataType.ACTIVE_BSSIDS))).thenReturn(bssidStatus);
 
-
-        opensyncExternalIntegrationCloud.wifiVIFStateDbTableDelete(ImmutableList.of(new OpensyncAPVIFState()), "Test_Client_21P10C68818122");
+        opensyncExternalIntegrationCloud.wifiVIFStateDbTableDelete(ImmutableList.of(new OpensyncAPVIFState()), "apId");
     }
 
     @Test
     public void testWifiAssociatedClientsDbTableDelete() {
-        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);
-        opensyncExternalIntegrationCloud.wifiAssociatedClientsDbTableDelete("7C:AB:60:E6:EA:4D", "Test_Client_21P10C68818122");
+        opensyncExternalIntegrationCloud.wifiAssociatedClientsDbTableDelete("7C:AB:60:E6:EA:4D", "apId");
     }
 
     // Helper methods
@@ -823,9 +799,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);
@@ -853,26 +831,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)
-                .setTxRate(433300.0).setRssi(758722570).setRxFrames(10000).setTxFrames(10000).setTxRate(24000.0).build();
-        Client client2g = Client.getDefaultInstance().toBuilder().setMacAddress("7C:AB:60:E6:EA:4D").setSsid("ssid-1").setConnected(true).setDurationMs(59977)
-                .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();
+        Client.Stats clientStats = Client.Stats.getDefaultInstance().toBuilder().setRssi(rssi).setRxBytes(225554786)
+                .setRxRate(24000.0).setTxBytes(1208133026).setTxRate(433300.0).setRssi(758722570).setRxFrames(10000)
+                .setTxFrames(10000).setTxRate(24000.0).build();
+        Client client2g = Client.getDefaultInstance().toBuilder().setMacAddress("7C:AB:60:E6:EA:4D").setSsid("ssid-1")
+                .setConnected(true).setDurationMs(59977).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.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND2G).setChannel(6).addAllClientList(ImmutableList.of(client2g)).build();
-        ClientReport clientReport5gl =
-                ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GL).setChannel(36).addAllClientList(new ArrayList<Client>()).build();
-        ClientReport clientReport5gu = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GU).setChannel(157)
-                .addAllClientList(ImmutableList.of(client5gu)).build();
+        ClientReport clientReport2g = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND2G)
+                .setChannel(6).addAllClientList(ImmutableList.of(client2g)).build();
+        ClientReport clientReport5gl = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GL)
+                .setChannel(36).addAllClientList(new ArrayList<Client>()).build();
+        ClientReport clientReport5gu = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GU)
+                .setChannel(157).addAllClientList(ImmutableList.of(client5gu)).build();
 
         List<ClientReport> clients = new ArrayList<>();
         clients.add(clientReport2g);
@@ -901,7 +882,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

@@ -0,0 +1,389 @@
+package com.telecominfraproject.wlan.opensync.external.integration.utils;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.mockito.MockitoSession;
+import org.mockito.quality.Strictness;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.google.common.collect.ImmutableList;
+import com.google.protobuf.ByteString;
+import com.telecominfraproject.wlan.alarm.AlarmServiceInterface;
+import com.telecominfraproject.wlan.client.ClientServiceInterface;
+import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
+import com.telecominfraproject.wlan.client.session.models.ClientSession;
+import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
+import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
+import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
+import com.telecominfraproject.wlan.core.model.equipment.RadioType;
+import com.telecominfraproject.wlan.customer.service.CustomerServiceInterface;
+import com.telecominfraproject.wlan.equipment.EquipmentServiceInterface;
+import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
+import com.telecominfraproject.wlan.equipment.models.Equipment;
+import com.telecominfraproject.wlan.firmware.FirmwareServiceInterface;
+import com.telecominfraproject.wlan.location.service.LocationServiceInterface;
+import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationCloud;
+import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession;
+import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
+import com.telecominfraproject.wlan.opensync.external.integration.controller.OpensyncCloudGatewayController;
+import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
+import com.telecominfraproject.wlan.routing.RoutingServiceInterface;
+import com.telecominfraproject.wlan.servicemetric.apnode.models.ApNodeMetrics;
+import com.telecominfraproject.wlan.servicemetric.apnode.models.StateUpDownError;
+import com.telecominfraproject.wlan.status.StatusServiceInterface;
+import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSID;
+import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSIDs;
+import com.telecominfraproject.wlan.status.models.Status;
+import com.telecominfraproject.wlan.status.models.StatusDataType;
+
+import sts.OpensyncStats.AssocType;
+import sts.OpensyncStats.ChannelSwitchReason;
+import sts.OpensyncStats.Client;
+import sts.OpensyncStats.ClientReport;
+import sts.OpensyncStats.DNSProbeMetric;
+import sts.OpensyncStats.EventReport;
+import sts.OpensyncStats.EventReport.ChannelSwitchEvent;
+import sts.OpensyncStats.EventReport.ClientAssocEvent;
+import sts.OpensyncStats.NetworkProbe;
+import sts.OpensyncStats.RADIUSMetrics;
+import sts.OpensyncStats.RadioBandType;
+import sts.OpensyncStats.Report;
+import sts.OpensyncStats.StateUpDown;
+import sts.OpensyncStats.VLANMetrics;
+
+@RunWith(SpringRunner.class)
+@ActiveProfiles(profiles = { "integration_test", })
+@SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = MqttStatsPublisherTest.class)
+@Import(value = { AlarmServiceInterface.class, OpensyncExternalIntegrationCloud.class,
+        MqttStatsPublisherTest.Config.class,
+
+})
+public class MqttStatsPublisherTest {
+
+    @MockBean
+    AlarmServiceInterface alarmServiceInterface;
+    @MockBean
+    CustomerServiceInterface customerServiceInterface;
+    @MockBean
+    LocationServiceInterface locationServiceInterface;
+    @MockBean(answer = Answers.RETURNS_MOCKS)
+    OvsdbSessionMapInterface ovsdbSessionMapInterface;
+    @MockBean
+    CloudEventDispatcherInterface equipmentMetricsCollectorInterface;
+    @MockBean
+    EquipmentServiceInterface equipmentServiceInterface;
+    @MockBean
+    RoutingServiceInterface routingServiceInterface;
+    @MockBean
+    ProfileServiceInterface profileServiceInterface;
+    @MockBean
+    StatusServiceInterface statusServiceInterface;
+    @MockBean
+    ClientServiceInterface clientServiceInterface;
+    @MockBean
+    FirmwareServiceInterface firmwareServiceInterface;
+    @MockBean(answer = Answers.RETURNS_MOCKS)
+    OpensyncCloudGatewayController gatewayController;
+    @MockBean
+    RealtimeEventPublisher realtimeEventPublisher;
+    @Autowired
+    MqttStatsPublisher opensyncExternalIntegrationMqttProcessor;
+
+    MockitoSession mockito;
+
+    @Configuration
+    static class Config {
+
+        @Bean
+        public MqttStatsPublisher mqttStatsPublisher() {
+            return new MqttStatsPublisher();
+        }
+
+    }
+
+    @Before
+    public void setUp() throws Exception {
+
+        mockito = Mockito.mockitoSession().initMocks(this).strictness(Strictness.STRICT_STUBS).startMocking();
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        mockito.finishMocking();
+
+    }
+
+    @Test
+    public void testExtractApIdFromTopic() {
+
+        String topic = "/ap/Test_Client_21P10C68818122/opensync";
+
+        assertEquals("Test_Client_21P10C68818122", MqttStatsPublisher.extractApIdFromTopic(topic));
+
+    }
+
+    @Test
+    public void testExtractCustomerIdFromTopic() {
+        String topic = "/ap/Test_Client_21P10C68818122/opensync";
+        OvsdbSession session = Mockito.mock(OvsdbSession.class);
+        Mockito.when(session.getCustomerId()).thenReturn(2);
+
+        Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(session);
+
+        assertEquals(2, opensyncExternalIntegrationMqttProcessor.extractCustomerIdFromTopic(topic));
+    }
+
+    @Test
+    public void testExtractEquipmentIdFromTopic() {
+
+        String topic = "/ap/Test_Client_21P10C68818122/opensync";
+        OvsdbSession session = Mockito.mock(OvsdbSession.class);
+        Mockito.when(session.getEquipmentId()).thenReturn(1L);
+
+        Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(session);
+
+        assertEquals(1L, opensyncExternalIntegrationMqttProcessor.extractEquipmentIdFromTopic(topic));
+
+    }
+
+    @Test
+    public void testProcessMqttMessageStringReport() {
+        Equipment equipment = new Equipment();
+
+        equipment.setDetails(ApElementConfiguration.createWithDefaults());
+
+        equipment.setId(1L);
+
+        Mockito.when(
+                equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
+                .thenReturn(equipment);
+
+        equipment.setProfileId(0L);
+
+        Mockito.when(equipmentServiceInterface.getOrNull(1L)).thenReturn(equipment);
+        Mockito.when(equipmentServiceInterface.get(1L)).thenReturn(equipment);
+
+        Report report = Report.newBuilder().setNodeID("21P10C68818122")
+                .addAllClients(getOpensyncStatsClientReportsList())
+                .addAllEventReport(getOpensyncStatsEventReportsList()).build();
+
+        String topic = "/ap/Test_Client_21P10C68818122/opensync";
+
+        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);
+
+        Status bssidStatus = new Status();
+        bssidStatus.setStatusDataType(StatusDataType.ACTIVE_BSSIDS);
+        bssidStatus.setCustomerId(2);
+
+        ActiveBSSIDs activeBssidsDetails = new ActiveBSSIDs();
+        activeBssidsDetails.setActiveBSSIDs(getActiveBssidList());
+        bssidStatus.setDetails(activeBssidsDetails);
+
+        Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
+                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();
+        clientInstance.setMacAddress(MacAddress.valueOf("7C:AB:60:E6:EA:4D"));
+        clientInstance.setDetails(new ClientInfoDetails());
+        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).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"));
+        clientSession.setDetails(new ClientSessionDetails());
+        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))).thenReturn(clientSession).thenReturn(clientSession2);
+
+        Mockito.when(clientServiceInterface.updateSession(ArgumentMatchers.any(ClientSession.class)))
+                .thenReturn(clientSession).thenReturn(clientSession2);
+
+        opensyncExternalIntegrationMqttProcessor.processMqttMessage(topic, report);
+
+        // Mockito.verify(clientServiceInterface,
+        // Mockito.times(4)).getOrNull(Mockito.anyInt(),
+        // Mockito.any(MacAddress.class));
+        // Mockito.verify(clientServiceInterface,
+        // Mockito.times(4)).getSessionOrNull(Mockito.anyInt(),
+        // Mockito.anyLong(),
+        // Mockito.any(MacAddress.class));
+        // Mockito.verify(statusServiceInterface,
+        // Mockito.times(3)).getOrNull(Mockito.anyInt(), Mockito.anyLong(),
+        // Mockito.eq(StatusDataType.ACTIVE_BSSIDS));
+
+    }
+
+    @Ignore
+    public void testProcessMqttMessageStringFlowReport() {
+        // TODO: implement me when support flow reports
+    }
+
+    @Ignore
+    public void testProcessMqttMessageStringWCStatsReport() {
+        // TODO: implement me when wcs stats reports supported
+    }
+
+    @Test
+    public void testpopulateNetworkProbeMetrics() throws Exception {
+
+        InetAddress ip = InetAddress.getLocalHost();
+
+        DNSProbeMetric dnsProbeMetric = DNSProbeMetric.getDefaultInstance().toBuilder().setLatency(10)
+                .setState(StateUpDown.SUD_up).setServerIP(ip.getHostName()).build();
+        RADIUSMetrics radiusProbeMetric = RADIUSMetrics.getDefaultInstance().toBuilder().setLatency(10)
+                .setRadiusState(StateUpDown.SUD_up).setServerIP(ip.getHostName()).build();
+        VLANMetrics vlanMetrics = VLANMetrics.getDefaultInstance().toBuilder().setLatency(10)
+                .setDhcpState(StateUpDown.SUD_up).setVlanIF("vlan-1").build();
+        NetworkProbe networkProbe = NetworkProbe.getDefaultInstance().toBuilder().setVlanProbe(vlanMetrics)
+                .setDnsProbe(dnsProbeMetric).addRadiusProbe(radiusProbeMetric).build();
+
+        Report report = Report.getDefaultInstance().toBuilder().setNodeID("21P10C68818122")
+                .addNetworkProbe(networkProbe).build();
+
+        ApNodeMetrics apNodeMetrics = new ApNodeMetrics();
+
+        opensyncExternalIntegrationMqttProcessor.populateNetworkProbeMetrics(report, apNodeMetrics);
+
+        assertNotNull(apNodeMetrics.getNetworkProbeMetrics());
+
+        assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getDnsLatencyMs() == 10);
+        assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getDhcpLatencyMs() == 10);
+        assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getRadiusState().equals(StateUpDownError.enabled));
+        assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getDhcpState().equals(StateUpDownError.enabled));
+        assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getDnsState().equals(StateUpDownError.enabled));
+        assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getRadiusLatencyInMs() == 10);
+        assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getVlanIF().equals("vlan-1"));
+
+    }
+
+    // Helper methods
+    private List<ActiveBSSID> getActiveBssidList() {
+        ActiveBSSID activeBssid = new ActiveBSSID();
+        activeBssid.setBssid("24:f5:a2:ef:2e:54");
+        activeBssid.setSsid("ssid-1");
+        activeBssid.setNumDevicesConnected(1);
+        activeBssid.setRadioType(RadioType.is2dot4GHz);
+        ActiveBSSID activeBssid2 = new ActiveBSSID();
+        activeBssid2.setBssid("24:f5:a2:ef:2e:55");
+        activeBssid2.setSsid("ssid-2");
+        activeBssid2.setNumDevicesConnected(1);
+        activeBssid2.setRadioType(RadioType.is5GHzL);
+        ActiveBSSID activeBssid3 = new ActiveBSSID();
+        activeBssid3.setBssid("24:f5:a2:ef:2e:56");
+        activeBssid3.setSsid("ssid-3");
+        activeBssid3.setNumDevicesConnected(1);
+        activeBssid3.setRadioType(RadioType.is5GHzU);
+
+        List<ActiveBSSID> bssidList = new ArrayList<>();
+        bssidList.add(activeBssid);
+        bssidList.add(activeBssid2);
+        bssidList.add(activeBssid3);
+        return bssidList;
+    }
+    private List<EventReport> getOpensyncStatsEventReportsList() {
+
+        sts.OpensyncStats.EventReport.ClientAssocEvent.Builder clientAssocBuilder = EventReport.ClientAssocEvent
+                .getDefaultInstance().toBuilder();
+        clientAssocBuilder.setAssocType(AssocType.ASSOC);
+        clientAssocBuilder.setBand(RadioBandType.BAND5GU);
+        clientAssocBuilder.setRssi(-65);
+        clientAssocBuilder.setStaMac("C0:9A:D0:76:A9:69");
+        clientAssocBuilder.setStaMacBytes(ByteString.copyFrom("C0:9A:D0:76:A9:69".getBytes()));
+        clientAssocBuilder.setSessionId(1000L);
+        clientAssocBuilder.setInternalSc(1);
+        clientAssocBuilder.setSsid("ssid-3");
+        clientAssocBuilder.setStatus(1);
+        clientAssocBuilder.setTimestampMs(System.currentTimeMillis());
+
+        List<EventReport> eventReportList = new ArrayList<>();
+
+        EventReport.Builder eventReportBuilder = EventReport.getDefaultInstance().toBuilder();
+
+        sts.OpensyncStats.EventReport.ClientSession.Builder clientSessionBuilder = sts.OpensyncStats.EventReport.ClientSession
+                .getDefaultInstance().toBuilder();
+
+        clientSessionBuilder.setSessionId(1000L);
+
+        clientSessionBuilder.setClientAssocEvent(clientAssocBuilder.build());
+        List<sts.OpensyncStats.EventReport.ClientSession> clientSessionList = new ArrayList<>();
+        clientSessionList.add(clientSessionBuilder.build());
+
+        sts.OpensyncStats.EventReport.ChannelSwitchEvent.Builder channelSwitchEventBuilder = sts.OpensyncStats.EventReport.ChannelSwitchEvent
+                .getDefaultInstance().toBuilder();
+        channelSwitchEventBuilder.setBand(RadioBandType.BAND5GL).setChannel(40)
+                .setReason(ChannelSwitchReason.high_interference).setTimestampMs(System.currentTimeMillis());
+
+        List<ChannelSwitchEvent> channelSwitchEventList = new ArrayList<>();
+        channelSwitchEventList.add(channelSwitchEventBuilder.build());
+
+        eventReportBuilder.addAllClientSession(clientSessionList);
+        eventReportBuilder.addAllChannelSwitch(channelSwitchEventList);
+
+        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).setTxRate(433300.0).setRssi(758722570).setRxFrames(10000)
+                .setTxFrames(10000).setTxRate(24000.0).build();
+        Client client2g = Client.getDefaultInstance().toBuilder().setMacAddress("7C:AB:60:E6:EA:4D").setSsid("ssid-1")
+                .setConnected(true).setDurationMs(59977).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.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND2G)
+                .setChannel(6).addAllClientList(ImmutableList.of(client2g)).build();
+        ClientReport clientReport5gl = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GL)
+                .setChannel(36).addAllClientList(new ArrayList<Client>()).build();
+        ClientReport clientReport5gu = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GU)
+                .setChannel(157).addAllClientList(ImmutableList.of(client5gu)).build();
+
+        List<ClientReport> clients = new ArrayList<>();
+        clients.add(clientReport2g);
+        clients.add(clientReport5gl);
+        clients.add(clientReport5gu);
+        return clients;
+    }
+
+}

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.2.0-SNAPSHOT</version>
+		<version>1.1.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.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>tip-wlan-opensync-protobuf</artifactId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<artifactId>equipment-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>profile-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>location-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>routing-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		
 

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

@@ -36,6 +36,12 @@ 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);
@@ -51,13 +57,5 @@ public interface OpensyncExternalIntegrationInterface {
     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);
-
-    long getConfigVersionFromStatus(String apId);
-
-    void updateConfigVersionInStatus(String apId, long configVersionFromProfiles);
 }

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

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.telecominfraproject.wlan.core.model.equipment.LedStatus;
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
 import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
@@ -19,8 +18,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);

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

@@ -7,8 +7,6 @@ import java.util.Objects;
 
 public class ConnectNodeInfo implements Cloneable {
 
-    public static String CONFIG_VERSION_PROPERTY_NAME = "tip/reportedCfgDataVersion";
-    
     public Map<String, String> mqttSettings = new HashMap<>();
     public Map<String, String> versionMatrix = new HashMap<>();
     public Map<String, String> wifiRadioStates = new HashMap<>();
@@ -37,18 +35,6 @@ public class ConnectNodeInfo implements Cloneable {
     public String manufacturerDate;
     public String certificationRegion;
 
-    public long getConfigVersion() {
-        
-        long ret = 0;
-        try {
-            ret = Long.parseLong(versionMatrix.get(CONFIG_VERSION_PROPERTY_NAME));
-        } catch(Exception e) {
-            //do nothing
-        }
-
-        return ret;
-    }
-    
     @Override
     public ConnectNodeInfo clone() {
         try {

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

@@ -1,7 +1,6 @@
 package com.telecominfraproject.wlan.opensync.external.integration.models;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -39,73 +38,14 @@ public class OpensyncAPConfig extends OpensyncAPBase {
     private List<Profile> ssidProfile;
     private List<Profile> metricsProfile;
     private List<Profile> radiusProfiles;
-    private Profile wiredEthernetPortProfile;
     private Location equipmentLocation;
     private EquipmentRoutingRecord equipmentRouting;
     private EquipmentGatewayRecord equipmentGateway;
     private List<Profile> captiveProfiles;
     private List<Profile> bonjourGatewayProfiles;
 
-    private long configVersion;
-
     private List<MacAddress> blockedClients;
 
-    public long getConfigVersion() {
-        //go through all child objects and get the most recent lastModifiedTimestamp from them
-        configVersion = 0;
-        
-        if(customerEquipment!=null && customerEquipment.getLastModifiedTimestamp()> configVersion) {
-            configVersion = customerEquipment.getLastModifiedTimestamp();
-        }
-        
-        if(hotspotConfig!=null) {
-            configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20OperatorSet());
-            configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20ProfileSet());
-            configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20ProviderSet());
-            configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20VenueSet());
-        }
-
-        configVersion = getLatestLastMod(configVersion, apProfile);
-        configVersion = getLatestLastMod(configVersion, rfProfile);
-        configVersion = getLatestLastMod(configVersion, ssidProfile);
-        configVersion = getLatestLastMod(configVersion, metricsProfile);
-        configVersion = getLatestLastMod(configVersion, radiusProfiles);
-        configVersion = getLatestLastMod(configVersion, wiredEthernetPortProfile);
-
-        if(equipmentLocation!=null && equipmentLocation.getLastModifiedTimestamp()> configVersion) {
-            configVersion = equipmentLocation.getLastModifiedTimestamp();
-        }
-
-        configVersion = getLatestLastMod(configVersion, captiveProfiles);
-        configVersion = getLatestLastMod(configVersion, bonjourGatewayProfiles);
-        
-        return configVersion;
-    }
-    
-    private long getLatestLastMod(long incomingLastMod, Collection<Profile> profiles) {
-        
-        if(profiles!=null) {
-            for(Profile p: profiles) {
-                if(incomingLastMod < p.getLastModifiedTimestamp()) {
-                    incomingLastMod = p.getLastModifiedTimestamp();
-                }
-            }
-        }
-        
-        return incomingLastMod;
-    }
-
-    private long getLatestLastMod(long incomingLastMod, Profile profile) {
-        
-        if(profile!=null) {
-            if(incomingLastMod < profile.getLastModifiedTimestamp()) {
-                incomingLastMod = profile.getLastModifiedTimestamp();
-            }
-        }
-        
-        return incomingLastMod;
-    }
-
     @Override
     public OpensyncAPConfig clone() {
         OpensyncAPConfig ret = (OpensyncAPConfig) super.clone();
@@ -196,8 +136,7 @@ public class OpensyncAPConfig extends OpensyncAPBase {
                 && Objects.equals(hotspotConfig, other.hotspotConfig)
                 && Objects.equals(metricsProfile, other.metricsProfile)
                 && Objects.equals(radiusProfiles, other.radiusProfiles) && Objects.equals(rfProfile, other.rfProfile)
-                && Objects.equals(ssidProfile, other.ssidProfile)
-                && Objects.equals(wiredEthernetPortProfile, other.wiredEthernetPortProfile);
+                && Objects.equals(ssidProfile, other.ssidProfile);
     }
 
     public Profile getApProfile() {
@@ -256,15 +195,11 @@ public class OpensyncAPConfig extends OpensyncAPBase {
         return ssidProfile;
     }
 
-	public Profile getWiredEthernetPortProfile() {
-		return wiredEthernetPortProfile;
-	}
-	
     @Override
     public int hashCode() {
         return Objects.hash(apProfile, blockedClients, bonjourGatewayProfiles, captiveProfiles, customerEquipment,
                 equipmentGateway, equipmentLocation, equipmentRouting, hotspotConfig, metricsProfile, radiusProfiles,
-                rfProfile, ssidProfile, wiredEthernetPortProfile);
+                rfProfile, ssidProfile);
     }
 
     public void setApProfile(Profile apProfile) {
@@ -390,8 +325,4 @@ public class OpensyncAPConfig extends OpensyncAPBase {
         this.ssidProfile = ssidProfile;
     }
 
-	public void setWiredEthernetPortProfile(Profile wiredEthernetPortProfile) {
-		this.wiredEthernetPortProfile = wiredEthernetPortProfile;
-	}
-
 }

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

@@ -22,10 +22,8 @@ public class OpensyncAPInetState extends OpensyncAPBase {
     public String ifType;
     public String softwdsMacAddr;
     public boolean enabled;
-    public Map<String, String> ethPorts;
     public boolean sofwdsWrap;
     public int vlanId;
-    public Map<String, String> vlanTrunk;
     public String netmask;
     public boolean nat;
     public String greRemoteInetAddr;
@@ -45,21 +43,17 @@ public class OpensyncAPInetState extends OpensyncAPBase {
     public Uuid _uuid;
     public Uuid version;
     public String greLocalInetAddr;
-    // the following attribute is in inetC but not in inetS
+
     public String greRemoteMacAddr;
 
     public OpensyncAPInetState() {
         dns = new HashMap<>();
         dhcpc = new HashMap<>();
-        ethPorts = new HashMap<>();
-        vlanTrunk = new HashMap<>();
     }
 
     public OpensyncAPInetState(Row row) {
         dns = new HashMap<>();
         dhcpc = new HashMap<>();
-        ethPorts = new HashMap<>();
-        vlanTrunk = new HashMap<>();
 
         Map<String, Value> map = row.getColumns();
 
@@ -89,12 +83,6 @@ public class OpensyncAPInetState extends OpensyncAPBase {
         if (map.containsKey("dns")) {
             this.setDns(row.getMapColumn("dns"));
         }
-        if (map.containsKey("eth_ports")) {
-        	this.setEthPorts(row.getMapColumn("eth_ports"));
-        }
-        if (map.containsKey("vlan_trunk")) {
-        	this.setVlanTrunk(row.getMapColumn("vlan_trunk"));
-        }
         if (map.get("inet_addr") != null
                 && map.get("inet_addr").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setInetAddr(row.getStringColumn("inet_addr"));
@@ -169,12 +157,6 @@ public class OpensyncAPInetState extends OpensyncAPBase {
         if (!Objects.equals(dhcpd, other.dhcpd)) {
             return false;
         }
-        if (!Objects.equals(ethPorts, other.ethPorts)) {
-        	return false;
-        }
-        if (!Objects.equals(vlanTrunk, other.vlanTrunk)) {
-        	return false;
-        }
         if (!Objects.equals(dns, other.dns)) {
             return false;
         }
@@ -270,14 +252,6 @@ public class OpensyncAPInetState extends OpensyncAPBase {
         return dns;
     }
 
-    public Map<String, String> getEthPorts() {
-    	return ethPorts;
-    }
-    
-    public Map<String, String> getVlanTrunk() {
-    	return vlanTrunk;
-    }
-
     public String getGateway() {
         return gateway;
     }
@@ -356,9 +330,9 @@ public class OpensyncAPInetState extends OpensyncAPBase {
 
     @Override
     public int hashCode() {
-        return Objects.hash(_uuid, broadcast, dhcpc, dhcpd, dns, ethPorts, enabled, gateway, greIfName, greLocalInetAddr, greRemoteInetAddr,
+        return Objects.hash(_uuid, broadcast, dhcpc, dhcpd, dns, enabled, gateway, greIfName, greLocalInetAddr, greRemoteInetAddr,
                 hwAddr, ifName, ifType, ifUuid, inetAddr, inetConfig, ipAssignScheme, mtw, nat, netmask, network,
-                parentIfName, greRemoteMacAddr, softwdsMacAddr, sofwdsWrap, unpnpMode, version, vlanId, vlanTrunk);
+                parentIfName, greRemoteMacAddr, softwdsMacAddr, sofwdsWrap, unpnpMode, version, vlanId);
     }
 
     public boolean isEnabled() {
@@ -397,14 +371,6 @@ public class OpensyncAPInetState extends OpensyncAPBase {
         this.dns = dns;
     }
 
-    public void setEthPorts(Map<String, String> ethPorts) {
-    	this.ethPorts = ethPorts;
-    }
-    
-    public void setVlanTrunk(Map<String, String> vlanTrunk) {
-    	this.vlanTrunk = vlanTrunk;
-    }
-
     public void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }
@@ -500,9 +466,9 @@ public class OpensyncAPInetState extends OpensyncAPBase {
 
     @Override
     public String toString() {
-        return "OpensyncAPInetState [ifName=" + ifName + ", dhcpd=" + dhcpd + ", ethPorts=" + ethPorts + ", unpnpMode=" + unpnpMode + ", ifType="
+        return "OpensyncAPInetState [ifName=" + ifName + ", dhcpd=" + dhcpd + ", unpnpMode=" + unpnpMode + ", ifType="
                 + ifType + ", softwdsMacAddr=" + softwdsMacAddr + ", enabled=" + enabled + ", sofwdsWrap=" + sofwdsWrap
-                + ", vlanId=" + vlanId + ", vlanTrunk=" + vlanTrunk + ", netmask=" + netmask + ", nat=" + nat + ", greRemoteInetAddr="
+                + ", vlanId=" + vlanId + ", netmask=" + netmask + ", nat=" + nat + ", greRemoteInetAddr="
                 + greRemoteInetAddr + ", ifUuid=" + ifUuid + ", inetAddr=" + inetAddr + ", hwAddr=" + hwAddr + ", mtw="
                 + mtw + ", network=" + network + ", dns=" + dns + ", parentIfName=" + parentIfName + ", greIfName="
                 + greIfName + ", broadcast=" + broadcast + ", dhcpc=" + dhcpc + ", gateway=" + gateway

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

@@ -42,7 +42,7 @@ public class OpensyncAPRadioState extends OpensyncAPBase {
     public Map<String, String> hwConfig;
     public int channel;
     public int txPower;
-    public String htMode; // used in channel bandwidth
+    public String htMode;
     public int thermalDowngradeTemp;
     public String hwMode;
     public boolean enabled;

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.2.0-SNAPSHOT</version>
+    <version>1.1.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.2.0-SNAPSHOT</version>
+  		<version>1.1.0-SNAPSHOT</version>
   	</dependency>
   </dependencies>
 </project>

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

@@ -207,19 +207,4 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 
     }
 
-    @Override
-    public void nodeStateDbTableUpdate(List<Map<String, String>> nodeStateAttributes, String apId) {
-        LOG.info("nodeStateDbTableUpdate for AP {}", apId);
-    }
-
-    @Override
-    public long getConfigVersionFromStatus(String inventoryId) {
-        //0 means always push config to ap, do not do the version check for the configuration before pushing it
-        return 0;
-    }
-    
-    @Override
-    public void updateConfigVersionInStatus(String apId, long configVersionFromProfiles) {
-        // do nothing here
-    }
 }

opensync-gateway-build/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.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.2.0-SNAPSHOT</version>
+		<version>1.1.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.2.0-SNAPSHOT</version>
+			<version>1.1.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-process/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.1.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.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <artifactId>filestore-service</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 		<dependency>
 			<artifactId>customer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>location-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>equipment-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>profile-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>portal-user-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>service-metric-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>system-event-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>alarm-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>client-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>routing-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>firmware-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>manufacturer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

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.2.0-SNAPSHOT</version>
+		<version>1.1.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.2.0-SNAPSHOT</version>
+			<version>1.1.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.2.0-SNAPSHOT</version>
+		<version>1.1.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.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway/pom.xml

@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway</artifactId>
@@ -16,22 +14,22 @@
 		<dependency>
 			<artifactId>base-container</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-interface</artifactId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>client-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>customer-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vmware.ovsdb</groupId>
@@ -49,13 +47,13 @@
 		<dependency>
 			<artifactId>service-metric-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util -->
@@ -72,33 +70,7 @@
 		</dependency>
 		<!-- MQTT dependencies END -->
 
-		<!-- Test Dependencies BEGIN -->
-		<dependency>
-			<artifactId>status-service-local</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<artifactId>status-service</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<artifactId>status-datastore-inmemory</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<artifactId>cloud-event-dispatcher-empty</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<!-- Test Dependencies END -->
-
 	</dependencies>
 
 </project>
+

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();
-                        blockingConnection.connect();
+                        // Note: the following does not work with the
+                        // 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
-                        Topic[] topics = {new Topic("/ap/#", QoS.AT_MOST_ONCE),};
+                        LOG.info("Connected to MQTT broker at {}", mqtt.getHost());
 
-                        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().includingDefaultValueFields().omittingInsignificantWhitespace().usingTypeRegistry(oldRegistry);
+                        JsonFormat.Printer jsonPrinter = JsonFormat.printer().includingDefaultValueFields()
+                                .omittingInsignificantWhitespace().usingTypeRegistry(oldRegistry);
 
                         // main loop - receive messages
                         while (true) {
-                            LOG.debug("{} awaiting mqtt message from broker",mqttClientThread.getName());
-                            Message mqttMsg = blockingConnection.receive();
+                            Message mqttMsg = futureConnection.receive().await();
 
                             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) {
-                                    // looks like zlib-compressed data, let's
-                                    // decompress
-                                    // it before deserializing
-                                    payload = ZlibUtil.decompress(payload);
-                                }
-                                // Only supported protobuf on the TIP opensync APs is Report
-                                Report statsReport = Report.parseFrom(payload);
-                                mqttMsg.ack();
-                                MQTT_LOG.info("Topic {}\n{}", mqttMsg.getTopic(), jsonPrinter.print(statsReport));
-                                opensyncExternalIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), statsReport);                           
-                                LOG.debug("Dispatched report for topic {} to backend for processing", mqttMsg.getTopic());
+                            LOG.debug("MQTT Topic {}", mqttMsg.getTopic());
+
+                            byte payload[] = mqttMsg.getPayload();
+                            // we acknowledge right after receive because:
+                            // a. none of the stats messages are so important
+                            // that
+                            // we cannot skip one
+                            // b. if there's some kind of problem with the
+                            // message
+                            // (decoding or processing)
+                            // - we want to move on as quickly as possible and
+                            // 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 (Throwable e) {
+
+                    } catch (Exception e) {
                         LOG.error("Exception in MQTT receiver", e);
                     } finally {
                         try {
-                            if (blockingConnection != null) {
-                                blockingConnection.disconnect();
+                            if (futureConnection != null) {
+                                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;
@@ -6,6 +5,7 @@ import com.netflix.servo.DefaultMonitorRegistry;
 import com.netflix.servo.monitor.BasicCounter;
 import com.netflix.servo.monitor.Counter;
 import com.netflix.servo.monitor.MonitorConfig;
+import com.netflix.servo.monitor.Monitors;
 import com.netflix.servo.tag.TagList;
 import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
@@ -18,6 +18,7 @@ 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;
@@ -26,9 +27,7 @@ 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.OvsdbConnectionInfo;
 import com.vmware.ovsdb.service.OvsdbPassiveConnectionListener;
 import io.netty.handler.ssl.SslContext;
 import org.slf4j.Logger;
@@ -38,7 +37,6 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -52,13 +50,17 @@ 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;
@@ -72,12 +74,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     @org.springframework.beans.factory.annotation.Value("${tip.wlan.defaultCommandDurationSec:3600}")
     private long defaultCommandDurationSec;
 
-    @org.springframework.beans.factory.annotation.Value("${tip.wlan.checkConfigVersionFromStatus:true}")
-    private boolean checkBeforePushConfigVersionFromStatus;
-
-    @org.springframework.beans.factory.annotation.Value("${tip.wlan.checkConfigVersionFromAp:true}")
-    private boolean checkBeforePushConfigVersionFromAp;
-    
     @Autowired
     private SslContext sslContext;
 
@@ -127,18 +123,12 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     ovsdbClient = new OvsdbClientWithMetrics(ovsdbClient, ovsdbMetrics);
                 }
 
+                String remoteHost = ovsdbClient.getConnectionInfo().getRemoteAddress().getHostAddress();
+                int localPort = ovsdbClient.getConnectionInfo().getLocalPort();
                 String subjectDn;
                 try {
-                	OvsdbConnectionInfo connectionInfo = ovsdbClient.getConnectionInfo();
-                	String remoteHost = connectionInfo.getRemoteAddress().getHostAddress();
-                    Certificate remoteCertificate = connectionInfo.getRemoteCertificate();
-                    if (remoteCertificate == null) {
-                    	LOG.debug("Connect attempt no certificate from {} on remote port {}", remoteHost, connectionInfo.getRemotePort());
-                    	return;
-                    }
-                    
-                    int localPort = connectionInfo.getLocalPort();
-					subjectDn = ((X509Certificate) remoteCertificate).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);
@@ -199,9 +189,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     localPort = ovsdbClient.getConnectionInfo().getLocalPort();
                     String subjectDn = null;
                     try {
-                    	Certificate remoteCertificate = ovsdbClient.getConnectionInfo().getRemoteCertificate();
-                    	if (remoteCertificate != null)
-                    		subjectDn = ((X509Certificate) remoteCertificate).getSubjectDN().getName();
+                        subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate())
+                                .getSubjectDN().getName();
                     } catch (Exception e) {
                         // do nothing
                     }
@@ -212,10 +201,11 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                             extIntegrationInterface.apDisconnected(key);
                             ovsdbSessionMapInterface.removeSession(key);
                         } catch (Exception e) {
-                            LOG.debug("Unable to process ap disconnect. {}", e);
+                            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 {
@@ -238,7 +228,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     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
@@ -246,78 +237,22 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
         LOG.debug("Client {} connect for AP {}", clientCn, apId);
 
-        OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
-
-        //get last known configVersion from the AP
-        long configVersionFromAp = checkBeforePushConfigVersionFromAp ? connectNodeInfo.getConfigVersion() : 0;
-        
-        //get last known configVersion from the EquipmentProtocolStatusData        
-        long configVersionFromStatus = checkBeforePushConfigVersionFromStatus ? extIntegrationInterface.getConfigVersionFromStatus(apId) : 0;
-        
-        //get current configVersion from the profiles and equipment
-        long configVersionFromProfiles = opensyncAPConfig.getConfigVersion();
-        
-        boolean needToPushConfigToAP = needToPushToAp(configVersionFromAp, configVersionFromStatus, configVersionFromProfiles);
-        
-        if(needToPushConfigToAP) {
-            pushConfigToAp(ovsdbClient, opensyncAPConfig, apId, configVersionFromProfiles);
-        }
-        
-        LOG.debug("Client connect Done");
-    }
-
-    private boolean needToPushToAp(long configVersionFromAp, long configVersionFromStatus, long configVersionFromProfiles) {
-
-        boolean ret = false;
-
-        if(configVersionFromAp == 0) {
-            LOG.debug("do not know what is on AP, let's push new config");
-            ret = true;
-        }
-        
-        if(checkBeforePushConfigVersionFromAp && configVersionFromAp < configVersionFromProfiles ) {
-            LOG.debug("our profiles are more recent than what was pushed  to AP previously, let's push new config");
-            ret = true;
-        }
-
-        if(checkBeforePushConfigVersionFromStatus && configVersionFromStatus < configVersionFromProfiles) {
-           LOG.debug("our profiles are more recent than the version stored in the protocol status, let's push new config");
-           ret = true;
-       }
-        
-       if(!checkBeforePushConfigVersionFromAp && !checkBeforePushConfigVersionFromStatus) {
-           LOG.debug("we do not do any checks for config versions - let's push new config");
-           ret = true;
-       }
-       
-       if(!ret) {
-           LOG.debug("no need to push new config to AP");
-       }
-       
-       return ret;
-
-    }
-    
-    private void pushConfigToAp(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig, String apInventoryId, long configVersionFromProfiles) {
-
         ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
         ovsdbDao.removeAllSsids(ovsdbClient); // always
         ovsdbDao.removeAllInetConfigs(ovsdbClient);
-        if(opensyncAPConfig!=null) {
-            ovsdbDao.resetWiredPorts(ovsdbClient, opensyncAPConfig); // need to run this first before remove Status
-        }
         ovsdbDao.removeWifiRrm(ovsdbClient);
         ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
         ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
 
-        extIntegrationInterface.clearEquipmentStatus(apInventoryId);
+        extIntegrationInterface.clearEquipmentStatus(apId);
+
+        OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
 
         if (opensyncAPConfig != null) {
             ovsdbDao.configureNode(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
             ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
-            ovsdbDao.configureWiredPort(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureRadsecRadiusAndRealm(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
             if (opensyncAPConfig.getHotspotConfig() != null) {
@@ -331,19 +266,13 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
                 ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
             }
-            ovsdbDao.enableNetworkProbeForSyntheticClient(ovsdbClient);
             ovsdbDao.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
 
         } else {
-            LOG.info("No Configuration available for {}", apInventoryId);
+            LOG.info("No Configuration available for {}", apId);
         }
 
-        //after a successful config push let's update the configVersion on the AP and in the EquipmentProtocolStatusData
-        if(checkBeforePushConfigVersionFromStatus) {
-            extIntegrationInterface.updateConfigVersionInStatus(apInventoryId, configVersionFromProfiles);
-        }
-        ovsdbDao.updateConfigVersionInNode(ovsdbClient, configVersionFromProfiles);
-
+        LOG.debug("Client connect Done");
     }
 
     @Override
@@ -366,15 +295,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);
@@ -392,22 +312,28 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             return;
         }
 
-        //get last known configVersion from the AP
-        long configVersionFromAp = checkBeforePushConfigVersionFromAp ? ovsdbDao.getConfigVersionFromNode(ovsdbClient) : 0;
+        ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
+        ovsdbDao.removeAllSsids(ovsdbClient); // always
+        ovsdbDao.removeAllInetConfigs(ovsdbClient);
+        ovsdbDao.removeWifiRrm(ovsdbClient);
+        ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
 
-        //get last known configVersion from the EquipmentProtocolStatusData        
-        long configVersionFromStatus = checkBeforePushConfigVersionFromStatus ? extIntegrationInterface.getConfigVersionFromStatus(apId) : 0;
+        extIntegrationInterface.clearEquipmentStatus(apId);
         
-        //get current configVersion from the profiles and equipment
-        long configVersionFromProfiles = opensyncAPConfig.getConfigVersion();
-        
-        boolean needToPushConfigToAP = needToPushToAp(configVersionFromAp, configVersionFromStatus, configVersionFromProfiles);
-
-        if(needToPushConfigToAP) {
-            pushConfigToAp(ovsdbClient, opensyncAPConfig, apId, configVersionFromProfiles);
+        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);
         }
 
+        ovsdbDao.configureInterfaces(ovsdbClient);
+        ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
         LOG.debug("Finished processConfigChanged for {}", apId);
+
     }
 
     @Override
@@ -493,18 +419,21 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                 monitorAPCStateTable(ovsdbClient, key);
             }
         } catch (InterruptedException | ExecutionException | OvsdbClientException e) {
-            LOG.debug("Could not enable monitor for APC_State table. {}", 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,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.dhcpLeasedIpDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
+        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+                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<>();
@@ -516,7 +445,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                 if (rowUpdate.getNew() == null) {
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
+                                    rowUpdate.getOld().getColumns().entrySet()
+                                            .forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     delete.add(rowMap);
                                     // delete
@@ -524,7 +454,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     // insert
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getNew().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
+                                    rowUpdate.getNew().getColumns().entrySet()
+                                            .forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     insert.add(rowMap);
                                 } else {
@@ -533,7 +464,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     Map<String, String> rowMap = new HashMap<>();
 
                                     rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
-                                    rowUpdate.getOld().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
+                                    rowUpdate.getOld().getColumns().entrySet()
+                                            .forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     update.add(rowMap);
 
@@ -566,10 +498,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,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.commandStateDbTable, new MonitorRequest())), tableUpdates -> {
+        CompletableFuture<TableUpdates> csCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+                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<>();
@@ -581,7 +516,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                 if (rowUpdate.getNew() == null) {
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns().forEach((key1, value) -> rowMap.put(key1, value.toString()));
+                                    rowUpdate.getOld().getColumns()
+                                            .forEach((key1, value) -> rowMap.put(key1, value.toString()));
 
                                     delete.add(rowMap);
                                     // delete
@@ -589,7 +525,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     // insert
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getNew().getColumns().forEach((key1, value) -> rowMap.put(key1, value.toString()));
+                                    rowUpdate.getNew().getColumns()
+                                            .forEach((key1, value) -> rowMap.put(key1, value.toString()));
 
                                     insert.add(rowMap);
                                 } else {
@@ -598,7 +535,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     Map<String, String> rowMap = new HashMap<>();
 
                                     rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
-                                    rowUpdate.getOld().getColumns().forEach((key1, value) -> rowMap.put(key1, value.toString()));
+                                    rowUpdate.getOld().getColumns()
+                                            .forEach((key1, value) -> rowMap.put(key1, value.toString()));
 
                                     update.add(rowMap);
 
@@ -630,27 +568,33 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     }
 
     private void monitorAwlanNodeDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.awlanNodeDbTable + "_" + key,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.awlanNodeDbTable, new MonitorRequest(new MonitorSelect(true, false, false, true)))),
+        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+                OvsdbDao.awlanNodeDbTable + "_" + key, new MonitorRequests(ImmutableMap.of(OvsdbDao.awlanNodeDbTable,
+                        new MonitorRequest(new MonitorSelect(true, false, false, true)))),
                 tableUpdates -> {
                     try {
                         LOG.info(OvsdbDao.awlanNodeDbTable + "_" + key + " monitor callback received {}", tableUpdates);
 
-                        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,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiAssociatedClientsDbTable, new MonitorRequest())), tableUpdates -> {
+        CompletableFuture<TableUpdates> acCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+                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<>();
 
@@ -667,7 +611,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     // adding anyway.
                                     extIntegrationInterface.wifiAssociatedClientsDbTableDelete(deletedClientMac, key);
                                 } else {
-                                    associatedClients.addAll(ovsdbDao.getOpensyncWifiAssociatedClients(rowUpdate, key, ovsdbClient));
+                                    associatedClients.addAll(
+                                            ovsdbDao.getOpensyncWifiAssociatedClients(rowUpdate, key, ovsdbClient));
                                 }
                             }
 
@@ -681,16 +626,20 @@ 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,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiInetStateDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
+        CompletableFuture<TableUpdates> isCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+                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);
+                        LOG.info(OvsdbDao.wifiInetStateDbTable + "_" + key + " monitor callback received {}",
+                                tableUpdates);
 
                         List<OpensyncAPInetState> inetStateInsertOrUpdate = new ArrayList<>();
                         List<OpensyncAPInetState> inetStateDelete = new ArrayList<>();
@@ -700,16 +649,18 @@ 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));
                                 }
 
                             }
                         }
 
                         // delete first
-                        extIntegrationInterface.wifiInetStateDbTableDelete(inetStateDelete, key);
+                        extIntegrationInterface.wifiInetStateDbTableUpdate(inetStateDelete, key);
 
                         // now process updates and mutations
                         extIntegrationInterface.wifiInetStateDbTableUpdate(inetStateInsertOrUpdate, key);
@@ -719,33 +670,42 @@ 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,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiRadioStateDbTable, new MonitorRequest(new MonitorSelect(true, false, false, true)))),
+        CompletableFuture<TableUpdates> rsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+                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,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
+        CompletableFuture<TableUpdates> vsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+                OvsdbDao.wifiVifStateDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable,
+                        new MonitorRequest(new MonitorSelect(false, true, true, true)))),
                 tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
+                        LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}",
+                                tableUpdates);
 
                         List<OpensyncAPVIFState> vifsToDelete = new ArrayList<>();
                         List<OpensyncAPVIFState> vifsToInsertOrUpdate = new ArrayList<>();
@@ -755,12 +715,14 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                                 if (rowUpdate.getNew() == null) {
                                     // this is a deletion
-                                    vifsToDelete.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                    vifsToDelete.addAll(
+                                            ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
 
                                 } else {
                                     // either an insert or
                                     // mutuate/update
-                                    vifsToInsertOrUpdate.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                    vifsToInsertOrUpdate.addAll(
+                                            ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
 
                                 }
 
@@ -780,60 +742,37 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     }
 
                 });
-
-        try {
-            List<OpensyncAPVIFState> vifsToInsert = new ArrayList<>();
-            TableUpdates initialTableUpdates = vsCf.join();
-            for (TableUpdate tableUpdate : initialTableUpdates.getTableUpdates().values()) {
-                for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
-                    vifsToInsert.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
-                }
-            }
-            extIntegrationInterface.wifiVIFStateDbTableUpdate(vifsToInsert, key);
-        } catch (Exception e) {
-            LOG.error("initial wifiVIFStateDbTableUpdate failed", e);
-        }
+        vsCf.join();
 
     }
 
     private void monitorNodeStateTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.nodeStateTable + "_" + key,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.nodeStateTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))), tableUpdates -> {
+        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(
+                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);
+                    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());
+                            }
+                        });
 
+                    });
                 });
-        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;
+        nsCf.join();
     }
 
     private void monitorAPCStateTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.apcStateDbTable + "_" + key,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.apcStateDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))), tableUpdates -> {
+        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(
+                OvsdbDao.ovsdbName, OvsdbDao.apcStateDbTable + "_" + key, new MonitorRequests(ImmutableMap
+                        .of(OvsdbDao.apcStateDbTable, new MonitorRequest(new MonitorSelect(true, false, false, true)))),
+                tableUpdates -> {
                     LOG.info(OvsdbDao.apcStateDbTable + "_" + key + " monitor callback received {}");
                     tableUpdates.getTableUpdates().forEach((key1, value) -> {
                         LOG.info("TableUpdate for {}", key1);
@@ -841,19 +780,14 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                             Map<String, String> apcStateAttributes = ovsdbDao.getAPCState(r, key);
 
-                            extIntegrationInterface.apcStateDbTableUpdate(apcStateAttributes, key, RowUpdateOperation.MODIFY);
+                            extIntegrationInterface.apcStateDbTableUpdate(apcStateAttributes, key,
+                                    RowUpdateOperation.MODIFY);
 
                         });
 
                     });
                 });
-        try {
-            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);
-        }
+        nsCf.join();
     }
 
     @Override
@@ -903,7 +837,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);
@@ -911,14 +846,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,
-                    e);
-            return "Failed to start debug engine on AP " + apId + " with gateway " + gatewayHostname + " port " + gatewayPort;
+            LOG.error(
+                    "TipWlanOvsdbClient::startDebugEngine Failed to start debug engine on AP {} with gateway {} port {}",
+                    apId, gatewayHostname, gatewayPort, e);
+            return "Failed to start debug engine on AP " + apId + " with gateway " + gatewayHostname + " port "
+                    + gatewayPort;
         }
     }
 
@@ -963,7 +901,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);
@@ -1009,17 +948,21 @@ 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;
         }
     }
@@ -1031,10 +974,13 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             OvsdbSession session = ovsdbSessionMapInterface.getSession(apId);
             OvsdbClient ovsdbClient = session.getOvsdbClient();
             ovsdbDao.processCellSizeAttributesRequest(ovsdbClient, cellSizeAttributeMap);
-            LOG.info("TipWlanOvsdbClient::processCellSizeAttributesRequest change cellSizeAttributes for AP {}", apId);
+            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);
+            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/TipWlanOvsdbRedirector.java

@@ -1,6 +1,5 @@
 package com.telecominfraproject.wlan.opensync.ovsdb;
 
-import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 
 import javax.annotation.PostConstruct;
@@ -15,13 +14,13 @@ import com.netflix.servo.DefaultMonitorRegistry;
 import com.netflix.servo.monitor.BasicCounter;
 import com.netflix.servo.monitor.Counter;
 import com.netflix.servo.monitor.MonitorConfig;
+import com.netflix.servo.monitor.Monitors;
 import com.netflix.servo.tag.TagList;
 import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbDao;
 import com.telecominfraproject.wlan.opensync.util.SslUtil;
 import com.vmware.ovsdb.callback.ConnectionCallback;
 import com.vmware.ovsdb.service.OvsdbClient;
-import com.vmware.ovsdb.service.OvsdbConnectionInfo;
 import com.vmware.ovsdb.service.OvsdbPassiveConnectionListener;
 
 import io.netty.handler.ssl.SslContext;
@@ -78,19 +77,11 @@ public class TipWlanOvsdbRedirector {
         ConnectionCallback connectionCallback = new ConnectionCallback() {
             public void connected(OvsdbClient ovsdbClient) {
                 connectionsAttempted.increment();
-                
+                String remoteHost = ovsdbClient.getConnectionInfo().getRemoteAddress().getHostAddress();
+                int localPort = ovsdbClient.getConnectionInfo().getLocalPort();
+                String subjectDn = null;
                 try {
-                    OvsdbConnectionInfo connectionInfo = ovsdbClient.getConnectionInfo();
-                    String remoteHost = connectionInfo.getRemoteAddress().getHostAddress();
-                    Certificate remoteCertificate = connectionInfo.getRemoteCertificate();
-                    if (remoteCertificate == null) {
-                    	LOG.debug("Connect attempt no certificate from {} on remote port {}", remoteHost, connectionInfo.getRemotePort());
-                    	return;
-                    }
-                    
-                    int localPort = connectionInfo.getLocalPort();
-                    String subjectDn = null;
-					subjectDn = ((X509Certificate) remoteCertificate).getSubjectDN().getName();
+                    subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
                     
                     String clientCn = SslUtil.extractCN(subjectDn);
                     LOG.info("ovsdbClient redirector connected from {} on port {} clientCn {}", remoteHost, localPort, clientCn);                
@@ -110,9 +101,7 @@ public class TipWlanOvsdbRedirector {
                 int localPort = ovsdbClient.getConnectionInfo().getLocalPort();
                 String subjectDn = null;
                 try {
-                	Certificate remoteCertificate = ovsdbClient.getConnectionInfo().getRemoteCertificate();
-                	if (remoteCertificate != null)
-                		subjectDn = ((X509Certificate) remoteCertificate).getSubjectDN().getName();
+                    subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
                 } catch (Exception e) {
                     //do nothing
                 }

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

@@ -9,7 +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;
@@ -62,7 +61,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,17 +85,8 @@ public class OvsdbDao extends OvsdbDaoBase {
         ovsdbNetwork.configureInterfaces(ovsdbClient);
     }
     
-    public void configureWiredPort(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-    	ovsdbNetwork.configureEthernetPorts(ovsdbClient, opensyncAPConfig);
-    }
-    
     public void configureNode(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-        configureNtpServer(ovsdbClient, opensyncAPConfig);
-        configureSyslog(ovsdbClient, opensyncAPConfig);
-        processBlinkRequest(ovsdbClient, opensyncAPConfig.getCustomerEquipment().getInventoryId(),
-                ((ApElementConfiguration) opensyncAPConfig.getCustomerEquipment().getDetails()).isBlinkAllLEDs());
-        ovsdbNodeConfig.processLedControlEnabled(ovsdbClient, opensyncAPConfig);
-        processApcConfig(ovsdbClient, opensyncAPConfig);
+        configureNtpServer(ovsdbClient,opensyncAPConfig);configureSyslog(ovsdbClient, opensyncAPConfig);
     }
     
     void configureNtpServer(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
@@ -212,10 +202,6 @@ public class OvsdbDao extends OvsdbDaoBase {
         ovsdbNetwork.removeAllInetConfigs(ovsdbClient);
     }
 
-    public void resetWiredPorts(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
-    	ovsdbNetwork.resetWiredPorts(ovsdbClient, opensyncApConfig);
-    }
-
     public void removeAllPasspointConfigs(OvsdbClient ovsdbClient) {
         ovsdbHotspot.removeAllPasspointConfigs(ovsdbClient);
     }
@@ -251,20 +237,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);
-    }
-    
-    public void processApcConfig(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-        ovsdbNodeConfig.configureDynamicRadiusProxyToAPC(ovsdbClient, opensyncAPConfig);
-    }
-
-    public long getConfigVersionFromNode(OvsdbClient ovsdbClient) {
-        return ovsdbNode.getConfigVersionFromNode(ovsdbClient);
-    }
-
-    public void updateConfigVersionInNode(OvsdbClient ovsdbClient, long configVersionFromProfiles) {
-        ovsdbNode.updateConfigVersionInNode(ovsdbClient, configVersionFromProfiles);
-    }
-
 }

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

@@ -265,7 +265,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 +273,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 +292,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

@@ -40,26 +40,11 @@ public class OvsdbGet extends OvsdbDaoBase {
     Map<String, Set<Integer>> getAllowedChannels(OvsdbClient ovsdbClient) {
         Map<String, Set<Integer>> allowedChannels = new HashMap<>();
         for (Row row : getOvsdbTableRowsForCondition(ovsdbClient, wifiRadioStateDbTable, null)) {
-            Set<Integer> channels = new HashSet<>();
-            if (row.getMapColumn("channels").containsKey("allowed")) {
-                for (String c : row.getMapColumn("channels").get("allowed").toString().split(",")) {
-                    if (c != null)
-                        channels.add(Integer.valueOf(c));
-                } ;
-            }
-            if (row.getMapColumn("channels").containsKey("radar_detection")) {
-                for (String c : row.getMapColumn("channels").get("radar_detection").toString().split(",")) {
-                    if (c != null)
-                        channels.add(Integer.valueOf(c));
-                } ;
-            }
-
-            allowedChannels.put(getSingleValueFromSet(row, "freq_band"), channels);
+            allowedChannels.put(getSingleValueFromSet(row, "freq_band"), row.getSetColumn("allowed_channels"));
         }
         return allowedChannels;
     }
 
-
     /**
      * Get all Rows from given table that satisfy the conditions.
      * 

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

@@ -93,8 +93,6 @@ public class OvsdbMonitor extends OvsdbDaoBase {
             if (rowUpdate.getOld() != null) {
                 row = rowUpdate.getOld();
                 row.getColumns().putAll(rowUpdate.getNew().getColumns());
-            } else {
-            	row = rowUpdate.getNew();
             }
         } else {
             row = rowUpdate.getOld();

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

@@ -21,17 +21,10 @@ import org.springframework.stereotype.Component;
 import com.telecominfraproject.wlan.equipment.models.NetworkForwardMode;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiInetConfigInfo;
-import com.telecominfraproject.wlan.profile.ethernetport.models.WiredEthernetPortConfiguration;
-import com.telecominfraproject.wlan.profile.ethernetport.models.WiredPort;
 import com.telecominfraproject.wlan.profile.models.Profile;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
 import com.telecominfraproject.wlan.profile.network.models.GreTunnelConfiguration;
 import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
-import com.telecominfraproject.wlan.status.StatusServiceInterface;
-import com.telecominfraproject.wlan.status.equipment.report.models.WiredEthernetPortStatusData;
-import com.telecominfraproject.wlan.status.equipment.report.models.WiredPortStatus;
-import com.telecominfraproject.wlan.status.models.Status;
-import com.telecominfraproject.wlan.status.models.StatusDataType;
 import com.vmware.ovsdb.exception.OvsdbClientException;
 import com.vmware.ovsdb.protocol.operation.Delete;
 import com.vmware.ovsdb.protocol.operation.Insert;
@@ -52,18 +45,7 @@ import com.vmware.ovsdb.service.OvsdbClient;
 public class OvsdbNetworkConfig extends OvsdbDaoBase {
 
     @Autowired
-    private OvsdbGet ovsdbGet;
-    @Autowired
-    private StatusServiceInterface statusServiceInterface;
-
-    private static final String VLAN_IF_TYPE = "vlan";
-    private static final String VLAN_TRUNK_IF_TYPE = "vlan_trunk";
-    private static final String BRIDGE_IF_TYPE = "bridge";
-    private static final String LAN_IF_NAME = "lan";
-    private static final String WAN_IF_NAME = "wan";
-    private static final int DEFAULT_MAX_INTERNAL_VLAN_ID = 2;
-    private static final String SEPARATOR = " ";
-
+    OvsdbGet ovsdbGet;
 
     void configureGreTunnel(OvsdbClient ovsdbClient, Profile apNetworkConfiguration) {
         try {
@@ -110,7 +92,7 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
                     LOG.info("configureGreTunnel {}", ((UpdateResult) res).toString());
                 } else if (res instanceof ErrorResult) {
                     LOG.error("configureGreTunnel error {}", (res));
-                    throw new RuntimeException("configureGreTunnel " + ((ErrorResult) res).getError() + SEPARATOR
+                    throw new RuntimeException("configureGreTunnel " + ((ErrorResult) res).getError() + " "
                             + ((ErrorResult) res).getDetails());
                 }
             }
@@ -155,242 +137,10 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
             } else {
                 operations.add(new Insert(wifiInetConfigDbTable, row));
             }
-            
     }
 
-	void configureEthernetPorts(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
-		Profile wiredEthernetPortProfile = opensyncApConfig.getWiredEthernetPortProfile();
-
-		if (wiredEthernetPortProfile != null) {
-            LOG.debug("Entering configure Ethernet Ports for wiredEthernetPortProfile {} for equipment {}",
-                    wiredEthernetPortProfile, opensyncApConfig.getCustomerEquipment().getId());
-			// Getting the config from the UI
-			WiredEthernetPortConfiguration ethernetPortConfig = (WiredEthernetPortConfiguration) wiredEthernetPortProfile
-					.getDetails();
-			LOG.debug("Configure EthernetPorts {}", ethernetPortConfig);
-			Set<WiredPort> desiredWiredPorts = ethernetPortConfig.getEthPorts();
-
-			handleEthernetPortConfiguration(ovsdbClient, desiredWiredPorts);
-
-		} else {
-		    LOG.info("opensyncApConfig for Customer {}, Equipment {} has no wiredEthernetPortProfile attached" ,
-                    opensyncApConfig.getCustomerEquipment().getCustomerId(), opensyncApConfig.getCustomerEquipment().getId());
-        }
-	}
-
-	private void handleEthernetPortConfiguration(OvsdbClient ovsdbClient, Set<WiredPort> desiredWiredPorts) {
-        // lists are for more than one lan port moving to wan ("eth0 eth1 eth2")
-        Set<String> availableLanEthNames = new HashSet<>();
-        Set<String> availableWanEthNames = new HashSet<>();
-        if (desiredWiredPorts == null) {
-            LOG.info("Cannot handle the EthernetPort config for null desired Wired Ports. Exiting");
-            return;
-        }
-        LOG.debug("In handleEthernetPortConfiguration with desiredWiredPorts {}", desiredWiredPorts);
-        WiredPort wanPort = getDefaultWanPort(desiredWiredPorts);
-        if (wanPort == null) {
-            LOG.error("Cannot find the default wan port from the desired list of ports {}" , desiredWiredPorts);
-            return;
-        }
-        for (WiredPort port: desiredWiredPorts) {
-        	if (port.getIfName().contains(LAN_IF_NAME)) { // for AP has ifName lan1, lan2 instead of lan
-        		availableLanEthNames.add(port.getName());
-        	} else if (WAN_IF_NAME.equals(port.getIfName())) {
-        		availableWanEthNames.add(port.getName());
-        	}
-        }
-        for (WiredPort desiredPort : desiredWiredPorts) {
-            if (!desiredPort.equals(wanPort)) {
-                if (isLanToBridgeConversion(desiredPort) && !desiredPort.isTrunkEnabled()) {
-                    // Flow 1: Desired Bridge + Access
-                    LOG.debug("Desired Config is Bridge with Access Mode");
-                    availableLanEthNames.remove(desiredPort.getName());
-                    availableWanEthNames.add(desiredPort.getName());
-                    changeLanToWan(ovsdbClient, availableLanEthNames, availableWanEthNames, wanPort.getName());
-                    createVlanTag(ovsdbClient, desiredPort);
-                } else if (isLanToBridgeConversion(desiredPort) && desiredPort.isTrunkEnabled()) {
-                    // Flow 2: Desired Bridge + Trunk
-                    LOG.debug("Desired Config is Bridge with Trunk Mode");
-                    availableLanEthNames.remove(desiredPort.getName());
-                    availableWanEthNames.add(desiredPort.getName());
-                    changeLanToWan(ovsdbClient, availableLanEthNames, availableWanEthNames, wanPort.getName());
-                    createTrunkInterface(ovsdbClient, desiredPort);
-                } else if (!BRIDGE_IF_TYPE.equalsIgnoreCase(desiredPort.getIfType())) {
-                    // Flow 3: Desired ifType is NAT
-                    LOG.debug("Desired Config is NAT (LAN) mode. Desired Port {} may still be tagged to WAN interface. Convert to LAN mode", desiredPort.getIfName());
-                    availableLanEthNames.add(desiredPort.getName());
-                    availableWanEthNames.remove(desiredPort.getName());
-                    changeWanToLan(ovsdbClient, availableLanEthNames, availableWanEthNames, wanPort.getName());
-                } else {
-                    LOG.info("Not a supported Config change requested for the port {}", desiredPort);
-                }
-            } else {
-                LOG.error("It's the default WAN port. No changes needed!");
-            }
-        } // end of for loop
-    }
-
-    private String generateInterfaceId(String portName, int vlanId, boolean trunk) {
-        if (!trunk) {
-            return String.format("%s_%s", portName, vlanId);
-        } else {
-            return String.format("%s_trunk", portName);
-        }
-    }
-
-    private boolean isLanToBridgeConversion(WiredPort desiredPort) {
-        return LAN_IF_NAME.equalsIgnoreCase(desiredPort.getIfName()) &&
-                BRIDGE_IF_TYPE.equals(desiredPort.getIfType());
-    }
-
-	WiredPort getDefaultWanPort(Set<WiredPort> desiredPorts) {
-		WiredPort wanWiredPort = desiredPorts.stream()
-				.filter(entry -> WAN_IF_NAME.equals(entry.getIfName())).findFirst().orElse(null);
-
-		LOG.debug("Returning wanWiredPort {}", wanWiredPort);
-		return wanWiredPort;
-	}
-
-	void changeLanToWan(OvsdbClient ovsdbClient, Set<String> lanPortsToUpdate, Set<String> wanPortsToUpdate, String wanEthName) {
-		LOG.debug("Calling changeLanToWan: moving port {} to LAN and {} to WAN", lanPortsToUpdate, wanPortsToUpdate);
-		List<Operation> operations = new ArrayList<>();
-		// Step1: remove lan from eth_ports
-		// /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:=" " -w if_name==lan
-		// or cases like: /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:="eth2" -w if_name==lan
-		String lanPortsString = String.join(SEPARATOR,  lanPortsToUpdate);
-		addEthPortsOperation(operations, lanPortsString.equals("")? SEPARATOR : lanPortsString, LAN_IF_NAME);
-		
-		// Step2: make lan to a wan port
-		// /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:="eth0 eth1" -w if_name==wan
-		// eth_ports syntax is set by AP (i.e, eth0 eth1)
-        // AP needs the original wan port be the first port in the string. Since we will hard code it, we remove
-        // original wan name from the set to avoid duplication
-        wanPortsToUpdate.remove(wanEthName);
-		// trim() is used when wanPortsToUpdate is empty (i.e. we want "eth0" instead of "eth0 ")
-		addEthPortsOperation(operations, (wanEthName + SEPARATOR + String.join(SEPARATOR,  wanPortsToUpdate)).trim(), WAN_IF_NAME);
-		sendOperationsToAP(ovsdbClient, operations, "changeLanToWan");
-	}
-
-	private void createVlanTag(OvsdbClient ovsdbClient, WiredPort desiredWiredPort) {
-        LOG.debug("Creating a new VlanInterface for wiredPort {}", desiredWiredPort);
-        if (desiredWiredPort.getVlanId() > DEFAULT_MAX_INTERNAL_VLAN_ID) {
-            // Tag to vlan
-            // /usr/opensync/bin/ovsh i Wifi_Inet_Config NAT:=true enabled:=true
-            // if_name:=eth0_100 if_type:=vlan ip_assign_scheme:=none network:=true
-            // parent_ifname:=eth0 vlan_id:=100 dhcp_sniff:=false eth_ports:="eth0"
-            List<Operation> operations = new ArrayList<>();
-            Map<String, Value> tableColumns = new HashMap<>();
-            tableColumns.put("NAT", new Atom<>(true));
-            tableColumns.put("enabled", new Atom<>(true));
-            tableColumns.put("if_name", new Atom<>(generateInterfaceId(desiredWiredPort.getName(), desiredWiredPort.getVlanId(), false)));
-            tableColumns.put("if_type", new Atom<>(VLAN_IF_TYPE));
-            tableColumns.put("ip_assign_scheme", new Atom<>("none"));
-            tableColumns.put("network", new Atom<>(true));
-            tableColumns.put("parent_ifname", new Atom<>(desiredWiredPort.getName()));
-            tableColumns.put("vlan_id", new Atom<>(desiredWiredPort.getVlanId()));
-            tableColumns.put("dhcp_sniff", new Atom<>(false));
-            tableColumns.put("eth_ports", new Atom<>(desiredWiredPort.getName()));
-            Row row = new Row(tableColumns);
-            operations.add(new Insert(wifiInetConfigDbTable, row));
-
-            sendOperationsToAP(ovsdbClient, operations, "createVlanTag");
-        } else {
-            LOG.info("Desired vlanId {} is lower than default {}; no tagging needed",
-                    desiredWiredPort.getVlanId(), DEFAULT_MAX_INTERNAL_VLAN_ID);
-        }
-    }
-
-    private void createTrunkInterface(OvsdbClient ovsdbClient, WiredPort desiredWiredPort) {
-        LOG.debug("Creating a new TrunkInterface for wiredPort {}", desiredWiredPort);
-
-        // Create Trunk Interface
-        // /usr/opensync/bin/ovsh i Wifi_Inet_Config NAT:=true enabled:=true
-        // if_name:=eth0_trunk if_type:=vlan_trunk ip_assign_scheme:=none network:=true
-        // parent_ifname:=eth0 dhcp_sniff:=false eth_ports:="eth0"
-        // vlan_trunk:='["map",[["allowed_vlans","100 200 300"],["pvid","10"]]]'
-
-        List<Operation> operations = new ArrayList<>();
-        Map<String, Value> tableColumns = new HashMap<>();
-        tableColumns.put("NAT", new Atom<>(true));
-        tableColumns.put("enabled", new Atom<>(true));
-        tableColumns.put("if_name", new Atom<>(generateInterfaceId(desiredWiredPort.getName(), desiredWiredPort.getVlanId(), true)));
-        tableColumns.put("if_type", new Atom<>(VLAN_TRUNK_IF_TYPE));
-        tableColumns.put("ip_assign_scheme", new Atom<>("none"));
-        tableColumns.put("network", new Atom<>(true));
-        tableColumns.put("parent_ifname", new Atom<>(desiredWiredPort.getName()));
-        tableColumns.put("dhcp_sniff", new Atom<>(false));
-        tableColumns.put("eth_ports", new Atom<>(desiredWiredPort.getName()));
-
-        Map<String, String> vlanTrunkMap = new HashMap<>();
-
-        if (desiredWiredPort.getAllowedVlanIds() != null) {
-            vlanTrunkMap.put("allowed_vlans", getAllowedVlanAsString(desiredWiredPort));
-            if (desiredWiredPort.getVlanId() > DEFAULT_MAX_INTERNAL_VLAN_ID) {
-                vlanTrunkMap.put("pvid", String.valueOf(desiredWiredPort.getVlanId()));
-            }
-        }
-
-        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> vlanTrunkVal = com.vmware.ovsdb.protocol.operation.notation.Map.of(vlanTrunkMap);
-
-        tableColumns.put(VLAN_TRUNK_IF_TYPE, vlanTrunkVal);
-        Row row = new Row(tableColumns);
-        operations.add(new Insert(wifiInetConfigDbTable, row));
-
-        sendOperationsToAP(ovsdbClient, operations, "createTrunkInterface");
-
-    }
-
-    private String getAllowedVlanAsString(WiredPort desiredWiredPort) {
-        return desiredWiredPort.getAllowedVlanIds().stream().map(String::valueOf).collect(Collectors.joining(SEPARATOR));
-    }
-
-	void changeWanToLan(OvsdbClient ovsdbClient, Set<String> lanPortsToUpdate, Set<String> wanPortsToUpdate, String wanEthName) {
-		LOG.debug("Calling changeWanToLan: Moving port {} to LAN and {} to WAN", lanPortsToUpdate, wanPortsToUpdate);
-		// Step1: set the correct port to lan
-		// /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:="eth0" -w if_name==lan
-		List<Operation> operations = new ArrayList<>();
-		addEthPortsOperation(operations, String.join(SEPARATOR,  lanPortsToUpdate), LAN_IF_NAME);
-
-		// Step2: set the correct port to wan
-		// /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:="eth1" -w if_name==wan
-        // AP needs the original wan port be the first port in the string. Since we will hard code it, we remove
-        // original wan name from the set to avoid duplication
-		wanPortsToUpdate.remove(wanEthName);
-		addEthPortsOperation(operations, (wanEthName + SEPARATOR + String.join(SEPARATOR,  wanPortsToUpdate)).trim(), WAN_IF_NAME);
-
-		sendOperationsToAP(ovsdbClient, operations, "changeWanToLan");
-	}
-	
-	void addEthPortsOperation(List<Operation> operations, String ethPorts, String ifName) {
-		Map<String, Value> tableColumn = new HashMap<>();
-		tableColumn.put("eth_ports", new Atom<>(ethPorts));
-		Row row = new Row(tableColumn);
-		operations.add(new Update(wifiInetConfigDbTable,
-				List.of(new Condition("if_name", Function.EQUALS, new Atom<>(ifName))), row));
-	}
-
-	void sendOperationsToAP(OvsdbClient ovsdbClient, List<Operation> operations, String methodName) {
-		try {
-			CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-			OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-			for (OperationResult res : result) {
-				if (res instanceof InsertResult) {
-					LOG.info("{} - {}", methodName, res);
-				} else if (res instanceof UpdateResult) {
-					LOG.info("{} {}", methodName, res);
-				} else if (res instanceof ErrorResult) {
-					LOG.error("{} {}", methodName, res);
-					throw new RuntimeException("createVlanNetworkInterfaces - " + ((ErrorResult) res).getError() + SEPARATOR
-							+ ((ErrorResult) res).getDetails());
-				}
-			}
-		} catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
     /**
-     * @param ovsdbClient
+     *  @param ovsdbClient
      * @param vifInterfaceName
      * @param enabled
      * @param networkForwardMode
@@ -443,7 +193,7 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
                     LOG.info("createVlanNetworkInterfaces {}", ((UpdateResult) res).toString());
                 } else if (res instanceof ErrorResult) {
                     LOG.error("createVlanNetworkInterfaces error {}", (res));
-                    throw new RuntimeException("createVlanNetworkInterfaces " + ((ErrorResult) res).getError() + SEPARATOR
+                    throw new RuntimeException("createVlanNetworkInterfaces " + ((ErrorResult) res).getError() + " "
                             + ((ErrorResult) res).getDetails());
                 }
             }
@@ -462,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(
@@ -475,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);
@@ -495,13 +272,14 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
                     LOG.info("createVlanNetworkInterfaces {}", ((UpdateResult) res).toString());
                 } else if (res instanceof ErrorResult) {
                     LOG.error("createVlanNetworkInterfaces error {}", (res));
-                    throw new RuntimeException("createVlanNetworkInterfaces " + ((ErrorResult) res).getError() + SEPARATOR
+                    throw new RuntimeException("createVlanNetworkInterfaces " + ((ErrorResult) res).getError() + " "
                             + ((ErrorResult) res).getDetails());
                 }
             }
             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);
@@ -538,34 +316,33 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
             Collection<WifiInetConfigInfo> provisionedWifiInetConfigs = ovsdbGet
                     .getProvisionedWifiInetConfigs(ovsdbClient).values();
             List<Operation> operations = new ArrayList<>();
+            List<Condition> conditions = new ArrayList<>();
             for (WifiInetConfigInfo wifiInetConfigInfo : provisionedWifiInetConfigs) {
-                if (wifiInetConfigInfo.vlanId > 1
-                        || wifiInetConfigInfo.ifType.equals("vif")
-                        || wifiInetConfigInfo.ifName.startsWith("gre") || wifiInetConfigInfo.ifType.equals("gre")
-                        || VLAN_IF_TYPE.equalsIgnoreCase(wifiInetConfigInfo.ifType) // Remove any existing vlan/vlan_trunk tagging
-                        || VLAN_TRUNK_IF_TYPE.equalsIgnoreCase(wifiInetConfigInfo.ifType) ) {
-                    List<Condition> conditions = new ArrayList<>();
+                if (wifiInetConfigInfo.vlanId > 1 || wifiInetConfigInfo.ifType.equals("vif")
+                        || wifiInetConfigInfo.ifName.startsWith("gre") || wifiInetConfigInfo.ifType.equals("gre")) {
+                    conditions = new ArrayList<>();
                     conditions.add(new Condition("if_name", Function.EQUALS, new Atom<>(wifiInetConfigInfo.ifName)));
                     operations.add(new Delete(wifiInetConfigDbTable, conditions));
                 }
             }
             CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
             OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-            LOG.info("Removed all existing vif, vlan, vlan_trunk and gre interface configs from {}:", wifiInetConfigDbTable);
+            LOG.info("Removed all existing vif, vlan, and gre interface configs from {}:", wifiInetConfigDbTable);
             for (OperationResult res : result) {
                 LOG.info("Op Result {}", res);
             }
             provisionedWifiInetConfigs = ovsdbGet.getProvisionedWifiInetConfigs(ovsdbClient).values();
             for (WifiInetConfigInfo inetConfigInfo : provisionedWifiInetConfigs) {
-                if (inetConfigInfo.ifType.equals("vif") || inetConfigInfo.ifType.equals("gre") ||
-                        VLAN_IF_TYPE.equals(inetConfigInfo.ifType) || VLAN_TRUNK_IF_TYPE.equals(inetConfigInfo.ifType)) {
+                if (inetConfigInfo.ifType.equals("vif") || inetConfigInfo.ifType.equals("gre")) {
                     throw new RuntimeException(
-                            "Failed to remove all vif, gre, vlan interface configurations from Wifi_Inet_Config dbTable, still has "
+                            "Failed to remove all vif and gre interface configurations from Wifi_Inet_Config dbTable, still has "
                                     + provisionedWifiInetConfigs.stream().filter(new Predicate<WifiInetConfigInfo>() {
                                         @Override
                                         public boolean test(WifiInetConfigInfo t) {
-                                            return (t.ifType.equals("vif")) || (t.ifType.equals("gre")) ||
-                                                  VLAN_IF_TYPE.equals(t.ifType) || VLAN_TRUNK_IF_TYPE.equals(t.ifType);
+                                            if ((t.ifType.equals("vif")) || (t.ifType.equals("gre"))) {
+                                                return true;
+                                            }
+                                            return false;
                                         }
                                     }).collect(Collectors.toList()));
 
@@ -576,56 +353,4 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
             throw new RuntimeException(e);
         }
     }
-    
-	// Reset all LAN ports from WAN back to LAN (NAT mode)
-	void resetWiredPorts(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
-		LOG.debug("Calling resetWiredPorts");
-		// e.g. eth1
-		Map<String, List<WiredPortStatus>> interfacePortStatusMap = getInterfacePortStatus(
-				opensyncApConfig.getCustomerEquipment().getCustomerId(),
-				opensyncApConfig.getCustomerEquipment().getId());
-		if (interfacePortStatusMap == null) {
-			LOG.info("No InterfacePort(EthernetPort) Status. Exiting");
-			return;
-		}
-		List<WiredPortStatus> wanPortStatusList = interfacePortStatusMap.get(WAN_IF_NAME);
-		if (wanPortStatusList == null) {
-			LOG.info("No wan interface status available. Exiting");
-			return;
-		}
-		WiredPortStatus originalWanPortStatus = wanPortStatusList.stream()
-				.filter(wan -> WAN_IF_NAME.equals(wan.getOriginalIfName())).findFirst().orElse(null);
-		if (originalWanPortStatus == null) {
-			LOG.info("No original wan port available. Exiting");
-			return;
-		}
-		String wanEthName = originalWanPortStatus.getName();
-		Set<String> lanEthNames = new HashSet<>();
-		for (WiredPortStatus wanPortStatus : wanPortStatusList) {
-			if (wanPortStatus.getOriginalIfName().contains(LAN_IF_NAME)) {
-				lanEthNames.add(wanPortStatus.getName());
-			}
-		}
-		if (!lanEthNames.isEmpty()) {
-            Set<String> wanEthNameSet = new HashSet<String>();
-            wanEthNameSet.add(wanEthName);
-            changeWanToLan(ovsdbClient, lanEthNames, wanEthNameSet, wanEthName);
-		}
-	}
-
-	private Map<String, List<WiredPortStatus>> getInterfacePortStatus(int customerId, long equipmentId) {
-		Map<String, List<WiredPortStatus>> interfacePortStatus = null;
-		// Getting the status from the current AP
-		Status existingPortStatus = statusServiceInterface.getOrNull(customerId, equipmentId,
-				StatusDataType.WIRED_ETHERNET_PORT);
-		if (existingPortStatus != null && existingPortStatus.getDetails() instanceof WiredEthernetPortStatusData) {
-			interfacePortStatus = ((WiredEthernetPortStatusData) existingPortStatus.getDetails())
-					.getInterfacePortStatusMap();
-		}
-
-		if (interfacePortStatus == null || interfacePortStatus.isEmpty()) {
-			LOG.info("No ethernetPortStatus found for customer {}, equipment {}", customerId, equipmentId);
-		}
-		return interfacePortStatus;
-	}
 }

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

@@ -238,7 +238,7 @@ public class OvsdbNode extends OvsdbDaoBase {
             }
             fillInLanIpAddressAndMac(ovsdbClient, ret, defaultLanInterfaceType);
 
-            fillInRadioInterfaceNamesAndCountry(ovsdbClient, ret);
+            fillInRadioInterfaceNames(ovsdbClient, ret);
 
         } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
@@ -417,96 +417,4 @@ public class OvsdbNode extends OvsdbDaoBase {
         return ret;
     }
 
-    public long getConfigVersionFromNode(OvsdbClient ovsdbClient) {
-        
-        long ret = 0;
-        
-        Map<String, String> versionMatrix = getVersionMatrixFromNode(ovsdbClient);
-
-        try {
-            ret = Long.parseLong(versionMatrix.get(ConnectNodeInfo.CONFIG_VERSION_PROPERTY_NAME));
-        } catch(Exception e) {
-            //do nothing
-        }
-        
-        LOG.debug("getConfigVersionFromNode {}", ret);
-        
-        return ret;
-    }
-
-    public Map<String, String> getVersionMatrixFromNode(OvsdbClient ovsdbClient) {
-        
-        Map<String, String> ret = new HashMap<>();
-        
-        try {
-            List<Operation> operations = new ArrayList<>();
-            List<Condition> conditions = new ArrayList<>();
-            List<String> columns = new ArrayList<>();
-            columns.add("version_matrix");
-            columns.add("id");
-
-            operations.add(new Select(awlanNodeDbTable, conditions, columns));
-            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Select from {}:", awlanNodeDbTable);
-
-                for (OperationResult res : result) {
-                    LOG.debug("Op Result {}", res);
-                }
-            }
-
-            Row row = null;
-            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult) && !((SelectResult) result[0]).getRows().isEmpty()) {
-                row = ((SelectResult) result[0]).getRows().iterator().next();
-            }
-
-            if( row != null ) {
-                ret = row.getMapColumn("version_matrix");
-            }
-
-        } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        
-        LOG.debug("getVersionMatrixFromNode {}", ret);
-        
-        return ret;
-    }
-    public void updateConfigVersionInNode(OvsdbClient ovsdbClient, long configVersionFromProfiles) {
-
-        try {
-            //get original version_matrix map value
-            Map<String, String> versionMatrix = getVersionMatrixFromNode(ovsdbClient);
-
-            //update our config version in version_matrix map
-            versionMatrix.put(ConnectNodeInfo.CONFIG_VERSION_PROPERTY_NAME, Long.toString(configVersionFromProfiles));
-            
-            //update the version_matrix column
-            List<Operation> operations = new ArrayList<>();
-            Map<String, Value> updateColumns = new HashMap<>();
-            
-            @SuppressWarnings("unchecked")
-            com.vmware.ovsdb.protocol.operation.notation.Map<String, String> ovsdbVersionMatrix =
-                    com.vmware.ovsdb.protocol.operation.notation.Map.of(versionMatrix);
-            updateColumns.put("version_matrix", ovsdbVersionMatrix);
-            
-            Row row = new Row(updateColumns);
-            operations.add(new Update(awlanNodeDbTable, row));
-            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-
-            for (OperationResult r : result) {
-                LOG.debug("Op Result {}", r);
-            }
-    
-            LOG.debug("updateConfigVersionInNode {}", configVersionFromProfiles);
-
-        } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException  e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
 }

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

@@ -2,7 +2,6 @@
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,6 @@ 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.opensync.ovsdb.dao.models.WifiVifConfigInfo;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
 import com.vmware.ovsdb.exception.OvsdbClientException;
 import com.vmware.ovsdb.protocol.operation.Delete;
@@ -27,8 +25,6 @@ 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.InsertResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
 import com.vmware.ovsdb.service.OvsdbClient;
@@ -63,17 +59,18 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
 
     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
+        // 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) {
+            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) {
+                if (apNetworkConfig.getSyslogRelay().getSrvHostIp() == null
+                    || apNetworkConfig.getSyslogRelay().getSeverity() == null) {
                     LOG.info("Cannot configure syslog remote_logging without SrvHostIp and Severity values. {}", apNetworkConfig);
                     return;
                 }
@@ -81,8 +78,8 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
                 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()));
+                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)));
@@ -122,126 +119,4 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
         }
 
     }
-
-	public void processLedControlEnabled(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-		try {
-			Map<String, Value> columns = new HashMap<>();
-			ApNetworkConfiguration apNetworkConfig = (ApNetworkConfiguration) opensyncAPConfig.getApProfile()
-					.getDetails();
-			if (apNetworkConfig.isLedControlEnabled() == null) {
-				LOG.info("Cannot configure isLedControlEnabled to null value. {}", apNetworkConfig);
-				return;
-			}
-			if (apNetworkConfig.isLedControlEnabled()) {
-				columns.put("module", new Atom<>("led"));
-				columns.put("key", new Atom<>("led_state"));
-				columns.put("value", new Atom<>("on"));
-			} else {
-				columns.put("module", new Atom<>("led"));
-				columns.put("key", new Atom<>("led_state"));
-				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("processLedControlEnabled 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("processLedControlEnabled insert result {}", 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("processLEDRequest set LEDs status to {}", blinkAllLEDs ? "led_blink" : "led_state");
-            Map<String, Value> columns = new HashMap<>();
-            if (blinkAllLEDs) {
-                columns.put("module", new Atom<>("led"));
-                columns.put("key", new Atom<>("led_blink"));
-            } else {
-                columns.put("module", new Atom<>("led"));
-                columns.put("key", new Atom<>("led_state"));
-            }
-            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);
-        }
-    }
-	   
-    public void configureDynamicRadiusProxyToAPC(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
-        
-        ApNetworkConfiguration apNetworkConfig = (ApNetworkConfiguration) opensyncAPConfig.getApProfile()
-                .getDetails();
-        if (apNetworkConfig.isDynamicRadiusProxyEnabled() == null) {
-            LOG.info("Cannot configure isDynamicRadiusProxyEnabled to null value. {}", apNetworkConfig);
-            return;
-        }
-        Boolean isApcEnabled = apNetworkConfig.isDynamicRadiusProxyEnabled();
-        
-        try {
-            if (ovsdbClient.getSchema(ovsdbName).get().getTables().containsKey(apcConfigDbTable)) {
-                Map<String, Value> columns = new HashMap<>();
-                columns.put("enabled", new Atom<>(isApcEnabled));
-                
-                List<Operation> operations = new ArrayList<>();
-                operations.add(new Update(apcConfigDbTable, new Row(columns)));
-                CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-                OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-                LOG.debug("configureDynamicRadiusProxyToAPC result {} ", Arrays.toString(result));
-            }
-        } catch (InterruptedException | ExecutionException | OvsdbClientException | TimeoutException e) {
-            LOG.error("Unable to configureDynamicRadiusProxyToAPC on AP.", e);
-            throw new RuntimeException(e);
-        }
-    }
 }

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

@@ -1,9 +1,27 @@
-
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+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;
+import java.util.concurrent.TimeoutException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
-import com.telecominfraproject.wlan.equipment.models.*;
+import com.telecominfraproject.wlan.core.model.equipment.SourceType;
+import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
+import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration;
+import com.telecominfraproject.wlan.equipment.models.MimoMode;
+import com.telecominfraproject.wlan.equipment.models.RadioConfiguration;
+import com.telecominfraproject.wlan.equipment.models.StateSetting;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiRadioConfigInfo;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiVifConfigInfo;
@@ -12,20 +30,15 @@ import com.telecominfraproject.wlan.profile.rf.models.RfElementConfiguration;
 import com.vmware.ovsdb.exception.OvsdbClientException;
 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.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.Uuid;
+import com.vmware.ovsdb.protocol.operation.notation.Value;
 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;
-
-import java.util.*;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 @Component
 public class OvsdbRadioConfig extends OvsdbDaoBase {
@@ -35,7 +48,8 @@ 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);
@@ -49,24 +63,20 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
                 Map<String, String> hwConfig = new HashMap<>();
                 ElementRadioConfiguration elementRadioConfig = apElementConfiguration.getRadioMap().get(radioType);
                 RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
-                if (elementRadioConfig == null || rfElementConfig == null) {
-                    continue;
-                }
                 boolean autoChannelSelection = rfElementConfig.getAutoChannelSelection();
                 int channel = elementRadioConfig.getActiveChannel(autoChannelSelection);
+                LOG.debug("configureWifiRadios autoChannelSelection {} activeChannel {} getChannelNumber {} ",
+                        autoChannelSelection, channel, elementRadioConfig.getChannelNumber());
                 ChannelBandwidth bandwidth = rfElementConfig.getChannelBandwidth();
                 String ht_mode = getBandwidth(bandwidth);
                 RadioConfiguration radioConfig = apElementConfiguration.getAdvancedRadioMap().get(radioType);
                 int beaconInterval = rfElementConfig.getBeaconInterval();
                 boolean enabled = radioConfig.getRadioAdminState().equals(StateSetting.enabled);
-                boolean autoCellSizeSelection = rfElementConfig.getAutoCellSizeSelection();
-                int txPower = 0;
-                if (autoCellSizeSelection) {
-                    if (elementRadioConfig.getEirpTxPower() != null) {
-                        txPower = elementRadioConfig.getEirpTxPower().getValue();
-                    }
-                } else {
+                int txPower;
+                if (elementRadioConfig.getEirpTxPower().getSource() == SourceType.profile) {
                     txPower = rfElementConfig.getEirpTxPower();
+                } else {
+                    txPower = elementRadioConfig.getEirpTxPower().getValue();
                 }
                 String hwMode = getHwMode(rfElementConfig);
                 String freqBand = getHwConfigAndFreq(radioType, hwConfig);
@@ -77,12 +87,7 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
                         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;
+                if (radioName == null) continue;
                 String ifName = null; // for vifConfigs
                 if (radioName.equals(radio0)) {
                     ifName = defaultRadio0;
@@ -91,8 +96,7 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
                 } else if (radioName.equals(radio2)) {
                     ifName = defaultRadio2;
                 }
-                if (ifName == null)
-                    continue;
+                if (ifName == null) continue;
                 Set<Uuid> vifUuidsForRadio = new HashSet<>();
                 for (String key : vifConfigs.keySet()) {
                     if (key.contains(ifName))
@@ -107,8 +111,8 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
                     maxNumClients = rfElementConfig.getMaxNumClients();
                 }
                 try {
-                    configureWifiRadios(freqBand, channel, hwConfig, country.toUpperCase(), beaconInterval, enabled, hwMode, ht_mode, txPower, mimoMode,
-                            vifUuidsForRadio, operations, maxNumClients,columnNames);
+                    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);
@@ -127,82 +131,76 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
             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);
-            throw new RuntimeException(e);
+            LOG.error("configureWifiRadios error", e); throw new RuntimeException(e);
         }
 
     }
 
     String getHwConfigAndFreq(RadioType radioType, Map<String, String> hwConfig) {
         switch (radioType) {
-            case is2dot4GHz:
-                return "2.4G";
-            case is5GHz:
-                // 802.11h dfs (Dynamic Frequency Selection) aka military
-                // and
-                // weather radar
-                // avoidance protocol
-                // Must not be disabled (by law)
-                // NA for 2.4GHz
-                hwConfig.put("dfs_enable", "1");
-                hwConfig.put("dfs_ignorecac", "0");
-                hwConfig.put("dfs_usenol", "1");
-                return "5G";
-            case is5GHzL:
-                // 802.11h dfs (Dynamic Frequency Selection) aka military
-                // and
-                // weather radar
-                // avoidance protocol
-                // Must not be disabled (by law)
-                // NA for 2.4GHz
-                hwConfig.put("dfs_enable", "1");
-                hwConfig.put("dfs_ignorecac", "0");
-                hwConfig.put("dfs_usenol", "1");
-                return "5GL";
-            case is5GHzU:
-                // 802.11h dfs (Dynamic Frequency Selection) aka military
-                // and
-                // weather radar
-                // avoidance protocol
-                // Must not be disabled (by law)
-                // NA for 2.4GHz
-                hwConfig.put("dfs_enable", "1");
-                hwConfig.put("dfs_ignorecac", "0");
-                hwConfig.put("dfs_usenol", "1");
-                return "5GU";
-            default: // don't know this interface
-                return null;
+        case is2dot4GHz:
+            return "2.4G";
+        case is5GHz:
+            // 802.11h dfs (Dynamic Frequency Selection) aka military
+            // and
+            // weather radar
+            // avoidance protocol
+            // Must not be disabled (by law)
+            // NA for 2.4GHz
+            hwConfig.put("dfs_enable", "1");
+            hwConfig.put("dfs_ignorecac", "0");
+            hwConfig.put("dfs_usenol", "1");
+            return "5G";
+        case is5GHzL:
+            // 802.11h dfs (Dynamic Frequency Selection) aka military
+            // and
+            // weather radar
+            // avoidance protocol
+            // Must not be disabled (by law)
+            // NA for 2.4GHz
+            hwConfig.put("dfs_enable", "1");
+            hwConfig.put("dfs_ignorecac", "0");
+            hwConfig.put("dfs_usenol", "1");
+            return "5GL";
+        case is5GHzU:
+            // 802.11h dfs (Dynamic Frequency Selection) aka military
+            // and
+            // weather radar
+            // avoidance protocol
+            // Must not be disabled (by law)
+            // NA for 2.4GHz
+            hwConfig.put("dfs_enable", "1");
+            hwConfig.put("dfs_ignorecac", "0");
+            hwConfig.put("dfs_usenol", "1");
+            return "5GU";
+        default: // don't know this interface
+            return null;
         }
     }
 
     private String getBandwidth(ChannelBandwidth bandwidth) {
         String ht_mode;
         switch (bandwidth) {
-            case is20MHz:
-                ht_mode = "HT20";
-                break;
-            case is40MHz:
-                ht_mode = "HT40";
-                break;
-            case is80MHz:
-                ht_mode = "HT80";
-                break;
-            case is160MHz:
-                ht_mode = "HT160";
-                break;
-            case auto:
-                ht_mode = "0";
-                break;
-            default:
-                ht_mode = null;
+        case is20MHz:
+            ht_mode = "HT20";
+            break;
+        case is40MHz:
+            ht_mode = "HT40";
+            break;
+        case is80MHz:
+            ht_mode = "HT80";
+            break;
+        case is160MHz:
+            ht_mode = "HT160";
+            break;
+        case auto:
+            ht_mode = "0";
+            break;
+        default:
+            ht_mode = null;
         }
         return ht_mode;
     }
@@ -210,45 +208,43 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
     String getHwMode(RfElementConfiguration rfElementConfig) {
         String hwMode = null;
         switch (rfElementConfig.getRadioMode()) {
-            case modeA:
-                hwMode = "11a";
-                break;
-            case modeAB:
-                hwMode = "11ab";
-                break;
-            case modeAC:
-                hwMode = "11ac";
-                break;
-            case modeB:
-                hwMode = "11b";
-                break;
-            case modeG:
-                hwMode = "11g";
-                break;
-            case modeAX:
-                hwMode = "11ax";
-                break;
-            case modeN:
-                hwMode = "11n";
-                break;
-            case auto:
-                hwMode = "auto";
-                break;
-            default:
+        case modeA:
+            hwMode = "11a";
+            break;
+        case modeAB:
+            hwMode = "11ab";
+            break;
+        case modeAC:
+            hwMode = "11ac";
+            break;
+        case modeB:
+            hwMode = "11b";
+            break;
+        case modeG:
+            hwMode = "11g";
+            break;
+        case modeAX:
+            hwMode = "11ax";
+            break;
+        case modeN:
+            hwMode = "11n";
+            break;
+        default:
         }
         return hwMode;
     }
 
-    void configureWifiRadios(String freqBand, int channel, Map<String, String> hwConfig, String country, int beaconInterval, boolean enabled, String hwMode,
-            String ht_mode, int txPower, int mimoMode, Set<Uuid> vifUuidsForRadio, List<Operation> operations, int maxNumClients, Set<String> tableColumns)
-            throws OvsdbClientException, TimeoutException, ExecutionException, InterruptedException {
+    void configureWifiRadios(String freqBand, int channel, Map<String, String> hwConfig,
+                             String country, int beaconInterval, boolean enabled, String hwMode, String ht_mode, int txPower,
+                             int mimoMode, Set<Uuid> vifUuidsForRadio, List<Operation> operations, int maxNumClients, Set<String> tableColumns) 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));
@@ -268,7 +264,8 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
         configureCustomOptionsMap(maxNumClients, updateColumns);
         setTxAndRxChainmask(mimoMode, updateColumns,tableColumns);
         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,10 +273,11 @@ 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);           
     }
 
@@ -289,42 +287,18 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
          * Note values 0, 1 remain unchanged
          * 
          * mimoMode bitmask
-         * 0       0 
-         * 1       1        1
-         * 2       3        2
-         * 3       7        4
-         * 4     15        8
-         * 5      31     16
-         * 6      63     32
-         * 7    127     64
-         * 8     255   128     
+         * 0 0
+         * 1 1
+         * 2 3
+         * 3 7
+         * 4 15
          */
-        switch (mimoMode) {
-            case 0: // unchanged
-                break;
-            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;
+        if (mimoMode == 2) {
+            mimoMode = 3;
+        } else if (mimoMode == 3) {
+            mimoMode = 7;
+        } else if (mimoMode == 4) {
+            mimoMode = 15;
         }
         updateColumns.put("tx_chainmask", new Atom<>(mimoMode));
         if (tableColumns.contains("rx_chainmask")) {

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

@@ -1,4 +1,3 @@
-
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import java.util.ArrayList;
@@ -20,6 +19,7 @@ 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;
@@ -27,7 +27,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.UpdateResult;
-import com.vmware.ovsdb.protocol.schema.DatabaseSchema;
 import com.vmware.ovsdb.service.OvsdbClient;
 
 @Component
@@ -36,6 +35,24 @@ 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 {
@@ -48,81 +65,19 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
         }
     }
 
-    /*
-     * 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()) {
+        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.getAcctSharedSecret()));
-            }
-            if (rsc.getAcctPort() != null) {
-                updateColumns.put("acct_port", new Atom<>(rsc.getAcctPort()));
-            }
-            if (rsc.getRadiusProxySecret() != null) {
-                updateColumns.put("proxy_secret", new Atom<>(rsc.getRadiusProxySecret()));
-            }
-            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));
-                }
-            }
+            updateColumns.put("server", new Atom<>(rsc.getServer().getHostAddress()));
+            getCertificateUrls(rsc, updateColumns);
+            updateColumns.put("radius_config_name", new Atom<>(rsc.getName()));
+            updateColumns.put("passphrase", new Atom<>(rsc.getPassphrase()));          
+            updateColumns.put("port", new Atom<>(rsc.getPort()));           
+            updateColumns.put("realm", Set.of(rsc.getRealm()));
+            updateColumns.put("radsec", new Atom<>(rsc.getUseRadSec()));
             Row row = new Row(updateColumns);
             operations.add(new Insert(radiusConfigDbTable, row));
         }
@@ -169,7 +124,8 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
                         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());
+                        throw new RuntimeException("removeRadiusConfigurations "
+                                + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
                     }
                 }
                 LOG.info("Removed all radius and realm configurations");

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

@@ -1,4 +1,3 @@
-
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import java.util.ArrayList;
@@ -14,7 +13,6 @@ 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;
@@ -49,9 +47,9 @@ import com.vmware.ovsdb.service.OvsdbClient;
 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 +69,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();
-            Integer probeResponseThresholdDb = null;
-            Integer clientDisconnectThresholdDb = null;
+            AutoOrManualValue probeResponseThresholdDb = null;
+            AutoOrManualValue clientDisconnectThresholdDb = null;
             
             if (elementRadioConfig.getProbeResponseThresholdDb() != null) {
-                probeResponseThresholdDb = getSourcedValue(autoCellSizeSelection, rfElementConfig.getProbeResponseThresholdDb(),
-                        elementRadioConfig.getProbeResponseThresholdDb().getValue());
+	            probeResponseThresholdDb = getSourcedValue(elementRadioConfig.getProbeResponseThresholdDb().getSource(),
+	                    rfElementConfig.getProbeResponseThresholdDb(),
+	                    elementRadioConfig.getProbeResponseThresholdDb().getValue());
             }
             
             if (elementRadioConfig.getClientDisconnectThresholdDb() != null) {
-                clientDisconnectThresholdDb = getSourcedValue(autoCellSizeSelection, rfElementConfig.getClientDisconnectThresholdDb(),
-                        elementRadioConfig.getClientDisconnectThresholdDb().getValue());
+	            clientDisconnectThresholdDb = getSourcedValue(
+	                    elementRadioConfig.getClientDisconnectThresholdDb().getSource(),
+	                    rfElementConfig.getClientDisconnectThresholdDb(),
+	                    elementRadioConfig.getClientDisconnectThresholdDb().getValue());
             }
 
             RadioConfiguration radioConfig = apElementConfig.getAdvancedRadioMap().get(radioType);
@@ -96,30 +98,29 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
             ManagementRate managementRate = null;
             RadioBestApSettings bestApSettings = null;
             if (radioConfig != null) {
-                if (radioConfig.getMulticastRate() != null) {
-                    multicastRate = autoCellSizeSelection ? radioConfig.getMulticastRate().getValue() : rfElementConfig.getMulticastRate();
-                }
+            	if (radioConfig.getMulticastRate() != null) {
+            		multicastRate = radioConfig.getMulticastRate().getSource() == SourceType.profile
+                        ? rfElementConfig.getMulticastRate()
+                        : radioConfig.getMulticastRate().getValue();
+            	}
             	
-                if (radioConfig.getManagementRate() != null) {
-                    managementRate = autoCellSizeSelection ? radioConfig.getManagementRate().getValue() : rfElementConfig.getManagementRate();
-                }
+            	if (radioConfig.getManagementRate() != null) {
+                	managementRate = radioConfig.getManagementRate().getSource() == SourceType.profile
+                        ? rfElementConfig.getManagementRate()
+                        : radioConfig.getManagementRate().getValue();
+            	}
             	
-                if (radioConfig.getBestApSettings() != null) {
-                    bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile ? rfElementConfig.getBestApSettings()
-                            : radioConfig.getBestApSettings().getValue();
-                }
+            	if (radioConfig.getBestApSettings() != null) {
+                	bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile
+                        ? rfElementConfig.getBestApSettings()
+                        : radioConfig.getBestApSettings().getValue();
+            	}
             }
 
-            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,
-                            bestApSettings, multicastRate, obssHopMode, noiseFloorThresholdInDB, noiseFloorThresholdTimeInSeconds, nonWifiThresholdInPercentage,
-                            nonWifiThresholdTimeInSeconds);
+                    configureWifiRrm(ovsdbClient, freqBand, backupChannel, probeResponseThresholdDb, 
+                    		clientDisconnectThresholdDb, managementRate, bestApSettings, multicastRate);
                 } catch (OvsdbClientException e) {
                     LOG.error("configureRrm failed with OvsdbClient exception.", e);
                     throw new RuntimeException(e);
@@ -136,10 +137,10 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
         }
     }
 
-    void configureWifiRrm(OvsdbClient ovsdbClient, String freqBand, int backupChannel, Integer probeResponseThreshold, Integer clientDisconnectThreshold,
-            ManagementRate managementRate, RadioBestApSettings bestApSettings, MulticastRate multicastRate, OBSSHopMode obssHopMode,
-            int noiseFloorThresholdInDB, int noiseFloorThresholdTimeInSeconds, int nonWifiThresholdInPercentage, int nonWifiThresholdTimeInSeconds)
-            throws OvsdbClientException, TimeoutException, ExecutionException, InterruptedException {
+    void configureWifiRrm(OvsdbClient ovsdbClient, String freqBand, int backupChannel,
+            AutoOrManualValue probeResponseThreshold, AutoOrManualValue clientDisconnectThreshold,
+            ManagementRate managementRate, RadioBestApSettings bestApSettings, MulticastRate multicastRate)
+                    throws OvsdbClientException, TimeoutException, ExecutionException, InterruptedException {
 
         CompletableFuture<DatabaseSchema> cfDatabaseSchema = ovsdbClient.getSchema(ovsdbName);
         DatabaseSchema databaseSchema = cfDatabaseSchema.get();
@@ -148,28 +149,29 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
         List<Operation> operations = new ArrayList<>();
         Map<String, Value> updateColumns = new HashMap<>();
 
+        updateColumns.put("freq_band", new Atom<>(freqBand));
+        updateColumns.put("backup_channel", new Atom<>(backupChannel));
         if (columnNames.contains("freq_band")) updateColumns.put("freq_band", new Atom<>(freqBand));
         if (columnNames.contains("backup_channel")) updateColumns.put("backup_channel", new Atom<>(backupChannel));
         if (columnNames.contains("mcast_rate")) {
             if (multicastRate == null || multicastRate == MulticastRate.auto) {
                 updateColumns.put("mcast_rate", new Atom<>(0));
             } else {
-                updateColumns.put("mcast_rate", new Atom<>(multicastRate.getId()));
+                updateColumns.put("mcast_rate", new Atom<>(managementRate.getId()));
             }
         }
-
         if (columnNames.contains("probe_resp_threshold")) {
-            if (probeResponseThreshold == null) {
+            if (probeResponseThreshold == null || probeResponseThreshold.isAuto()) {
                 updateColumns.put("probe_resp_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
             } else {
-                updateColumns.put("probe_resp_threshold", new Atom<>(probeResponseThreshold.intValue()));
+                updateColumns.put("probe_resp_threshold", new Atom<>(probeResponseThreshold.getValue()));
             }
         }
         if (columnNames.contains("client_disconnect_threshold")) {
-            if (clientDisconnectThreshold == null) {
+            if (clientDisconnectThreshold == null || clientDisconnectThreshold.isAuto()) {
                 updateColumns.put("client_disconnect_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
             } else {
-                updateColumns.put("client_disconnect_threshold", new Atom<>(clientDisconnectThreshold.intValue()));
+                updateColumns.put("client_disconnect_threshold", new Atom<>(clientDisconnectThreshold.getValue()));
             }
         }
         if (columnNames.contains("beacon_rate")) {
@@ -179,7 +181,6 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
                 updateColumns.put("beacon_rate", new Atom<>(managementRate.getId() * 10));
             }
         }
-
         if (columnNames.contains("min_load") && columnNames.contains("snr_percentage_drop")) {
             if (bestApSettings == null) {
                 updateColumns.put("min_load", new com.vmware.ovsdb.protocol.operation.notation.Set());
@@ -197,21 +198,6 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
                 }
             }
         }
-
-        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));
 
@@ -243,17 +229,8 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
         return AutoOrManualValue.createManualInstance(equipmentValue);
     }
 
-    // For cell size related attributes, the “manual" mode is not supported any more,
-    // user can create a new RF profile with desired values to achieve it
-    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) {
+    void processNewChannelsRequest(OvsdbClient ovsdbClient, Map<RadioType, Integer> backupChannelMap,
+            Map<RadioType, Integer> primaryChannelMap) {
 
         LOG.info("OvsdbDao::processNewChannelsRequest backup {} primary {}", backupChannelMap, primaryChannelMap);
         try {
@@ -342,7 +319,7 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
                 
                 Map<String, Value> updateRadioColumns = new HashMap<>();
                 Integer txPower = cellSizeAttributes.getEirpTxPowerDb();
-                if (txPower != null && txPower > 0) {
+                if (txPower > 0) {
                     updateRadioColumns.put("tx_power", new Atom<>(txPower));
                 } else {
                     updateRadioColumns.put("tx_power", new com.vmware.ovsdb.protocol.operation.notation.Set());
@@ -363,7 +340,8 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
                     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());
+                    throw new RuntimeException("processCellSizeAttributesRequest " + ((ErrorResult) res).getError() +
+                            " " + ((ErrorResult) res).getDetails());
                 }
             }
 

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

@@ -19,7 +19,6 @@ import com.telecominfraproject.wlan.profile.models.common.FileType;
 import com.telecominfraproject.wlan.profile.models.common.ManagedFileInfo;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
 import com.telecominfraproject.wlan.profile.network.models.GreTunnelConfiguration;
-import com.telecominfraproject.wlan.profile.network.models.RadiusProxyConfiguration;
 import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile;
 import com.telecominfraproject.wlan.profile.radius.models.RadiusServer;
 import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
@@ -60,6 +59,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
     OvsdbNetworkConfig networkConfig;
     @Autowired
     OvsdbNode ovsdbNode;
+    @Autowired
+    OvsdbRadiusProxyConfig radsecConfig;
 
     protected void getEnabledRadios(OvsdbClient ovsdbClient, List<RadioType> radios) {
         try {
@@ -226,9 +227,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         customOptions.put("rts_threshold", String.valueOf(rtsCtsThreshold));
     }
 
-    void configureCustomOptionsForUseRadiusProxyAndHotspot(boolean useRadiusProxy, boolean enableProxyArpForHotspot, Map<String, String> customOptions) {
+    void configureCustomOptionsForUseRadiusProxy(boolean useRadiusProxy, Map<String, String> customOptions) {
         customOptions.put("radproxy", useRadiusProxy ? "1" : "0");
-        customOptions.put("proxy_arp", enableProxyArpForHotspot ? "1" : "0");
     }
 
     /**
@@ -251,14 +251,13 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param updateColumns
      * @param dynamicVlan
      * @param useRadiusProxy
-     * @param enableProxyArpForHotspot TODO
      */
     void configureCustomOptionsForSsid(OvsdbClient ovsdbClient, boolean enable80211k, boolean enable80211r, boolean rateLimitEnable, int ssidDlLimit,
             int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int dtimPeriod, String radiusNasId, String radiusNasIp,
-            String radiusOperatorName, Map<String, Value> updateColumns, int dynamicVlan, Boolean useRadiusProxy, Boolean enableProxyArpForHotspot) {
+            String radiusOperatorName, Map<String, Value> updateColumns, int dynamicVlan, Boolean useRadiusProxy) {
         Map<String, String> customOptions = new HashMap<>();
 
-        configureCustomOptionsForUseRadiusProxyAndHotspot(useRadiusProxy, enableProxyArpForHotspot, customOptions);
+        configureCustomOptionsForUseRadiusProxy(useRadiusProxy, customOptions);
 
         configureCustomOptionsForRatesAndLimits(rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, customOptions);
 
@@ -278,7 +277,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             int keyRefresh, boolean uapsdEnabled, boolean apBridge, NetworkForwardMode networkForwardMode, List<MacAddress> macBlockList,
             boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int dtimPeriod,
             Map<String, String> captiveMap, List<String> walledGardenAllowlist, String radiusNasId, String radiusNasIp, String radiusOperatorName,
-            String greTunnelName, int dynamicVlan, Boolean useRadiusProxy, List<Operation> operations, Boolean enableProxyArpForHotspot) {
+            String greTunnelName, int dynamicVlan, Boolean useRadiusProxy, List<Operation> operations) {
 
         Map<String, Value> updateColumns = new HashMap<>();
         // If we are doing a NAT SSID, no bridge, else yes
@@ -335,7 +334,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         com.vmware.ovsdb.protocol.operation.notation.Map<String, String> securityMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(security);
         updateColumns.put("security", securityMap);
         configureCustomOptionsForSsid(ovsdbClient, enable80211k, enable80211r, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit,
-                rtsCtsThreshold, dtimPeriod, radiusNasId, radiusNasIp, radiusOperatorName, updateColumns, dynamicVlan, useRadiusProxy, enableProxyArpForHotspot);
+                rtsCtsThreshold, dtimPeriod, radiusNasId, radiusNasIp, radiusOperatorName, updateColumns, dynamicVlan, useRadiusProxy);
         updateBlockList(updateColumns, macBlockList);
         Row row = new Row(updateColumns);
         operations.add(new Insert(wifiVifConfigDbTable, row));
@@ -444,7 +443,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
@@ -490,11 +489,6 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                     }
                 }
 
-                boolean useRadiusProxy = false;
-                if (ssidConfig.getUseRadiusProxy() != null) {
-                    useRadiusProxy = ssidConfig.getUseRadiusProxy();
-                }
-
                 Map<String, String> security = new HashMap<>();
                 String ssidSecurityMode = ssidConfig.getSecureMode().name();
                 String opensyncSecurityMode = "OPEN";
@@ -504,7 +498,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 String radiusOperName = null;
 
                 opensyncSecurityMode = getOpensyncSecurityMode(ssidSecurityMode, opensyncSecurityMode);
-                populateSecurityMap(opensyncApConfig, ssidConfig, useRadiusProxy, security, ssidSecurityMode, opensyncSecurityMode);
+                populateSecurityMap(opensyncApConfig, ssidConfig, security, ssidSecurityMode, opensyncSecurityMode);
 
                 int dynamicVlan = 0;
                 if (opensyncSecurityMode.endsWith("EAP")) {
@@ -552,28 +546,23 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                     interfacesPerFreqBand.put(freqBand, 1);
                 }
 
-                if (useRadiusProxy) {
-                    // AP requires proxy secret in security during auto radius proxy
-                    for (RadiusProxyConfiguration rsc : ((ApNetworkConfiguration) opensyncApConfig.getApProfile().getDetails()).getRadiusProxyConfigurations()) {
-                        if (rsc.getRadiusProxySecret() != null) {
-                            security.put("radius_server_secret", rsc.getRadiusProxySecret());
-                            security.put("radius_acct_secret", rsc.getRadiusProxySecret());
-                        }
-                    }
-                }
-                
-                boolean enableProxyArpForHotspot = false;
-                if (ssidConfig.getEnableProxyArpForHotspot() != null) {
-                    enableProxyArpForHotspot = ssidConfig.getEnableProxyArpForHotspot();
+                boolean useRadiusProxy = false;
+                if (ssidConfig.getUseRadiusProxy() != null) {
+                    useRadiusProxy = ssidConfig.getUseRadiusProxy();
                 }
                 try {
                     configureSingleSsid(ovsdbClient, ifName, ssidConfig.getSsid(), ssidBroadcast, security, vlanId, rrmEnabled, enable80211r, mobilityDomain,
                             enable80211v, enable80211k, minHwMode, enabled, keyRefresh, uapsdEnabled, apBridge, ssidConfig.getForwardMode(), macBlockList,
                             rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, dtimPeriod, captiveMap,
-                            walledGardenAllowlist, radiusNasId, radiusNasIp, radiusOperName, greTunnelName, dynamicVlan, useRadiusProxy, operations, enableProxyArpForHotspot);
+                            walledGardenAllowlist, radiusNasId, radiusNasIp, radiusOperName, greTunnelName, dynamicVlan, useRadiusProxy, operations);
 
                     networkConfig.configureInetVifInterface(ovsdbClient, ifName, enabled, ssidConfig.getForwardMode(), operations);
 
+                    if (useRadiusProxy) {
+                        // make sure it's enabled if we are going to use it
+                        radsecConfig.configureApc(ovsdbClient, useRadiusProxy, operations);
+                    }
+
                 } catch (IllegalStateException e) {
                     // could not provision this SSID, but still can go on
                     LOG.warn("could not provision SSID {} on {}", ssidConfig.getSsid(), freqBand);
@@ -648,8 +637,10 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 if ((ssidConfig.getCaptivePortalId() == profileCaptive.getId()) && (profileCaptive.getDetails() != null)) {
                     CaptivePortalConfiguration captiveProfileDetails = ((CaptivePortalConfiguration) profileCaptive.getDetails());
 
+                    // +#define SCHEMA_CONSTS_PAGE_TITLE "page_title"
                     if (captiveProfileDetails.getBrowserTitle() != null) {
                         captiveMap.put("session_timeout", String.valueOf(captiveProfileDetails.getSessionTimeoutInMinutes()));
+                        captiveMap.put("page_title", captiveProfileDetails.getBrowserTitle());
                     }
                     if (captiveProfileDetails.getAuthenticationType().equals(CaptivePortalAuthenticationType.radius)) {
                         Optional<Profile> optional =
@@ -766,9 +757,6 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             case "wpa3MixedEAP":
                 opensyncSecurityMode = "WPA3-EAP";
                 break;
-            case "wpa3OnlyEAP192":
-                opensyncSecurityMode = "WPA3-EAP-192";
-                break;
         }
         return opensyncSecurityMode;
     }
@@ -785,35 +773,28 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         if (radiusProfileList.size() > 0) {
             Profile profileRadius = radiusProfileList.get(0);
             RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
-            RadiusServer radiusAcctServerPrimary = profileDetails.getPrimaryRadiusAccountingServer();
-            if (radiusAcctServerPrimary != null) {
-                security.put("radius_acct_ip", radiusAcctServerPrimary.getIpAddress() != null ? radiusAcctServerPrimary.getIpAddress().getHostAddress() : null);
-                security.put("radius_acct_port", radiusAcctServerPrimary.getPort() != null ? String.valueOf(radiusAcctServerPrimary.getPort()) : null);
-                security.put("radius_acct_secret", radiusAcctServerPrimary.getSecret());
-
+            RadiusServer rServer = profileDetails.getPrimaryRadiusAccountingServer();
+            if (rServer != null) {
+                if (ssidConfig.getUseRadiusProxy()) {
+                    security.put("radius_acct_ip", "127.0.0.1");
+                    security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
+                    security.put("radius_acct_secret", "secret");
+                } else {
+                    security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
+                    security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
+                    security.put("radius_acct_secret", rServer.getSecret());
+                }
                 if (ssidConfig.getRadiusAcountingServiceInterval() != null && ssidConfig.getRadiusAcountingServiceInterval() > 0) {
                     // if the value is present, use the
                     // radius_acct_interval
                     security.put("radius_acct_interval", ssidConfig.getRadiusAcountingServiceInterval().toString());
 
                 }
-                LOG.info("Set Primary Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}",
+                LOG.info("set Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}",
                         security.get("radius_acct_ip"), security.get("radius_acct_port"), security.get("radius_acct_secret"),
                         security.get("radius_acct_interval"));
             } else {
-                LOG.info("No Primary Radius Accounting Server defined in Radius Profile");
-            }
-            
-            RadiusServer radiusAcctServerSecondary = profileDetails.getSecondaryRadiusAccountingServer();
-            if (radiusAcctServerSecondary != null) {
-                security.put("radius_acct_ip_secondary", radiusAcctServerSecondary.getIpAddress() != null ? radiusAcctServerSecondary.getIpAddress().getHostAddress() : null);
-                security.put("radius_acct_port_secondary", radiusAcctServerSecondary.getPort() != null ? String.valueOf(radiusAcctServerSecondary.getPort()) : null);
-                security.put("radius_acct_secret_secondary", radiusAcctServerSecondary.getSecret());
-
-                LOG.info("Set Secondary Radius Accounting server attributes radius_acct_ip_secondary {} radius_acct_port_secondary {} radius_acct_secret_secondary {}",
-                        security.get("radius_acct_ip_secondary"), security.get("radius_acct_port_secondary"), security.get("radius_acct_secret_secondary"));
-            } else {
-                LOG.info("No Secondary Radius Accounting Server defined in Radius Profile");
+                LOG.info("No Radius Accounting Server defined in Radius Profile");
             }
 
         } else {
@@ -835,22 +816,18 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             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_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
-            security.put("radius_server_secret", radiusServer.getSecret());           
-            LOG.info("Set Primary Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
+            if (ssidConfig.getUseRadiusProxy()) {
+                security.put("radius_server_ip", "127.0.0.1");
+                security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
+                security.put("radius_server_secret", "secret");
+            } else {
+                security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
+                security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
+                security.put("radius_server_secret", radiusServer.getSecret());
+            }
+            LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
                     security.get("radius_server_port"), security.get("radius_server_secret"));
 
-            RadiusServer radiusServerSecondary = profileDetails.getSecondaryRadiusAuthServer();
-            if (radiusServerSecondary != null) {
-                security.put("radius_server_ip_secondary", radiusServerSecondary.getIpAddress() != null ? radiusServerSecondary.getIpAddress().getHostAddress() : null);
-                security.put("radius_server_port_secondary", radiusServerSecondary.getPort() != null ? String.valueOf(radiusServerSecondary.getPort()) : null);
-                security.put("radius_server_secret_secondary", radiusServerSecondary.getSecret());           
-                LOG.info("Set Secondary Radius server attributes radius_server_ip_secondary {} radius_server_port_secondary {} radius_server_secret_secondary {}", 
-                        security.get("radius_server_ip_secondary"), security.get("radius_server_port_secondary"), security.get("radius_server_secret_secondary"));
-            } else {
-                LOG.info("No Secondary Radius Authentication Server defined in Radius Profile");
-            }
         } else {
             LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles());
         }
@@ -866,7 +843,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param ssidSecurityMode
      * @param opensyncSecurityMode
      */
-    void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Boolean useRadiusProxy, Map<String, String> security, String ssidSecurityMode,
+    void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<String, String> security, String ssidSecurityMode,
             String opensyncSecurityMode) {
         security.put("encryption", opensyncSecurityMode);
         // key and mode is N/A for OPEN security
@@ -893,41 +870,28 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 case "wpa2OnlyEAP":
                 case "wpa2OnlyRadius":
                     security.put("mode", "2");
-                    if (!useRadiusProxy) {
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                    }
+                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
                     break;
                 case "wpa3OnlyEAP":
                     security.put("mode", "3");
-                    if (!useRadiusProxy) {
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                    }
-                    break;
-                case "wpa3OnlyEAP192":
-                    security.put("mode", "3");
-                    if (!useRadiusProxy) {
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                    }
+                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+
                     break;
                 case "wpa2EAP":
                 case "wpa2Radius":
                 case "wpa3MixedEAP":
                     security.put("mode", "mixed");
-                    if (!useRadiusProxy) {
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                    }
+                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+
                     break;
                 case "wpaEAP":
                 case "wpaRadius":
                     security.put("mode", "1");
-                    if (!useRadiusProxy) {
-                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-                    }
+                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
                     break;
             }
         }

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);
         }
@@ -243,6 +248,7 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     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) {
@@ -275,7 +280,6 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     rowColumns.put("reporting_interval", new Atom<>(defaultOffChannelReportingIntervalSeconds));
                     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));
@@ -295,7 +299,6 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     rowColumns.put("reporting_interval", new Atom<>(defaultReportingIntervalSeconds));
                     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));
@@ -352,7 +355,7 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     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/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/OpensyncGatewayTipWlanOvsdbClientTest.java

@@ -123,6 +123,7 @@ public class OpensyncGatewayTipWlanOvsdbClientTest {
         Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(ovsdbSession);
 
         OpensyncAPConfig apConfig = Mockito.mock(OpensyncAPConfig.class, Mockito.RETURNS_DEEP_STUBS);
+
         Mockito.when(apConfig.getApProfile().getDetails()).thenReturn(Mockito.mock(ApNetworkConfiguration.class));
 
         Mockito.when(opensyncExternalIntegrationInterface.getApConfig(Mockito.anyString())).thenReturn(apConfig);

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

@@ -34,9 +34,11 @@ import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherEmpty;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
 import com.telecominfraproject.wlan.location.models.Location;
+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.OpensyncAPHotspot20Config;
 import com.telecominfraproject.wlan.profile.models.Profile;
@@ -44,12 +46,11 @@ import com.telecominfraproject.wlan.profile.models.ProfileType;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
 import com.telecominfraproject.wlan.profile.network.models.GreTunnelConfiguration;
 import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
-import com.telecominfraproject.wlan.status.StatusServiceLocal;
-import com.telecominfraproject.wlan.status.controller.StatusController;
-import com.telecominfraproject.wlan.status.datastore.inmemory.StatusDatastoreInMemory;
 import com.vmware.ovsdb.exception.OvsdbClientException;
+import com.vmware.ovsdb.protocol.operation.notation.Atom;
 import com.vmware.ovsdb.protocol.operation.notation.Row;
 import com.vmware.ovsdb.protocol.operation.notation.Uuid;
+import com.vmware.ovsdb.protocol.operation.notation.Value;
 import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
 import com.vmware.ovsdb.protocol.operation.result.InsertResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
@@ -67,8 +68,8 @@ import com.vmware.ovsdb.service.OvsdbClient;
 @Import(
         value = {OvsdbDao.class, OvsdbDaoTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class, OvsdbHotspotConfig.class, OvsdbCommandConfig.class,
                 OvsdbMonitor.class, OvsdbFirmwareConfig.class, OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
-                OvsdbNodeConfig.class, OvsdbRadiusProxyConfig.class, StatusServiceLocal.class, StatusController.class,
-                CloudEventDispatcherEmpty.class, StatusDatastoreInMemory.class
+                OvsdbNodeConfig.class, OvsdbRadiusProxyConfig.class
+
         })
 public class OvsdbDaoTest {
 

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

@@ -104,7 +104,7 @@ public class OvsdbDaoTestUtilities {
         ((PasspointProfile) passpointHotspotConfig.getDetails()).setOsuSsidProfileId(profileSsidOpen.getId());
         profileSsidPsk.getChildProfileIds().add(passpointHotspotConfig.getId());
         ((PasspointProfile) passpointHotspotConfig.getDetails())
-                .setAssociatedAccessSsidProfileIds(Set.of(profileSsidPsk.getId()));
+                .setAssociatedAccessSsidProfileIds(List.of(profileSsidPsk.getId()));
         return passpointHotspotConfig;
     }
 

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

@@ -1,245 +0,0 @@
-package com.telecominfraproject.wlan.opensync.ovsdb.dao;
-
-import com.telecominfraproject.wlan.equipment.models.Equipment;
-import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
-import com.telecominfraproject.wlan.profile.ethernetport.models.WiredEthernetPortConfiguration;
-import com.telecominfraproject.wlan.profile.ethernetport.models.WiredPort;
-import com.telecominfraproject.wlan.profile.models.Profile;
-import com.telecominfraproject.wlan.profile.models.ProfileType;
-import com.telecominfraproject.wlan.status.StatusServiceInterface;
-import com.telecominfraproject.wlan.status.equipment.report.models.WiredEthernetPortStatusData;
-import com.telecominfraproject.wlan.status.equipment.report.models.WiredPortStatus;
-import com.telecominfraproject.wlan.status.models.Status;
-import com.telecominfraproject.wlan.status.models.StatusDataType;
-import com.vmware.ovsdb.exception.OvsdbClientException;
-import com.vmware.ovsdb.protocol.operation.result.OperationResult;
-import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
-import com.vmware.ovsdb.service.OvsdbClient;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoSession;
-import org.mockito.quality.Strictness;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-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;
-import java.util.concurrent.TimeoutException;
-
-import static org.mockito.Mockito.times;
-
-/**
- * @author rsharma
- */
-
-@RunWith(SpringRunner.class)
-@ActiveProfiles(profiles = { "integration_test", })
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = OvsdbNetworkConfigTest.class)
-@Import(value = { OvsdbNetworkConfig.class
-
-})
-public class OvsdbNetworkConfigTest {
-
-    @Mock(answer = Answers.RETURNS_MOCKS)
-    OvsdbClient ovsdbClient;
-
-    @Autowired
-    OvsdbNetworkConfig ovsdbNetworkConfig;
-
-    @MockBean(answer = Answers.RETURNS_MOCKS)
-    StatusServiceInterface statusServiceInterface;
-
-    @MockBean(answer = Answers.RETURNS_MOCKS)
-    OvsdbGet ovsdbGet;
-
-    @Mock(answer = Answers.RETURNS_MOCKS)
-    CompletableFuture<OperationResult[]> futureResult;
-
-    private MockitoSession mockito;
-    
-    private static final String LAN_IF_NAME = "lan";
-
-    @Before
-    public void setUp() throws Exception {
-        mockito = Mockito.mockitoSession().initMocks(this).strictness(Strictness.WARN).startMocking();
-        Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList())).thenReturn(futureResult);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        mockito.finishMocking();
-    }
-
-    // Eth0 port is in LAN mode and we need it to convert to eth0_trunk
-    @Test
-    public void testConfigureEthernetPorts_BridgeTrunkMode() throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
-        OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
-        Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS))
-                .thenReturn(updateResult);
-
-        ovsdbNetworkConfig.configureEthernetPorts(ovsdbClient, createOpensyncApConfig(true, "bridge"));
-
-        Mockito.verify(ovsdbClient, times(2)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
-    }
-
-    // Other tests that are useful to consider -- NOT anymore with GW deleting existing interfaces
-    // Case when ETH port is in eth0_trunk mode and no changes are required
-    // Case when ETH port is already in eth0_vlan100 and no changes are required
-
-    // Case when ETH port is in LAN mode and we convert it into BRIDGE + VlanId
-    @Test
-    public void testConfigureEthernetPorts_BridgeAccessMode() throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
-        OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
-        Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS))
-                .thenReturn(updateResult);
-
-        ovsdbNetworkConfig.configureEthernetPorts(ovsdbClient, createOpensyncApConfig(false, "bridge"));
-
-        Mockito.verify(ovsdbClient, times(2)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
-    }
-
-    // Case when ETH port is in BRIDGE + VlanId and we convert it into NAT (LAN)
-    @Test
-    public void testConfigureEthernetPorts_BridgeAccessToNATConversion() throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
-        OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
-        Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS))
-                .thenReturn(updateResult);
-
-        ovsdbNetworkConfig.configureEthernetPorts(ovsdbClient, createOpensyncApConfig(false, "NAT"));
-
-        Mockito.verify(ovsdbClient, times(1)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
-    }
-
-	// Case when ETH port is in BRIDGE + Trunk and Profile is removed so we convert
-	// it in NAT (LAN)
-	@Test
-	public void testResetWiredPorts_BridgeTrunkToNAT()
-			throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
-		// at the beginning LAN's currentIfName is wan
-		Mockito.when(statusServiceInterface.getOrNull(Mockito.anyInt(), Mockito.anyLong(),
-				Mockito.any(StatusDataType.class))).thenReturn(createWiredEthernetPortStatus("wan"));
-		OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
-		Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS)).thenReturn(updateResult);
-
-		ovsdbNetworkConfig.resetWiredPorts(ovsdbClient, createOpensyncApConfig(true, "bridge"));
-		// transact() execute 1 time as we move LAN from wan interface back to lan
-		// interface
-		// (vlan interface will be removed in inetC table directly)
-		Mockito.verify(ovsdbClient, times(1)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
-	}
-
-	// Case when ETH port is in NAT + Access and Profile is removed we don't do
-	// anything
-	@Test
-	public void testResetWiredPorts_NATToNAT()
-			throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
-		// at the beginning LAN's currentIfName is wan
-		Mockito.when(statusServiceInterface.getOrNull(Mockito.anyInt(), Mockito.anyLong(),
-				Mockito.any(StatusDataType.class))).thenReturn(createWiredEthernetPortStatus("lan"));
-		OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
-		Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS)).thenReturn(updateResult);
-
-		ovsdbNetworkConfig.resetWiredPorts(ovsdbClient, createOpensyncApConfig(false, "NAT"));
-		// Note: Strictness set to WARN in setup() rather than STRICT_STUB as we are
-		// adding unnecessary stubbings above to test if any transact() is called.
-		Mockito.verify(ovsdbClient, times(0)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
-	}
-
-    private OpensyncAPConfig createOpensyncApConfig(boolean isTrunkEnabled, String ifType) {
-        OpensyncAPConfig opensyncApConfig = new OpensyncAPConfig();
-
-        Equipment customerEquip = new Equipment();
-        customerEquip.setCustomerId(1);
-        customerEquip.setId(1L);
-        opensyncApConfig.setCustomerEquipment(customerEquip);
-        opensyncApConfig.setWiredEthernetPortProfile(createWiredEthernetPortProfile(isTrunkEnabled, ifType));
-
-        return opensyncApConfig;
-    }
-
-    private Profile createWiredEthernetPortProfile(boolean isTrunkEnabled, String ifType) {
-        WiredPort portLan = createWiredPort("lan", ifType, isTrunkEnabled, 10, List.of(100, 200), "eth0", "ETHERNET");
-        WiredPort portWan = createWiredPort("wan", "bridge", false, 0, null, "eth1", "INTERNET");
-
-        WiredEthernetPortConfiguration details = new WiredEthernetPortConfiguration();
-        details.setEquipmentModel("EA8300");
-        details.setEthPorts(Set.of(portLan, portWan));
-
-        Profile wiredEthernetPortProfile = new Profile();
-        wiredEthernetPortProfile.setCustomerId(1);
-        wiredEthernetPortProfile.setProfileType(ProfileType.wired_ethernet_port);
-        wiredEthernetPortProfile.setId(10L);
-        wiredEthernetPortProfile.setName("WiredProfileForTest");
-        wiredEthernetPortProfile.setCreatedTimestamp(1634060798000L);
-        wiredEthernetPortProfile.setLastModifiedTimestamp(1634060798000L);
-        wiredEthernetPortProfile.setDetails(details);
-
-        return wiredEthernetPortProfile;
-    }
-
-    private WiredPort createWiredPort(String ifName, String ifType, boolean isTrunkEnabled, int vlanId, List<Integer> allowedVlans,
-                                      String name, String displayName) {
-        WiredPort wiredPort = new WiredPort();
-        wiredPort.setIfName(ifName);
-        wiredPort.setIfType(ifType);
-        wiredPort.setTrunkEnabled(isTrunkEnabled);
-        wiredPort.setVlanId(vlanId);
-        wiredPort.setAllowedVlanIds(allowedVlans);
-        wiredPort.setName(name);
-        wiredPort.setDisplayName(displayName);
-
-        return wiredPort;
-    }
-    
-    private Status createWiredEthernetPortStatus(String lanPortIfName) {
-        WiredEthernetPortStatusData statusDetails = new WiredEthernetPortStatusData();
-        if (lanPortIfName.equals(LAN_IF_NAME)) {
-        	WiredPortStatus wiredPortStatusLan = createWiredPortStatus(lanPortIfName, "NAT", false, 0, null, "eth0", "lan", "up");
-        	WiredPortStatus wiredPortStatusWan = createWiredPortStatus("wan", "bridge", true, 0, null, "eth1", "wan", "up");
-            statusDetails.setInterfacePortStatusMap(Map.of("lan", List.of(wiredPortStatusLan), "wan", List.of(wiredPortStatusWan)));
-        } else {
-        	WiredPortStatus wiredPortStatusLan = createWiredPortStatus(lanPortIfName, "bridge", true, 10, List.of(100,200), "eth0", "lan", "up");
-        	WiredPortStatus wiredPortStatusWan = createWiredPortStatus("wan", "bridge", true, 0, null, "eth1", "wan", "up");
-            statusDetails.setInterfacePortStatusMap(Map.of("lan", List.of(), "wan", List.of(wiredPortStatusLan, wiredPortStatusWan)));
-        }
-        	
-
-        Status status = new Status();
-        status.setCustomerId(1);
-        status.setEquipmentId(1L);
-        status.setStatusDataType(StatusDataType.WIRED_ETHERNET_PORT);
-        status.setDetails(statusDetails);
-
-        return status;
-    }
-    
-	private WiredPortStatus createWiredPortStatus(String ifName, String ifType, boolean isTrunkEnabled, int vlanId,
-			List<Integer> allowedVlans, String name, String originalIfName, String operationalState) {
-		WiredPortStatus status = new WiredPortStatus();
-		status.setIfType(ifType);
-		status.setCurrentIfName(ifName);
-		status.setOriginalIfName(originalIfName);
-		status.setName(name);
-		status.setAllowedVlanIds(allowedVlans);
-		status.setDuplex("full");
-		status.setSpeed(1000);
-		status.setTrunkEnabled(isTrunkEnabled);
-		status.setOperationalState(operationalState);
-		status.setVlanId(vlanId);
-
-		return status;
-	}
-}

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

@@ -23,12 +23,8 @@ import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherEmpty;
 import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo;
 import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
-import com.telecominfraproject.wlan.status.StatusServiceLocal;
-import com.telecominfraproject.wlan.status.controller.StatusController;
-import com.telecominfraproject.wlan.status.datastore.inmemory.StatusDatastoreInMemory;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.service.OvsdbClient;
 
@@ -40,8 +36,8 @@ 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, StatusServiceLocal.class, StatusController.class,
-        CloudEventDispatcherEmpty.class, StatusDatastoreInMemory.class
+        OvsdbNodeConfig.class,OvsdbRadiusProxyConfig.class
+
 })
 public class OvsdbNodeTest {
 

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

@@ -24,16 +24,12 @@ import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherEmpty;
 import com.telecominfraproject.wlan.location.models.Location;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
 import com.telecominfraproject.wlan.profile.models.Profile;
 import com.telecominfraproject.wlan.profile.models.ProfileType;
 import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile;
 import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
-import com.telecominfraproject.wlan.status.StatusServiceLocal;
-import com.telecominfraproject.wlan.status.controller.StatusController;
-import com.telecominfraproject.wlan.status.datastore.inmemory.StatusDatastoreInMemory;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.service.OvsdbClient;
 
@@ -45,8 +41,8 @@ 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, StatusServiceLocal.class, StatusController.class,
-        CloudEventDispatcherEmpty.class, StatusDatastoreInMemory.class
+        OvsdbNodeConfig.class,OvsdbRadiusProxyConfig.class
+
 })
 public class OvsdbSsidConfigTest {