remove metrics from ClientSession

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

opensync-ext-cloud/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-ext-cloud</artifactId>
@@ -19,121 +19,121 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
  	 
         <dependency>
             <artifactId>base-client</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
 
       <dependency>
         <artifactId>equipment-gateway-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
      
       <dependency>
         <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>profile-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>portal-user-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>service-metric-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>status-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
  
        <dependency>
         <artifactId>firmware-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>manufacturer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
  
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>     
 
 	</dependencies>

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

@@ -25,6 +25,10 @@ import org.springframework.stereotype.Component;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import com.telecominfraproject.wlan.alarm.AlarmServiceInterface;
+import com.telecominfraproject.wlan.alarm.models.Alarm;
+import com.telecominfraproject.wlan.alarm.models.AlarmCode;
+import com.telecominfraproject.wlan.alarm.models.AlarmDetails;
 import com.telecominfraproject.wlan.client.ClientServiceInterface;
 import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
 import com.telecominfraproject.wlan.client.models.Client;
@@ -112,6 +116,7 @@ import com.telecominfraproject.wlan.status.models.StatusDataType;
 import com.telecominfraproject.wlan.status.network.models.NetworkAdminStatusData;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.ApcElectionEvent;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
+import com.telecominfraproject.wlan.systemevent.equipment.realtime.ApcElectionEvent.ApcMode;
 
 import sts.OpensyncStats.Report;
 import traffic.NetworkMetadata.FlowReport;
@@ -143,6 +148,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
     private FirmwareServiceInterface firmwareServiceInterface;
     @Autowired
     private MqttStatsPublisher mqttMessageProcessor;
+    @Autowired
+    private AlarmServiceInterface alarmServiceInterface;
 
     @Autowired
     private OpensyncCloudGatewayController gatewayController;
@@ -287,6 +294,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 // equipment already exists
                 boolean needToUpdateEquipment = false;
                 MacAddress reportedMacAddress = null;
+                alarmServiceInterface.delete(ce.getCustomerId(), ce.getId());
                 try {
                     reportedMacAddress = MacAddress.valueOf(connectNodeInfo.macAddress);
                 } catch (RuntimeException e) {
@@ -880,6 +888,20 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
     private void updateApDisconnectedStatus(String apId, Equipment ce) {
         LOG.info("updateApDisconnectedStatus disconnected AP {}", apId);
         try {
+        	Alarm disconnectedAlarm = new Alarm();
+            disconnectedAlarm.setCustomerId(ce.getCustomerId());
+            disconnectedAlarm.setEquipmentId(ce.getId());
+            disconnectedAlarm.setAlarmCode(AlarmCode.Disconnected);
+            
+            AlarmDetails alarmDetails = new AlarmDetails();
+    		alarmDetails.setMessage(AlarmCode.Disconnected.getDescription());
+    		alarmDetails.setAffectedEquipmentIds(List.of(ce.getId()));
+    		alarmDetails.setGeneratedBy(apId);
+    		
+    		disconnectedAlarm.setDetails(alarmDetails);
+            
+    		alarmServiceInterface.create(disconnectedAlarm);
+            
             Status statusRecord = new Status();
             statusRecord.setCustomerId(ce.getCustomerId());
             statusRecord.setEquipmentId(ce.getId());
@@ -2029,31 +2051,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                     // Create or update
                     Client client = clientServiceInterface.getOrNull(customerId, clientMacAddress);
                     if (client == null) {
-                        LOG.info("Cannot find client instance for {}", clientMacAddress);
+                        LOG.info("No client present for {}", clientMacAddress);
-                        if (rowUpdateOperation.equals(RowUpdateOperation.INSERT)) {
+                        continue;
-                            client = new Client();
-                            client.setCustomerId(customerId);
-                            client.setMacAddress(clientMacAddress);
-                            client.setDetails(new ClientInfoDetails());
-                            if (dhcpLeasedIps.containsKey("hostname")) {
-                                ((ClientInfoDetails) client.getDetails()).setHostName(dhcpLeasedIps.get("hostname"));
-                            }
-                            if (dhcpLeasedIps.containsKey("fingerprint")) {
-                                ((ClientInfoDetails) client.getDetails()).setApFingerprint(dhcpLeasedIps.get("fingerprint"));
-                            }
-                            if (dhcpLeasedIps.containsKey("device_type")) {
-                                DhcpFpDeviceType dhcpFpDeviceType = DhcpFpDeviceType.getByName(dhcpLeasedIps.get("device_type"));
-                                ClientType clientType = OvsdbToWlanCloudTypeMappingUtility.getClientTypeForDhcpFpDeviceType(dhcpFpDeviceType);
-                                LOG.debug("Translate from ovsdb {} to cloud {}", dhcpFpDeviceType, clientType);
-                                ((ClientInfoDetails) client.getDetails()).setClientType(clientType.getId());
-                            }
-                            client = clientServiceInterface.create(client);
-                            LOG.info("Created client from DHCP_Leased_IP event {}.", client);
-                            ClientSession session = updateClientSession(customerId, equipmentId, locationId, dhcpLeasedIps, clientMacAddress);
-                            if (session != null) {
-                                clientSessionList.add(session);
-                            }
-                        }
                     } else {
                         LOG.info("Client {} already exists on the cloud, update client values", dhcpLeasedIps);
                         if (dhcpLeasedIps.containsKey("hostname")) {
@@ -2133,19 +2132,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
         ClientSession session = clientServiceInterface.getSessionOrNull(customerId, equipmentId, clientMacAddress);
         if (session == null) {
-            session = new ClientSession();
+            LOG.info("No session for client {} with for customer {} equipment {}", clientMacAddress, customerId, equipmentId);
-            session.setCustomerId(customerId);
+            return null;
-            session.setEquipmentId(equipmentId);
-            session.setLocationId(locationId);
-            session.setMacAddress(clientMacAddress);
-            session.setDetails(new ClientSessionDetails());
-            session.getDetails().setSessionId(clientMacAddress.getAddressAsLong());
-            session.getDetails().setDhcpDetails(new ClientDhcpDetails(clientMacAddress.getAddressAsLong()));
-            session.getDetails().getDhcpDetails().setLeaseStartTimestamp(timestamp);
-            session.getDetails().setMetricDetails(new ClientSessionMetricDetails());
-            session.getDetails().setLastEventTimestamp(timestamp);
-            session.getDetails().setAssociationState(AssociationState._802_11_Associated);
-            session.getDetails().setAssocTimestamp(timestamp);
         } else {
             if (session.getDetails().getPriorEquipmentId() == null) {
                 session.getDetails().setPriorEquipmentId(session.getEquipmentId());
@@ -2437,6 +2425,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             LOG.error("UnknownHost for designatedRouterIp", e);
         }
         Status protocolStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.PROTOCOL);
+        String mode = apcStateAttributes.get("mode");
 
         InetAddress localIpV4Addr = null;
         if (protocolStatus != null) {
@@ -2445,10 +2434,13 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             ((EquipmentProtocolStatusData) protocolStatus.getDetails()).setLastApcUpdate(System.currentTimeMillis());
             ((EquipmentProtocolStatusData) protocolStatus.getDetails()).setReportedApcAddress(drIpAddr);
             ((EquipmentProtocolStatusData) protocolStatus.getDetails()).setRadiusProxyAddress(drIpAddr);
+            ((EquipmentProtocolStatusData) protocolStatus.getDetails()).setApcMode(ApcMode.valueOf(mode));
+            ((EquipmentProtocolStatusData) protocolStatus.getDetails()).setApcBackupDesignatedRouterIpAddress(bdrIpAddr);
+            ((EquipmentProtocolStatusData) protocolStatus.getDetails()).setApcDesignatedRouterIpAddress(drIpAddr);
+
             protocolStatus = statusServiceInterface.update(protocolStatus);
             LOG.info("Protocol Status updated for APC_State table monitor change {}", protocolStatus);
         }
-        String mode = apcStateAttributes.get("mode");
         ApcElectionEvent electionEvent =
                 new ApcElectionEvent(drIpAddr, bdrIpAddr, localIpV4Addr, drIpAddr, mode, Boolean.valueOf(apcStateAttributes.get("enabled")),
                         RealTimeEventType.APC_Election_event, customerId, ce.getLocationId(), equipmentId, System.currentTimeMillis());

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

@@ -1,3 +1,4 @@
+
 package com.telecominfraproject.wlan.opensync.external.integration.controller;
 
 import java.util.ArrayList;
@@ -149,19 +150,16 @@ 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,
+                    LOG.error("[{}] Failed to deliver command {}, command contains unsupported value", inventoryId, command);
-                            command);
+                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand, "Unsupported value in command for " + inventoryId, command,
-                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
+                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort()));
-                            "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,
+                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "No session found for " + inventoryId, command,
-                            "No session found for " + inventoryId, command, registeredGateway.getHostname(),
+                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort()));
-                            registeredGateway.getPort()));
                     return;
                 }
 
@@ -201,8 +199,7 @@ public class OpensyncCloudGatewayController {
                         ret.add(processRadioReboot(session, (CEGWRebootRequest) command));
                         break;
                     case ClientBlocklistChangeNotification:
-                        ret.add(sendClientBlocklistChangeNotification(session,
+                        ret.add(sendClientBlocklistChangeNotification(session, (CEGWClientBlocklistChangeNotification) command));
-                                (CEGWClientBlocklistChangeNotification) command));
                         break;
                     case NewChannelRequest:
                         ret.add(sendNewChannelRequest(session, (CEGWNewChannelRequest) command));
@@ -212,22 +209,20 @@ public class OpensyncCloudGatewayController {
                         break;
                     default:
                         LOG.warn("[{}] Failed to deliver command {}, unsupported command type", inventoryId, command);
-                        ret.add(new EquipmentCommandResponse(
+                        ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
-                                CEGWCommandResultCode.UnsupportedCommand, "Invalid command type ("
+                                "Invalid command type (" + command.getCommandType() + ") for equipment (" + inventoryId + ")", command,
-                                        + command.getCommandType() + ") for equipment (" + inventoryId + ")",
+                                registeredGateway == null ? null : registeredGateway.getHostname(),
-                                command, registeredGateway.getHostname(), registeredGateway.getPort()));
+                                registeredGateway == null ? -1 : registeredGateway.getPort()));
                 }
 
             }
 
-
         });
 
         return ret;
     }
 
-    private EquipmentCommandResponse processFirmwareDownload(OvsdbSession session,
+    private EquipmentCommandResponse processFirmwareDownload(OvsdbSession session, CEGWFirmwareDownloadRequest command) {
-            CEGWFirmwareDownloadRequest command) {
         return sendMessage(session, command.getInventoryId(), command);
     }
 
@@ -259,19 +254,18 @@ public class OpensyncCloudGatewayController {
         if (null != command.getRoutingId()) {
             if (!command.getRoutingId().equals(session.getRoutingId())) {
 
-                LOG.info("[C:{} E:{} R:{}] Stale routing entry ({}) detected", session.getCustomerId(),
+                LOG.info("[C:{} E:{} R:{}] Stale routing entry ({}) detected", session.getCustomerId(), command.getInventoryId(), session.getRoutingId(),
-                        command.getInventoryId(), session.getRoutingId(), command.getRoutingId());
+                        command.getRoutingId());
 
-                return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "Inactive Route Identifer",
+                return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "Inactive Route Identifer", command,
-                        command, registeredGateway.getHostname(), registeredGateway.getPort());
+                        registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
             }
         }
         return new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Route active", command,
-                registeredGateway.getHostname(), registeredGateway.getPort());
+                registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
     }
 
-    private EquipmentCommandResponse sendConfigChangeNotification(OvsdbSession session,
+    private EquipmentCommandResponse sendConfigChangeNotification(OvsdbSession session, CEGWConfigChangeNotification command) {
-            CEGWConfigChangeNotification command) {
 
         return sendMessage(session, command.getInventoryId(), command);
     }
@@ -281,20 +275,17 @@ public class OpensyncCloudGatewayController {
             session.getOvsdbClient().shutdown();
         } catch (Exception e) {
             LOG.error("[{}] Failed to close session on CE: {}", command.getInventoryId(), e.getLocalizedMessage());
-            return new EquipmentCommandResponse(
+            return new EquipmentCommandResponse(CEGWCommandResultCode.FailedToSend,
-                    CEGWCommandResultCode.FailedToSend, "Failed to send command " + command.getCommandType() + " to "
+                    "Failed to send command " + command.getCommandType() + " to " + command.getInventoryId() + ": " + e.getMessage(), command,
-                            + command.getInventoryId() + ": " + e.getMessage(),
+                    registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
-                    command, registeredGateway.getHostname(), registeredGateway.getPort());
         }
         LOG.debug("[{}] Closed session to CE", command.getInventoryId());
-        return new EquipmentCommandResponse(CEGWCommandResultCode.Success,
+        return new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Closed session to " + command.getInventoryId(), command,
-                "Closed session to " + command.getInventoryId(), command, registeredGateway.getHostname(),
+                registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
-                registeredGateway.getPort());
 
     }
 
-    private EquipmentCommandResponse sendClientBlocklistChangeNotification(OvsdbSession session,
+    private EquipmentCommandResponse sendClientBlocklistChangeNotification(OvsdbSession session, CEGWClientBlocklistChangeNotification command) {
-            CEGWClientBlocklistChangeNotification command) {
         return sendMessage(session, command.getInventoryId(), command);
     }
 
@@ -317,15 +308,17 @@ 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,
+        EquipmentCommandResponse response =
-                "Received Command " + command.getCommandType() + " for " + inventoryId, command,
+                new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Received Command " + command.getCommandType() + " for " + inventoryId, command,
-                registeredGateway.getHostname(), registeredGateway.getPort());
+                        registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
 
-        if (command instanceof CEGWConfigChangeNotification) {
+        if (command instanceof CEGWBlinkRequest) {
+            String resultDetails = tipwlanOvsdbClient.processBlinkRequest(inventoryId, ((CEGWBlinkRequest)command).getBlinkAllLEDs()); 
+            response.setResultDetail(resultDetails);
+        } else if (command instanceof CEGWConfigChangeNotification) {
             tipwlanOvsdbClient.processConfigChanged(inventoryId);
         } else if (command instanceof CEGWClientBlocklistChangeNotification) {
-            tipwlanOvsdbClient.processClientBlocklistChange(inventoryId,
+            tipwlanOvsdbClient.processClientBlocklistChange(inventoryId, ((CEGWClientBlocklistChangeNotification) command).getBlockList());
-                    ((CEGWClientBlocklistChangeNotification) command).getBlockList());
         } else if (command instanceof CEGWChangeRedirectorHost) {
             String newRedirectorAddress = ((CEGWChangeRedirectorHost) command).getRedirectorHost();
             tipwlanOvsdbClient.changeRedirectorHost(inventoryId, newRedirectorAddress);
@@ -357,8 +350,7 @@ public class OpensyncCloudGatewayController {
             String firmwareVersion = dlRequest.getFirmwareVersion();
             String username = dlRequest.getUsername();
 
-            String resultDetails = tipwlanOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion,
+            String resultDetails = tipwlanOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion, username);
-                    username);
 
             response.setResultDetail(resultDetails);
 
@@ -370,15 +362,15 @@ public class OpensyncCloudGatewayController {
             flashRequest.getInventoryId();
             flashRequest.getUsername();
 
-            String resultDetails = tipwlanOvsdbClient.processFirmwareFlash(flashRequest.getInventoryId(),
+            String resultDetails =
-                    flashRequest.getFirmwareVersion(), flashRequest.getUsername());
+                    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.getHostname(), registeredGateway.getPort());
+                    registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
         } else if (command instanceof CEGWRebootRequest) {
 
             CEGWRebootRequest rebootRequest = (CEGWRebootRequest) command;
@@ -402,10 +394,9 @@ public class OpensyncCloudGatewayController {
                 default:
                     response = new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
                             "Received Command " + command.getCommandType() + " for " + inventoryId, command,
-                            registeredGateway.getHostname(), registeredGateway.getPort());
+                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
             }
 
-
         }
 
         return response;
@@ -423,15 +414,14 @@ 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,
+    public EquipmentCommandResponse sendCommandWithAuthUser(@RequestBody EquipmentCommand command, @AuthenticationPrincipal Object requestUser,
-            @AuthenticationPrincipal Object requestUser, HttpServletRequest httpServletRequest) {
+            HttpServletRequest httpServletRequest) {
 
         // use these properties to get address and port where request has
         // arrived
@@ -464,8 +454,7 @@ public class OpensyncCloudGatewayController {
             }
 
             if (eqRoutingSvc == null) {
-                throw new ConfigurationException(
+                throw new ConfigurationException("Unable to register gateway with routing service: routing service interface not initialized");
-                        "Unable to register gateway with routing service: routing service interface not initialized");
             }
 
             cleanupStaleGwRecord();
@@ -481,13 +470,11 @@ public class OpensyncCloudGatewayController {
                 EquipmentGatewayRecord result = eqRoutingSvc.registerGateway(gwRecord);
                 registeredGwId = result.getId();
                 registeredGateway = result;
-                LOG.info("Successfully registered (name={}, id={}) with Routing Service", result.getHostname(),
+                LOG.info("Successfully registered (name={}, id={}) with Routing Service", result.getHostname(), registeredGwId);
-                        registeredGwId);
                 registeredWithRoutingService = true;
             } catch (RuntimeException e) {
                 // failed
-                LOG.error("Failed to register Customer Equipment Gateway (name={}) with Routing Service : {}",
+                LOG.error("Failed to register Customer Equipment Gateway (name={}) with Routing Service : {}", getGatewayName(), e.getLocalizedMessage());
-                        getGatewayName(), e.getLocalizedMessage());
             }
         }
     }
@@ -512,8 +499,7 @@ public class OpensyncCloudGatewayController {
                             eqRoutingSvc.deleteGateway(eqpRec.getId());
                         } catch (RuntimeException e) {
                             // failed
-                            LOG.error("Failed to delete Equipment Gateway (name={}) from Routing Service: {}",
+                            LOG.error("Failed to delete Equipment Gateway (name={}) from Routing Service: {}", eqpRec.getHostname(), e.getLocalizedMessage());
-                                    eqpRec.getHostname(), e.getLocalizedMessage());
                         }
                     } else {
                         LOG.debug("Gateway {} is reachable.", eqpRec.getHostname());
@@ -524,9 +510,8 @@ public class OpensyncCloudGatewayController {
             }
         } catch (Exception ex) { // Catching Exception to prevent crashing the
                                  // register thread
-            LOG.debug("Generic Exception encountered when trying to cleanup "
+            LOG.debug("Generic Exception encountered when trying to cleanup " + "the stale not-reachable GateWays. Continuing to register the new Gateway."
-                    + "the stale not-reachable GateWays. Continuing to register the new Gateway." + " Error: {} ",
+                    + " Error: {} ", ex.getMessage());
-                    ex.getMessage());
         }
     }
 
@@ -550,14 +535,13 @@ public class OpensyncCloudGatewayController {
         if (registeredWithRoutingService) {
             try {
                 eqRoutingSvc.deleteGateway(registeredGwId);
-                LOG.info("Deregistered Customer Equipment Gateway (name={},id={}) with Routing Service",
+                LOG.info("Deregistered Customer Equipment Gateway (name={},id={}) with Routing Service", getGatewayName(), registeredGwId);
-                        getGatewayName(), registeredGwId);
                 registeredGwId = -1;
                 registeredGateway = null;
             } catch (Exception e) {
                 // failed
-                LOG.error("Failed to deregister Customer Equipment Gateway (name={},id={}) with Routing Service: {}",
+                LOG.error("Failed to deregister Customer Equipment Gateway (name={},id={}) with Routing Service: {}", getGatewayName(), registeredGwId,
-                        getGatewayName(), registeredGwId, e.getLocalizedMessage());
+                        e.getLocalizedMessage());
             }
             registeredWithRoutingService = false;
         }
@@ -575,12 +559,10 @@ public class OpensyncCloudGatewayController {
      * @param equipmentId
      * @return associationId
      */
-    public EquipmentRoutingRecord registerCustomerEquipment(String equipmentName, Integer customerId,
+    public EquipmentRoutingRecord registerCustomerEquipment(String equipmentName, Integer customerId, Long equipmentId) {
-            Long equipmentId) {
         registerWithRoutingService();
         if (!registeredWithRoutingService) {
-            LOG.error("Unable to register customer equipement (name={},id={}): gateway not registered.", equipmentName,
+            LOG.error("Unable to register customer equipement (name={},id={}): gateway not registered.", equipmentName, equipmentId);
-                    equipmentId);
             return null;
         }
         // Clean up stale records
@@ -592,13 +574,11 @@ public class OpensyncCloudGatewayController {
         try {
             routingRecord = eqRoutingSvc.create(routingRecord);
 
-            LOG.debug("Registered customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId,
+            LOG.debug("Registered customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId, routingRecord.getId());
-                    routingRecord.getId());
             return routingRecord;
 
         } catch (Exception e) {
-            LOG.error("Failed to register customer equipement (name={},id={}): {}", equipmentName, equipmentId,
+            LOG.error("Failed to register customer equipement (name={},id={}): {}", equipmentName, equipmentId, e.getLocalizedMessage());
-                    e.getLocalizedMessage());
         }
         return null;
     }
@@ -624,20 +604,17 @@ 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",
+                                LOG.debug("Gateway {} is not-reachable... Deleting the equipment routing entry", gwRec.getHostname());
-                                        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 ",
+                            LOG.debug("Gateway with ID {} not found. Deleting the equipment routing entry ", eqRouting.getGatewayId());
-                                    eqRouting.getGatewayId());
                             deleteUnresponiveGwRoutingRecord(eqRouting.getId(), equipmentId);
                         }
                     } catch (DsEntityNotFoundException entityNotFoundException) {
-                        LOG.debug("Gateway ID: {} not found... Deleting the equipment routing entry",
+                        LOG.debug("Gateway ID: {} not found... Deleting the equipment routing entry", eqRouting.getGatewayId());
-                                eqRouting.getGatewayId());
                         deleteUnresponiveGwRoutingRecord(eqRouting.getId(), equipmentId);
                     }
                 }
@@ -646,9 +623,10 @@ public class OpensyncCloudGatewayController {
             }
         } catch (Exception genericException) { // Catching Exception to prevent
                                                // crashing the register thread
-            LOG.debug("Generic Exception encountered when trying to cleanup "
+            LOG.debug(
-                    + "the stale routing records for equipment ID: {}. Continuing to register the new RoutingRecord."
+                    "Generic Exception encountered when trying to cleanup "
-                    + " Error: {} ", equipmentId, genericException.getMessage());
+                            + "the stale routing records for equipment ID: {}. Continuing to register the new RoutingRecord." + " Error: {} ",
+                    equipmentId, genericException.getMessage());
         }
     }
 
@@ -657,8 +635,7 @@ public class OpensyncCloudGatewayController {
             eqRoutingSvc.delete(routingId);
         } catch (RuntimeException e) {
             // failed
-            LOG.error("Failed to delete Equipment routing record (ID={}) from Routing Service: {}", eqptId,
+            LOG.error("Failed to delete Equipment routing record (ID={}) from Routing Service: {}", eqptId, e.getLocalizedMessage());
-                    e.getLocalizedMessage());
             return false;
         }
         return true;
@@ -666,18 +643,16 @@ 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,
+            LOG.error("Unable to deregister customer equipement (name={},id={}): gateway not registered", equipmentName, equipmentId);
-                    equipmentId);
             return;
         }
         try {
-            LOG.debug("Deregistering customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId,
+            LOG.debug("Deregistering customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId, routingId);
-                    routingId);
 
             eqRoutingSvc.delete(routingId);
         } catch (Exception e) {
-            LOG.error("Failed to deregister customer equipement (name={},id={}) with route id={}: {}", equipmentName,
+            LOG.error("Failed to deregister customer equipement (name={},id={}) with route id={}: {}", equipmentName, equipmentId, routingId,
-                    equipmentId, routingId, e.getLocalizedMessage());
+                    e.getLocalizedMessage());
         }
     }
 

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

@@ -964,7 +964,10 @@ public class MqttStatsPublisher {
             List<PerProcessUtilization> memPerProcess = new ArrayList<>();
             deviceReport.getPsMemUtilList().stream().forEach(c -> memPerProcess.add(new PerProcessUtilization(c.getPid(), c.getCmd(), c.getUtil())));
             apPerformance.setPsMemUtil(memPerProcess);
-
+            apPerformance.setSourceTimestampMs(deviceReport.getTimestampMs());
+            // The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats
+            if (apNodeMetrics.getSourceTimestampMs() < deviceReport.getTimestampMs())
+                apNodeMetrics.setSourceTimestampMs(deviceReport.getTimestampMs());
             updateDeviceStatusForReport(customerId, equipmentId, deviceReport, avgRadioTemp);
 
         }
@@ -1063,6 +1066,11 @@ public class MqttStatsPublisher {
             radioStats.setNumRxDataFrames(rxFrames);
             radioStats.setNumRxErr(rxErrors);
             radioStats.setNumRxRetry(rxRetries);
+            radioStats.setSourceTimestampMs(clReport.getTimestampMs());
+            
+            // The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats
+            if (apNodeMetrics.getSourceTimestampMs() < clReport.getTimestampMs())
+                apNodeMetrics.setSourceTimestampMs(clReport.getTimestampMs());
             
             apNodeMetrics.setRadioStats(radioType, radioStats);
 
@@ -1123,6 +1131,12 @@ public class MqttStatsPublisher {
                 if (totalDurationMs > 0) {
                     RadioUtilization radioUtil = new RadioUtilization();
                     radioUtil.setTimestampSeconds((int) ((survey.getTimestampMs()) / 1000));
+                    radioUtil.setSourceTimestampMs(survey.getTimestampMs());
+                    
+                    // The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats
+                    if (apNodeMetrics.getSourceTimestampMs() < survey.getTimestampMs())
+                        apNodeMetrics.setSourceTimestampMs(survey.getTimestampMs());
+                    
                     int pctBusyTx = busyTx / totalDurationMs;
                     checkIfOutOfBound("pctBusyTx", pctBusyTx, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
 
@@ -1137,6 +1151,10 @@ public class MqttStatsPublisher {
                     checkIfOutOfBound("nonWifi", nonWifi, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
                     radioUtil.setNonWifi(nonWifi);
                     
+                    int pctOBSSAndSelfErrors = (busyRx - busySelf) / totalDurationMs;
+                    checkIfOutOfBound("OBSSAndSelfErrors", pctOBSSAndSelfErrors, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
+                    radioUtil.setUnassocClientRx(pctOBSSAndSelfErrors);
+
                     radioType = OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(survey.getBand());
                     if (radioType != RadioType.UNSUPPORTED) {
                         if (apNodeMetrics.getRadioUtilization(radioType) == null) {
@@ -1280,6 +1298,8 @@ public class MqttStatsPublisher {
 
             NetworkProbeMetrics networkProbeMetrics = new NetworkProbeMetrics();
             
+            networkProbeMetrics.setSourceTimestampMs(networkProbe.getTimestampMs());
+
             List<DnsProbeMetric> dnsProbeResults = new ArrayList<>();
             if (networkProbe.hasDnsProbe()) {
 
@@ -1393,6 +1413,7 @@ public class MqttStatsPublisher {
                 // clReport.getChannel();
                 ClientMetrics cMetrics = new ClientMetrics();
                 smr.setDetails(cMetrics);
+                cMetrics.setSourceTimestampMs(clReport.getTimestampMs());
 
                 Integer periodLengthSec = 60; // matches what's configured by
                 // OvsdbDao.configureStats(OvsdbClient)
@@ -1451,7 +1472,7 @@ public class MqttStatsPublisher {
                         cMetrics.setNumTxDropped((int) cl.getStats().getTxErrors());
                     }
 
-                    if (cl.getStats().hasRxFrames()) {
+                    if (cl.getStats().hasTxFrames()) {
                         cMetrics.setNumTxFramesTransmitted(cl.getStats().getTxFrames());
                     }
 
@@ -1475,10 +1496,10 @@ public class MqttStatsPublisher {
 
             ServiceMetric smr = new ServiceMetric(customerId, equipmentId);
             smr.setLocationId(locationId);
-
             metricRecordList.add(smr);
             NeighbourScanReports neighbourScanReports = new NeighbourScanReports();
             smr.setDetails(neighbourScanReports);
+            neighbourScanReports.setSourceTimestampMs(neighbor.getTimestampMs());
 
             List<NeighbourReport> neighbourReports = new ArrayList<>();
             neighbourScanReports.setNeighbourReports(neighbourReports);
@@ -1594,7 +1615,7 @@ public class MqttStatsPublisher {
 
             float rxBytesFv = Long.valueOf(client.getStats().getRxBytes()).floatValue();
             float rxBytesToMb = rxBytesFv / 125000F;
-            float txBytesFv = Long.valueOf(client.getStats().getRxBytes()).floatValue();
+            float txBytesFv = Long.valueOf(client.getStats().getTxBytes()).floatValue();
             float txBytesToMb = txBytesFv / 125000F;
 
             if (LOG.isDebugEnabled())
@@ -1627,6 +1648,10 @@ public class MqttStatsPublisher {
 
             LOG.debug("ClientReport for channel {} RadioBand {}", clientReport.getChannel(), clientReport.getBand());
 
+            // The service metric report's sourceTimestamp will be the most recent ClientReport timestamp
+            if (apSsidMetrics.getSourceTimestampMs() < clientReport.getTimestampMs())
+                apSsidMetrics.setSourceTimestampMs(clientReport.getTimestampMs());
+            
             long txBytes = 0L;
             long rxBytes = 0L;
             long txFrames = 0L;
@@ -1647,7 +1672,7 @@ public class MqttStatsPublisher {
 
             SsidStatistics ssidStatistics = new SsidStatistics();
             // GET the Radio IF MAC (BSSID) from the activeBSSIDs
-
+            ssidStatistics.setSourceTimestampMs(clientReport.getTimestampMs());
             Status activeBssidsStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.ACTIVE_BSSIDS);
             if (activeBssidsStatus != null && activeBssidsStatus.getDetails() != null
                     && ((ActiveBSSIDs) activeBssidsStatus.getDetails()).getActiveBSSIDs() != null) {
@@ -1675,58 +1700,17 @@ public class MqttStatsPublisher {
 
                     rxBytes += client.getStats().getRxBytes();
                     txBytes += client.getStats().getTxBytes();
-                    txFrames += client.getStats().getRxFrames();
+                    rxFrames += client.getStats().getRxFrames();
-                    rxFrames += client.getStats().getTxFrames();
+                    txFrames += client.getStats().getTxFrames();
                     rxRetries += client.getStats().getRxRetries();
                     txRetries += client.getStats().getTxRetries();
                     rxErrors += client.getStats().getRxErrors();
                     txErrors += client.getStats().getTxErrors();
                     lastRssi = client.getStats().getRssi();
                     
-                    try {
-
                     if (client.hasConnected() && client.getConnected() && client.hasMacAddress()) {
-                            // update service_metrics_collection_config for
-                            // connected client
-                            ClientSession session =
-                                    handleClientSessionMetricsUpdate(customerId, equipmentId, locationId, radioType, clientReport.getTimestampMs(), client);
-                            if (session != null) {
                         numConnectedClients += 1;
                     }
-                        } else {
-                            // Make sure, if we have a session for this client,
-                            // it
-                            // shows disconnected.
-                            // update any service_metrics_collection_config that
-                            // need update if the
-                            // disconnect occured during this window
-                            if (client.hasMacAddress()) {
-                                ClientSession session =
-                                        clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(client.getMacAddress()));
-
-                                if (session != null) {
-
-                                    ClientSessionDetails latestSessionDetails = new ClientSessionDetails();
-
-                                    // could still be values from before
-                                    // disconnect occured.
-                                    latestSessionDetails.setMetricDetails(calculateClientSessionMetricDetails(client, clientReport.getTimestampMs()));
-
-                                    session.getDetails().mergeSession(latestSessionDetails);
-
-                                    clientServiceInterface.updateSession(session);
-
-                                }
-
-                            }
-
-                            continue; // not connected
-                        }
-
-                    } catch (Exception e) {
-                        LOG.error("Unabled to update client {}", client, e);
-                    }
-
                 }
 
             }
@@ -1814,8 +1798,9 @@ public class MqttStatsPublisher {
             smr.setCustomerId(customerId);
             smr.setEquipmentId(equipmentId);
             smr.setLocationId(locationId);
-
             ChannelInfoReports channelInfoReports = new ChannelInfoReports();
+            channelInfoReports.setSourceTimestampMs(survey.getTimestampMs());
+
             Map<RadioType, List<ChannelInfo>> channelInfoMap = channelInfoReports.getChannelInformationReportsPerRadio();
 
             RadioType radioType = null;

opensync-ext-interface/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.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.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>tip-wlan-opensync-protobuf</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<artifactId>equipment-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>profile-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>location-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>routing-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		
 

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

@@ -18,6 +18,8 @@ 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-static/pom.xml

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

opensync-gateway-build/pom.xml

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

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.1.0-SNAPSHOT</version>
+		<version>1.2.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.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <artifactId>filestore-service</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
 		<dependency>
 			<artifactId>customer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>location-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>equipment-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>profile-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>portal-user-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>service-metric-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>system-event-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>alarm-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>client-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>routing-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>firmware-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>manufacturer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

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.1.0-SNAPSHOT</version>
+		<version>1.2.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.1.0-SNAPSHOT</version>
+			<version>1.2.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.1.0-SNAPSHOT</version>
+		<version>1.2.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.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway</artifactId>
@@ -14,22 +14,22 @@
 		<dependency>
 			<artifactId>base-container</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-interface</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>client-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>customer-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vmware.ovsdb</groupId>
@@ -47,13 +47,13 @@
 		<dependency>
 			<artifactId>service-metric-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util -->

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

@@ -1,3 +1,4 @@
+
 package com.telecominfraproject.wlan.opensync.ovsdb;
 
 import com.google.common.collect.ImmutableMap;
@@ -50,17 +51,13 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
     private final TagList tags = CloudMetricsTags.commonTags;
 
-    private final Counter connectionsAttempted = new BasicCounter(
+    private final Counter connectionsAttempted = new BasicCounter(MonitorConfig.builder("osgw-connectionsAttempted").withTags(tags).build());
-            MonitorConfig.builder("osgw-connectionsAttempted").withTags(tags).build());
 
-    private final Counter connectionsFailed = new BasicCounter(
+    private final Counter connectionsFailed = new BasicCounter(MonitorConfig.builder("osgw-connectionsFailed").withTags(tags).build());
-            MonitorConfig.builder("osgw-connectionsFailed").withTags(tags).build());
 
-    private final Counter connectionsCreated = new BasicCounter(
+    private final Counter connectionsCreated = new BasicCounter(MonitorConfig.builder("osgw-connectionsCreated").withTags(tags).build());
-            MonitorConfig.builder("osgw-connectionsCreated").withTags(tags).build());
 
-    private final Counter connectionsDropped = new BasicCounter(
+    private final Counter connectionsDropped = new BasicCounter(MonitorConfig.builder("osgw-connectionsDropped").withTags(tags).build());
-            MonitorConfig.builder("osgw-connectionsDropped").withTags(tags).build());
 
     @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.listenPort:6640}")
     private int ovsdbListenPort;
@@ -127,8 +124,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                 int localPort = ovsdbClient.getConnectionInfo().getLocalPort();
                 String subjectDn;
                 try {
-                    subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate())
+                    subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
-                            .getSubjectDN().getName();
 
                     String clientCn = SslUtil.extractCN(subjectDn);
                     LOG.info("ovsdbClient connecting from {} on port {} clientCn {}", remoteHost, localPort, clientCn);
@@ -189,8 +185,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     localPort = ovsdbClient.getConnectionInfo().getLocalPort();
                     String subjectDn = null;
                     try {
-                        subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate())
+                        subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
-                                .getSubjectDN().getName();
                     } catch (Exception e) {
                         // do nothing
                     }
@@ -204,8 +199,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                             LOG.debug("Unable to process ap disconnect. {}", e.getMessage());
                         }
                     }
-                    LOG.info("ovsdbClient disconnected from {} on port {} clientCn {} AP {} ", remoteHost, localPort,
+                    LOG.info("ovsdbClient disconnected from {} on port {} clientCn {} AP {} ", remoteHost, localPort, clientCn, key);
-                            clientCn, key);
                     LOG.info("ovsdbClient connectedClients = {}", ovsdbSessionMapInterface.getNumSessions());
                 } finally {
                     try {
@@ -228,8 +222,7 @@ 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,
+        connectNodeInfo = ovsdbDao.updateConnectNodeInfoOnConnect(ovsdbClient, clientCn, connectNodeInfo, preventClientCnAlteration);
-                preventClientCnAlteration);
 
         // successfully connected - register it in our
         // connectedClients table
@@ -295,6 +288,15 @@ 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);
@@ -426,14 +428,11 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
     private void monitorDhcpLeasedIpDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.dhcpLeasedIpDbTable + "_" + key,
-                OvsdbDao.dhcpLeasedIpDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.dhcpLeasedIpDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.dhcpLeasedIpDbTable,
-                        new MonitorRequest(new MonitorSelect(true, true, true, true)))),
                 tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.dhcpLeasedIpDbTable + "_" + key + " monitor callback received {}",
+                        LOG.info(OvsdbDao.dhcpLeasedIpDbTable + "_" + key + " monitor callback received {}", tableUpdates);
-                                tableUpdates);
 
                         List<Map<String, String>> insert = new ArrayList<>();
                         List<Map<String, String>> delete = new ArrayList<>();
@@ -445,8 +444,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                 if (rowUpdate.getNew() == null) {
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns().entrySet()
+                                    rowUpdate.getOld().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
-                                            .forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     delete.add(rowMap);
                                     // delete
@@ -454,8 +452,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     // insert
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getNew().getColumns().entrySet()
+                                    rowUpdate.getNew().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
-                                            .forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     insert.add(rowMap);
                                 } else {
@@ -464,8 +461,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     Map<String, String> rowMap = new HashMap<>();
 
                                     rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
-                                    rowUpdate.getOld().getColumns().entrySet()
+                                    rowUpdate.getOld().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
-                                            .forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     update.add(rowMap);
 
@@ -498,13 +494,10 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
     private void monitorCommandStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> csCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+        CompletableFuture<TableUpdates> csCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.commandStateDbTable + "_" + key,
-                OvsdbDao.commandStateDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.commandStateDbTable, new MonitorRequest())), tableUpdates -> {
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.commandStateDbTable, new MonitorRequest())),
-                tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.commandStateDbTable + "_" + key + " monitor callback received {}",
+                        LOG.info(OvsdbDao.commandStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
-                                tableUpdates);
 
                         List<Map<String, String>> insert = new ArrayList<>();
                         List<Map<String, String>> delete = new ArrayList<>();
@@ -516,8 +509,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                 if (rowUpdate.getNew() == null) {
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns()
+                                    rowUpdate.getOld().getColumns().forEach((key1, value) -> rowMap.put(key1, value.toString()));
-                                            .forEach((key1, value) -> rowMap.put(key1, value.toString()));
 
                                     delete.add(rowMap);
                                     // delete
@@ -525,8 +517,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     // insert
                                     Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getNew().getColumns()
+                                    rowUpdate.getNew().getColumns().forEach((key1, value) -> rowMap.put(key1, value.toString()));
-                                            .forEach((key1, value) -> rowMap.put(key1, value.toString()));
 
                                     insert.add(rowMap);
                                 } else {
@@ -535,8 +526,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     Map<String, String> rowMap = new HashMap<>();
 
                                     rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
-                                    rowUpdate.getOld().getColumns()
+                                    rowUpdate.getOld().getColumns().forEach((key1, value) -> rowMap.put(key1, value.toString()));
-                                            .forEach((key1, value) -> rowMap.put(key1, value.toString()));
 
                                     update.add(rowMap);
 
@@ -568,33 +558,27 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     }
 
     private void monitorAwlanNodeDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.awlanNodeDbTable + "_" + key,
-                OvsdbDao.awlanNodeDbTable + "_" + key, new MonitorRequests(ImmutableMap.of(OvsdbDao.awlanNodeDbTable,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.awlanNodeDbTable, new MonitorRequest(new MonitorSelect(true, false, false, true)))),
-                        new MonitorRequest(new MonitorSelect(true, false, false, true)))),
                 tableUpdates -> {
                     try {
                         LOG.info(OvsdbDao.awlanNodeDbTable + "_" + key + " monitor callback received {}", tableUpdates);
 
-                        extIntegrationInterface.awlanNodeDbTableUpdate(
+                        extIntegrationInterface.awlanNodeDbTableUpdate(ovsdbDao.getOpensyncAWLANNode(tableUpdates, key, ovsdbClient), key);
-                                ovsdbDao.getOpensyncAWLANNode(tableUpdates, key, ovsdbClient), key);
                     } catch (Exception e) {
                         LOG.error("awlanNodeDbTableUpdate failed", e);
                     }
                 });
 
-        extIntegrationInterface.awlanNodeDbTableUpdate(ovsdbDao.getOpensyncAWLANNode(awCf.join(), key, ovsdbClient),
+        extIntegrationInterface.awlanNodeDbTableUpdate(ovsdbDao.getOpensyncAWLANNode(awCf.join(), key, ovsdbClient), key);
-                key);
     }
 
     private void monitorWifiAssociatedClientsDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> acCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+        CompletableFuture<TableUpdates> acCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiAssociatedClientsDbTable + "_" + key,
-                OvsdbDao.wifiAssociatedClientsDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiAssociatedClientsDbTable, new MonitorRequest())), tableUpdates -> {
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiAssociatedClientsDbTable, new MonitorRequest())),
-                tableUpdates -> {
 
                     try {
-                        LOG.info(OvsdbDao.wifiAssociatedClientsDbTable + "_" + key + " monitor callback received {}",
+                        LOG.info(OvsdbDao.wifiAssociatedClientsDbTable + "_" + key + " monitor callback received {}", tableUpdates);
-                                tableUpdates);
 
                         List<OpensyncWifiAssociatedClients> associatedClients = new ArrayList<>();
 
@@ -611,8 +595,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                                     // adding anyway.
                                     extIntegrationInterface.wifiAssociatedClientsDbTableDelete(deletedClientMac, key);
                                 } else {
-                                    associatedClients.addAll(
+                                    associatedClients.addAll(ovsdbDao.getOpensyncWifiAssociatedClients(rowUpdate, key, ovsdbClient));
-                                            ovsdbDao.getOpensyncWifiAssociatedClients(rowUpdate, key, ovsdbClient));
                                 }
                             }
 
@@ -626,20 +609,16 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                 });
 
-        extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(
+        extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(ovsdbDao.getInitialOpensyncWifiAssociatedClients(acCf.join(), key, ovsdbClient), key);
-                ovsdbDao.getInitialOpensyncWifiAssociatedClients(acCf.join(), key, ovsdbClient), key);
 
     }
 
     private void monitorWifiInetStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> isCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+        CompletableFuture<TableUpdates> isCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiInetStateDbTable + "_" + key,
-                OvsdbDao.wifiInetStateDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiInetStateDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiInetStateDbTable,
-                        new MonitorRequest(new MonitorSelect(true, true, true, true)))),
                 tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.wifiInetStateDbTable + "_" + key + " monitor callback received {}",
+                        LOG.info(OvsdbDao.wifiInetStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
-                                tableUpdates);
 
                         List<OpensyncAPInetState> inetStateInsertOrUpdate = new ArrayList<>();
                         List<OpensyncAPInetState> inetStateDelete = new ArrayList<>();
@@ -649,11 +628,9 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                             for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
 
                                 if (rowUpdate.getNew() == null) {
-                                    inetStateDelete.addAll(
+                                    inetStateDelete.addAll(ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
-                                            ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
                                 } else {
-                                    inetStateInsertOrUpdate.addAll(
+                                    inetStateInsertOrUpdate.addAll(ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
-                                            ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
                                 }
 
                             }
@@ -670,42 +647,33 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                 });
 
-        extIntegrationInterface.wifiInetStateDbTableUpdate(
+        extIntegrationInterface.wifiInetStateDbTableUpdate(ovsdbDao.getInitialOpensyncApInetStateForRowUpdate(isCf.join(), key, ovsdbClient), key);
-                ovsdbDao.getInitialOpensyncApInetStateForRowUpdate(isCf.join(), key, ovsdbClient), key);
 
     }
 
     private void monitorWifiRadioStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> rsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+        CompletableFuture<TableUpdates> rsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiRadioStateDbTable + "_" + key,
-                OvsdbDao.wifiRadioStateDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiRadioStateDbTable, new MonitorRequest(new MonitorSelect(true, false, false, true)))),
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiRadioStateDbTable,
-                        new MonitorRequest(new MonitorSelect(true, false, false, true)))),
                 tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.wifiRadioStateDbTable + "_" + key + " monitor callback received {}",
+                        LOG.info(OvsdbDao.wifiRadioStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
-                                tableUpdates);
 
-                        extIntegrationInterface.wifiRadioStatusDbTableUpdate(
+                        extIntegrationInterface.wifiRadioStatusDbTableUpdate(ovsdbDao.getOpensyncAPRadioState(tableUpdates, key, ovsdbClient), key);
-                                ovsdbDao.getOpensyncAPRadioState(tableUpdates, key, ovsdbClient), key);
                     } catch (Exception e) {
                         LOG.error("wifiRadioStatusDbTableUpdate failed", e);
                     }
                 });
-        extIntegrationInterface
+        extIntegrationInterface.wifiRadioStatusDbTableUpdate(ovsdbDao.getOpensyncAPRadioState(rsCf.join(), key, ovsdbClient), key);
-                .wifiRadioStatusDbTableUpdate(ovsdbDao.getOpensyncAPRadioState(rsCf.join(), key, ovsdbClient), key);
     }
 
     private void monitorWifiVifStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> vsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+        CompletableFuture<TableUpdates> vsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiVifStateDbTable + "_" + key,
-                OvsdbDao.wifiVifStateDbTable + "_" + key,
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable, new MonitorRequest(new MonitorSelect(false, true, true, true)))),
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable,
-                        new MonitorRequest(new MonitorSelect(false, true, true, true)))),
                 tableUpdates -> {
                     try {
-                        LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}",
+                        LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
-                                tableUpdates);
 
                         List<OpensyncAPVIFState> vifsToDelete = new ArrayList<>();
                         List<OpensyncAPVIFState> vifsToInsertOrUpdate = new ArrayList<>();
@@ -715,14 +683,12 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                                 if (rowUpdate.getNew() == null) {
                                     // this is a deletion
-                                    vifsToDelete.addAll(
+                                    vifsToDelete.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
-                                            ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
 
                                 } else {
                                     // either an insert or
                                     // mutuate/update
-                                    vifsToInsertOrUpdate.addAll(
+                                    vifsToInsertOrUpdate.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
-                                            ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
 
                                 }
 
@@ -747,10 +713,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     }
 
     private void monitorNodeStateTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(
+        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.nodeStateTable + "_" + key,
-                OvsdbDao.ovsdbName, OvsdbDao.nodeStateTable + "_" + key, new MonitorRequests(ImmutableMap
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.nodeStateTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))), tableUpdates -> {
-                        .of(OvsdbDao.nodeStateTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
-                tableUpdates -> {
                     LOG.info(OvsdbDao.nodeStateTable + "_" + key + " monitor callback received {}");
                     tableUpdates.getTableUpdates().forEach((key1, value) -> {
                         LOG.info("TableUpdate for {}", key1);
@@ -769,10 +733,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     }
 
     private void monitorAPCStateTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(
+        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.apcStateDbTable + "_" + key,
-                OvsdbDao.ovsdbName, OvsdbDao.apcStateDbTable + "_" + key, new MonitorRequests(ImmutableMap
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.apcStateDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))), tableUpdates -> {
-                        .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);
@@ -780,14 +742,19 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                             Map<String, String> apcStateAttributes = ovsdbDao.getAPCState(r, key);
 
-                            extIntegrationInterface.apcStateDbTableUpdate(apcStateAttributes, key,
+                            extIntegrationInterface.apcStateDbTableUpdate(apcStateAttributes, key, RowUpdateOperation.MODIFY);
-                                    RowUpdateOperation.MODIFY);
 
                         });
 
                     });
                 });
-        nsCf.join();
+        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);
+        }
     }
 
     @Override
@@ -837,8 +804,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
     @Override
     public String startDebugEngine(String apId, String gatewayHostname, Integer gatewayPort) {
-        LOG.debug("TipWlanOvsdbClient::startDebugEngine apId {} gatewayHostname {} gatewayPort {}", apId,
+        LOG.debug("TipWlanOvsdbClient::startDebugEngine apId {} gatewayHostname {} gatewayPort {}", apId, gatewayHostname, gatewayPort);
-                gatewayHostname, gatewayPort);
 
         try {
             OvsdbSession session = ovsdbSessionMapInterface.getSession(apId);
@@ -846,17 +812,14 @@ 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,
+            ovsdbDao.configureCommands(ovsdbClient, OvsdbDao.StartDebugEngineApCommand, payload, 0L, defaultCommandDurationSec);
-                    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(
+            LOG.error("TipWlanOvsdbClient::startDebugEngine Failed to start debug engine on AP {} with gateway {} port {}", apId, gatewayHostname, gatewayPort,
-                    "TipWlanOvsdbClient::startDebugEngine Failed to start debug engine on AP {} with gateway {} port {}",
+                    e);
-                    apId, gatewayHostname, gatewayPort, e);
+            return "Failed to start debug engine on AP " + apId + " with gateway " + gatewayHostname + " port " + gatewayPort;
-            return "Failed to start debug engine on AP " + apId + " with gateway " + gatewayHostname + " port "
-                    + gatewayPort;
         }
     }
 
@@ -901,8 +864,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             }
         } catch (Exception e) {
             if (switchBanks) {
-                LOG.debug("TipWlanOvsdbClient::processRebootRequest failed to trigger switch software bank on AP {}",
+                LOG.debug("TipWlanOvsdbClient::processRebootRequest failed to trigger switch software bank on AP {}", apId, e);
-                        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);
@@ -948,21 +910,17 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         return key;
     }
 
-    public String processNewChannelsRequest(String apId, Map<RadioType, Integer> backupChannelMap,
+    public String processNewChannelsRequest(String apId, Map<RadioType, Integer> backupChannelMap, Map<RadioType, Integer> primaryChannelMap) {
-            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 {}",
+            LOG.info("TipWlanOvsdbClient::processNewChannelsRequest change backup and/or primary channels for AP {}", apId);
-                    apId);
             return " change backup and/or primary channels for AP " + apId;
         } catch (Exception e) {
-            LOG.error(
+            LOG.error("TipWlanOvsdbClient::processNewChannelsRequest failed to change backup and/or primary channels for AP {}", apId, e);
-                    "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;
         }
     }
@@ -974,13 +932,10 @@ 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 {}",
+            LOG.info("TipWlanOvsdbClient::processCellSizeAttributesRequest change cellSizeAttributes for AP {}", apId);
-                    apId);
             return " change cell size attributes for AP " + apId;
         } catch (Exception e) {
-            LOG.error(
+            LOG.error("TipWlanOvsdbClient::processCellSizeAttributesRequest failed to change cell size attributes for AP {}", apId, e);
-                    "TipWlanOvsdbClient::processCellSizeAttributesRequest failed to change cell size attributes for AP {}",
-                    apId, e);
             return "failed to change cell size attributes for AP " + apId;
         }
     }

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

@@ -237,4 +237,8 @@ public class OvsdbDao extends OvsdbDaoBase {
         ovsdbStats.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
     }
 
+    public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
+        return ovsdbNodeConfig.processBlinkRequest(ovsdbClient,apId,blinkAllLEDs);
+    }
+
 }

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

@@ -25,6 +25,7 @@ import com.vmware.ovsdb.protocol.operation.notation.Condition;
 import com.vmware.ovsdb.protocol.operation.notation.Function;
 import com.vmware.ovsdb.protocol.operation.notation.Row;
 import com.vmware.ovsdb.protocol.operation.notation.Value;
+import com.vmware.ovsdb.protocol.operation.result.InsertResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
 import com.vmware.ovsdb.service.OvsdbClient;
@@ -69,8 +70,7 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
 
             if (apNetworkConfig.getSyslogRelay().isEnabled()) {
 
-                if (apNetworkConfig.getSyslogRelay().getSrvHostIp() == null
+                if (apNetworkConfig.getSyslogRelay().getSrvHostIp() == null || apNetworkConfig.getSyslogRelay().getSeverity() == null) {
-                    || apNetworkConfig.getSyslogRelay().getSeverity() == null) {
                     LOG.info("Cannot configure syslog remote_logging without SrvHostIp and Severity values. {}", apNetworkConfig);
                     return;
                 }
@@ -78,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
+                String delimitedValue = "udp:" + apNetworkConfig.getSyslogRelay().getSrvHostIp().getHostAddress() + ":" + String.valueOf(
-                        .valueOf(apNetworkConfig.getSyslogRelay().getSrvHostPort() + ":" +String.valueOf(apNetworkConfig.getSyslogRelay().getSeverity().getId()));
+                        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)));
@@ -119,4 +119,52 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
         }
 
     }
+
+    public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
+
+        String ret = null;
+        try {
+
+            LOG.debug("processBlinkRequest set BlinkLEDs to {}", blinkAllLEDs);
+            Map<String, Value> columns = new HashMap<>();
+            if (blinkAllLEDs) {
+                columns.put("module", new Atom<>("led"));
+                columns.put("key", new Atom<>("led_blink"));
+                columns.put("value", new Atom<>("on"));
+            } else {
+                columns.put("module", new Atom<>("led"));
+                columns.put("key", new Atom<>("led_off"));
+                columns.put("value", new Atom<>("off"));
+            }
+            List<Operation> operations = new ArrayList<>();
+            operations.add(new Update(nodeConfigTable, List.of(new Condition("module", Function.EQUALS, new Atom<>("led"))), new Row(columns)));
+            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
+            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+            long numUpdates = 0;
+            for (OperationResult res : result) {
+                if (res instanceof UpdateResult) {
+                    numUpdates += ((UpdateResult) res).getCount();
+                    LOG.debug("processBlinkRequest update result {}", res);
+                    ret = "processBlinkRequest update result " + res;
+                }
+            }
+            if (numUpdates == 0) {
+                // no records existed, insert the row instead
+                operations.clear();
+                operations.add(new Insert(nodeConfigTable, new Row(columns)));
+                fResult = ovsdbClient.transact(ovsdbName, operations);
+                result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+                for (OperationResult res : result) {
+                    if (res instanceof InsertResult) {
+                        LOG.debug("processBlinkRequest insert result {}", res);
+                        ret = "processBlinkRequest insert result " + res;
+                    }
+                }
+            }
+            
+            return ret;
+        } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -1,27 +1,9 @@
+
 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.core.model.equipment.SourceType;
+import com.telecominfraproject.wlan.equipment.models.*;
-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;
@@ -30,15 +12,19 @@ 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.Atom;
+import com.vmware.ovsdb.protocol.operation.notation.*;
-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 {
@@ -48,36 +34,36 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
 
     void configureWifiRadios(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
         String country = opensyncAPConfig.getCountryCode(); // should be the
-        ApElementConfiguration apElementConfiguration = (ApElementConfiguration) opensyncAPConfig.getCustomerEquipment()
+        ApElementConfiguration apElementConfiguration = (ApElementConfiguration) opensyncAPConfig.getCustomerEquipment().getDetails();
-                .getDetails();
         RfConfiguration rfConfig = (RfConfiguration) opensyncAPConfig.getRfProfile().getDetails();
         Map<String, WifiRadioConfigInfo> provisionedRadioConfigs = ovsdbGet.getProvisionedWifiRadioConfigs(ovsdbClient);
         Map<String, WifiVifConfigInfo> vifConfigs = ovsdbGet.getProvisionedWifiVifConfigs(ovsdbClient);
         List<Operation> operations = new ArrayList<>();
-        try {
-            CompletableFuture<DatabaseSchema> cfDatabaseSchema = ovsdbClient.getSchema(ovsdbName);
-            DatabaseSchema databaseSchema = cfDatabaseSchema.get();
-            Set<String> columnNames = databaseSchema.getTables().get(wifiRadioConfigDbTable).getColumns().keySet();
-
         for (RadioType radioType : apElementConfiguration.getRadioMap().keySet()) {
             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 {} ",
+            LOG.debug("configureWifiRadios autoChannelSelection {} activeChannel {} getChannelNumber {} ", autoChannelSelection, channel,
-                        autoChannelSelection, channel, elementRadioConfig.getChannelNumber());
+                    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);
-                int txPower;
+            boolean autoCellSizeSelection = rfElementConfig.getAutoCellSizeSelection();
-                if (elementRadioConfig.getEirpTxPower().getSource() == SourceType.profile) {
+            int txPower = 0;
-                    txPower = rfElementConfig.getEirpTxPower();
+            if (autoCellSizeSelection) {
-                } else {
+                if (elementRadioConfig.getEirpTxPower() != null) {
                     txPower = elementRadioConfig.getEirpTxPower().getValue();
                 }
+            } else {
+                txPower = rfElementConfig.getEirpTxPower();
+            }
             String hwMode = getHwMode(rfElementConfig);
             String freqBand = getHwConfigAndFreq(radioType, hwConfig);
             String radioName = null;
@@ -87,7 +73,8 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
                     break;
                 }
             }
-                if (radioName == null) continue;
+            if (radioName == null)
+                continue;
             String ifName = null; // for vifConfigs
             if (radioName.equals(radio0)) {
                 ifName = defaultRadio0;
@@ -96,7 +83,8 @@ 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))
@@ -111,8 +99,8 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
                 maxNumClients = rfElementConfig.getMaxNumClients();
             }
             try {
-                    configureWifiRadios(freqBand, channel, hwConfig, country.toUpperCase(), beaconInterval,
+                configureWifiRadios(freqBand, channel, hwConfig, country.toUpperCase(), beaconInterval, enabled, hwMode, ht_mode, txPower, mimoMode,
-                            enabled, hwMode, ht_mode, txPower, mimoMode, vifUuidsForRadio, operations, maxNumClients,columnNames);
+                        vifUuidsForRadio, operations, maxNumClients);
             } catch (OvsdbClientException e) {
                 LOG.error("ConfigureWifiRadios failed with OvsdbClient exception.", e);
                 throw new RuntimeException(e);
@@ -127,14 +115,15 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
                 throw new RuntimeException(e);
             }
         }
-
+        try {
             CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
             OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
             for (OperationResult res : result) {
                 LOG.debug("Op Result {}", res);
             }
         } catch (OvsdbClientException | ExecutionException | InterruptedException | TimeoutException e) {
-            LOG.error("configureWifiRadios error", e); throw new RuntimeException(e);
+            LOG.error("configureWifiRadios error", e);
+            throw new RuntimeException(e);
         }
 
     }
@@ -229,22 +218,24 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
             case modeN:
                 hwMode = "11n";
                 break;
+            case auto:
+                hwMode = "auto";
+                break;
             default:
         }
         return hwMode;
     }
 
-    void configureWifiRadios(String freqBand, int channel, Map<String, String> hwConfig,
+    void configureWifiRadios(String freqBand, int channel, Map<String, String> hwConfig, String country, int beaconInterval, boolean enabled, String hwMode,
-                             String country, int beaconInterval, boolean enabled, String hwMode, String ht_mode, int txPower,
+            String ht_mode, int txPower, int mimoMode, Set<Uuid> vifUuidsForRadio, List<Operation> operations, int maxNumClients)
-                             int mimoMode, Set<Uuid> vifUuidsForRadio, List<Operation> operations, int maxNumClients, Set<String> tableColumns) throws OvsdbClientException, TimeoutException, ExecutionException, InterruptedException {
+            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
+        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> hwConfigMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(hwConfig);
-                .of(hwConfig);
         updateColumns.put("hw_config", hwConfigMap);
         updateColumns.put("bcn_int", new Atom<>(beaconInterval));
         updateColumns.put("enabled", new Atom<>(enabled));
@@ -262,10 +253,9 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
             updateColumns.put("hw_mode", new Atom<>(hwMode));
         }
         configureCustomOptionsMap(maxNumClients, updateColumns);
-        setTxAndRxChainmask(mimoMode, updateColumns,tableColumns);
+        setTxAndRxChainmask(mimoMode, updateColumns);
         if (vifUuidsForRadio.size() > 0) {
-            com.vmware.ovsdb.protocol.operation.notation.Set vifConfigUuids = com.vmware.ovsdb.protocol.operation.notation.Set
+            com.vmware.ovsdb.protocol.operation.notation.Set vifConfigUuids = com.vmware.ovsdb.protocol.operation.notation.Set.of(vifUuidsForRadio);
-                    .of(vifUuidsForRadio);
             updateColumns.put("vif_configs", vifConfigUuids);
         }
         Row row = new Row(updateColumns);
@@ -276,34 +266,55 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
         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
+        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> customOptionsMap = com.vmware.ovsdb.protocol.operation.notation.Map.of(customOptions);
-        .of(customOptions);           
         updateColumns.put("custom_options", customOptionsMap);
     }
 
-    void setTxAndRxChainmask(int mimoMode, Map<String, Value> updateColumns, Set<String> tableColumns) {
+    void setTxAndRxChainmask(int mimoMode, Map<String, Value> updateColumns) {
         /*
          * Chainmask is a bitmask, so map mimo mode values accordingly
          * Note values 0, 1 remain unchanged
          * 
          * mimoMode bitmask
          * 0       0 
-         * 1 1
+         * 1       1        1
-         * 2 3
+         * 2       3        2
-         * 3 7
+         * 3       7        4
-         * 4 15
+         * 4     15        8
+         * 5      31     16
+         * 6      63     32
+         * 7    127     64
+         * 8     255   128     
          */
-        if (mimoMode == 2) {
+        switch (mimoMode) {
+            case 0: // unchanged
+                break;
+            case 1: // unchanged
+                break;
+            case 2:
                 mimoMode = 3;
-        } else if (mimoMode == 3) {
+                break;
+            case 3:
                 mimoMode = 7;
-        } else if (mimoMode == 4) {
+                break;
+            case 4:
                 mimoMode = 15;
+                break;
+            case 5:
+                mimoMode = 31;
+                break;
+            case 6:
+                mimoMode = 63;
+                break;
+            case 7:
+                mimoMode = 127;
+                break;
+            case 8:
+                mimoMode = 255;
+                break;
         }
         updateColumns.put("tx_chainmask", new Atom<>(mimoMode));
-        if (tableColumns.contains("rx_chainmask")) {
         updateColumns.put("rx_chainmask", new Atom<>(mimoMode));
     }
-    }
 
 }

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

@@ -1,3 +1,4 @@
+
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import java.util.ArrayList;
@@ -27,6 +28,7 @@ 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
@@ -65,11 +67,35 @@ 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 {
 
-        for (RadiusProxyConfiguration rsc : ((ApNetworkConfiguration) apConfig.getApProfile().getDetails())
+        // TODO: remove the schema check when AP load available
-                .getRadiusProxyConfigurations()) {
+        DatabaseSchema databaseSchema = ovsdbClient.getSchema(ovsdbName).get();
+
+        for (RadiusProxyConfiguration rsc : ((ApNetworkConfiguration) apConfig.getApProfile().getDetails()).getRadiusProxyConfigurations()) {
             Map<String, Value> updateColumns = new HashMap<>();
             updateColumns.put("server", new Atom<>(rsc.getServer().getHostAddress()));
             getCertificateUrls(rsc, updateColumns);
@@ -78,6 +104,34 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
             updateColumns.put("port", new Atom<>(rsc.getPort()));
             updateColumns.put("realm", Set.of(rsc.getRealm()));
             updateColumns.put("radsec", new Atom<>(rsc.getUseRadSec()));
+            updateColumns.put("secret", new Atom<>(rsc.getSharedSecret()));
+            if (rsc.getAcctServer() != null) {
+                updateColumns.put("acct_server", new Atom<>(rsc.getAcctServer().getHostAddress()));
+            }                
+            if (rsc.getSharedSecret() != null) {
+                updateColumns.put("acct_secret", new Atom<>(rsc.getSharedSecret()));
+            }            
+            if (rsc.getAcctPort() != null) {
+                updateColumns.put("acct_port", new Atom<>(rsc.getAcctPort()));
+            }        
+            
+            if( databaseSchema.getTables().get(radiusConfigDbTable).getColumns().containsKey("auto_discover") ){
+                if (rsc.getUseRadSec() && rsc.getDynamicDiscovery()) {
+                    // if useRadSec && dynamicDiscovery enabled, do not send server information
+                    updateColumns.put("auto_discover", new Atom<>(true));
+                    updateColumns.remove("acct_server");
+                    updateColumns.remove("acct_secret");
+                    updateColumns.remove("acct_port");
+                    updateColumns.remove("server");
+                    updateColumns.remove("port");
+                    updateColumns.remove("secret");
+                } else {
+                    // if !useRadSec, auto_discover is false regardless of it's desired setting
+                    // retain server information
+                    updateColumns.put("auto_discover", new Atom<>(false));
+                }
+            }
+
             Row row = new Row(updateColumns);
             operations.add(new Insert(radiusConfigDbTable, row));
         }
@@ -124,8 +178,7 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
                         LOG.info("removeRadiusConfigurations {}", res.toString());
                     } else if (res instanceof ErrorResult) {
                         LOG.error("removeRadiusConfigurations error {}", (res));
-                        throw new RuntimeException("removeRadiusConfigurations "
+                        throw new RuntimeException("removeRadiusConfigurations " + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
-                                + ((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,10 +1,10 @@
+
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -13,6 +13,7 @@ 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;
@@ -40,15 +41,13 @@ import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
 import com.vmware.ovsdb.protocol.operation.result.InsertResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
-import com.vmware.ovsdb.protocol.schema.DatabaseSchema;
 import com.vmware.ovsdb.service.OvsdbClient;
 
 @Component
 public class OvsdbRrmConfig extends OvsdbDaoBase {
     void configureWifiRrm(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
 
-        ApElementConfiguration apElementConfig = (ApElementConfiguration) opensyncApConfig.getCustomerEquipment()
+        ApElementConfiguration apElementConfig = (ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails();
-                .getDetails();
         RfConfiguration rfConfig = (RfConfiguration) opensyncApConfig.getRfProfile().getDetails();
         for (RadioType radioType : apElementConfig.getRadioMap().keySet()) {
             String freqBand = null;
@@ -74,22 +73,18 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
 
             boolean autoChannelSelection = rfElementConfig.getAutoChannelSelection();
             int backupChannel = elementRadioConfig.getActiveBackupChannel(autoChannelSelection);
-            LOG.debug("configureWifiRadios autoChannelSelection {} activeBackupChannel {}",
-                    autoChannelSelection, backupChannel);
 
-            AutoOrManualValue probeResponseThresholdDb = null;
+            boolean autoCellSizeSelection = rfElementConfig.getAutoCellSizeSelection();
-            AutoOrManualValue clientDisconnectThresholdDb = null;
+            Integer probeResponseThresholdDb = null;
+            Integer clientDisconnectThresholdDb = null;
 
             if (elementRadioConfig.getProbeResponseThresholdDb() != null) {
-	            probeResponseThresholdDb = getSourcedValue(elementRadioConfig.getProbeResponseThresholdDb().getSource(),
+                probeResponseThresholdDb = getSourcedValue(autoCellSizeSelection, rfElementConfig.getProbeResponseThresholdDb(),
-	                    rfElementConfig.getProbeResponseThresholdDb(),
                         elementRadioConfig.getProbeResponseThresholdDb().getValue());
             }
 
             if (elementRadioConfig.getClientDisconnectThresholdDb() != null) {
-	            clientDisconnectThresholdDb = getSourcedValue(
+                clientDisconnectThresholdDb = getSourcedValue(autoCellSizeSelection, rfElementConfig.getClientDisconnectThresholdDb(),
-	                    elementRadioConfig.getClientDisconnectThresholdDb().getSource(),
-	                    rfElementConfig.getClientDisconnectThresholdDb(),
                         elementRadioConfig.getClientDisconnectThresholdDb().getValue());
             }
 
@@ -99,28 +94,29 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
             RadioBestApSettings bestApSettings = null;
             if (radioConfig != null) {
                 if (radioConfig.getMulticastRate() != null) {
-            		multicastRate = radioConfig.getMulticastRate().getSource() == SourceType.profile
+                    multicastRate = autoCellSizeSelection ? radioConfig.getMulticastRate().getValue() : rfElementConfig.getMulticastRate();
-                        ? rfElementConfig.getMulticastRate()
-                        : radioConfig.getMulticastRate().getValue();
                 }
 
                 if (radioConfig.getManagementRate() != null) {
-                	managementRate = radioConfig.getManagementRate().getSource() == SourceType.profile
+                    managementRate = autoCellSizeSelection ? radioConfig.getManagementRate().getValue() : rfElementConfig.getManagementRate();
-                        ? rfElementConfig.getManagementRate()
-                        : radioConfig.getManagementRate().getValue();
                 }
 
                 if (radioConfig.getBestApSettings() != null) {
-                	bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile
+                    bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile ? rfElementConfig.getBestApSettings()
-                        ? 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, 
+                    configureWifiRrm(ovsdbClient, freqBand, backupChannel, probeResponseThresholdDb, clientDisconnectThresholdDb, managementRate,
-                    		clientDisconnectThresholdDb, managementRate, bestApSettings, multicastRate);
+                            bestApSettings, multicastRate, obssHopMode, noiseFloorThresholdInDB, noiseFloorThresholdTimeInSeconds, nonWifiThresholdInPercentage,
+                            nonWifiThresholdTimeInSeconds);
                 } catch (OvsdbClientException e) {
                     LOG.error("configureRrm failed with OvsdbClient exception.", e);
                     throw new RuntimeException(e);
@@ -137,51 +133,41 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
         }
     }
 
-    void configureWifiRrm(OvsdbClient ovsdbClient, String freqBand, int backupChannel,
+    void configureWifiRrm(OvsdbClient ovsdbClient, String freqBand, int backupChannel, Integer probeResponseThreshold, Integer clientDisconnectThreshold,
-            AutoOrManualValue probeResponseThreshold, AutoOrManualValue clientDisconnectThreshold,
+            ManagementRate managementRate, RadioBestApSettings bestApSettings, MulticastRate multicastRate, OBSSHopMode obssHopMode,
-            ManagementRate managementRate, RadioBestApSettings bestApSettings, MulticastRate multicastRate)
+            int noiseFloorThresholdInDB, int noiseFloorThresholdTimeInSeconds, int nonWifiThresholdInPercentage, int nonWifiThresholdTimeInSeconds)
             throws OvsdbClientException, TimeoutException, ExecutionException, InterruptedException {
 
-        CompletableFuture<DatabaseSchema> cfDatabaseSchema = ovsdbClient.getSchema(ovsdbName);
-        DatabaseSchema databaseSchema = cfDatabaseSchema.get();
-        Set<String> columnNames = databaseSchema.getTables().get(wifiRrmConfigDbTable).getColumns().keySet();
-
         List<Operation> operations = new ArrayList<>();
         Map<String, Value> updateColumns = new HashMap<>();
 
         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<>(managementRate.getId()));
+            updateColumns.put("mcast_rate", new Atom<>(multicastRate.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.getValue()));
+            updateColumns.put("probe_resp_threshold", new Atom<>(probeResponseThreshold.intValue()));
         }
-        }
+
-        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.getValue()));
+            updateColumns.put("client_disconnect_threshold", new Atom<>(clientDisconnectThreshold.intValue()));
         }
-        }
+
-        if (columnNames.contains("beacon_rate")) {
         if (managementRate == null || managementRate == ManagementRate.auto) {
             updateColumns.put("beacon_rate", new Atom<>(0));
         } else {
             updateColumns.put("beacon_rate", new Atom<>(managementRate.getId() * 10));
         }
-        }
+
-        if (columnNames.contains("min_load") && columnNames.contains("snr_percentage_drop")) {
         if (bestApSettings == null) {
             updateColumns.put("min_load", new com.vmware.ovsdb.protocol.operation.notation.Set());
             updateColumns.put("snr_percentage_drop", new com.vmware.ovsdb.protocol.operation.notation.Set());
@@ -197,7 +183,16 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
                 updateColumns.put("min_load", new Atom<>(bestApSettings.getMinLoadFactor()));
             }
         }
+
+        if (obssHopMode != null) {
+            updateColumns.put("obss_hop_mode", new Atom<>(obssHopMode.equals(OBSSHopMode.NON_WIFI) ? 1 : 2));
         }
+        updateColumns.put("noise_floor_thresh", new Atom<>(noiseFloorThresholdInDB));
+        updateColumns.put("noise_floor_time", new Atom<>(noiseFloorThresholdTimeInSeconds));
+        updateColumns.put("non_wifi_thresh", new Atom<>(nonWifiThresholdInPercentage));
+        updateColumns.put("non_wifi_time", new Atom<>(nonWifiThresholdTimeInSeconds));
+
+
         Row row = new Row(updateColumns);
         operations.add(new Insert(wifiRrmConfigDbTable, row));
 
@@ -229,8 +224,17 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
         return AutoOrManualValue.createManualInstance(equipmentValue);
     }
 
-    void processNewChannelsRequest(OvsdbClient ovsdbClient, Map<RadioType, Integer> backupChannelMap,
+    // For cell size related attributes, the “manual" mode is not supported any more,
-            Map<RadioType, Integer> primaryChannelMap) {
+    // 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) {
 
         LOG.info("OvsdbDao::processNewChannelsRequest backup {} primary {}", backupChannelMap, primaryChannelMap);
         try {
@@ -319,7 +323,7 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
 
                 Map<String, Value> updateRadioColumns = new HashMap<>();
                 Integer txPower = cellSizeAttributes.getEirpTxPowerDb();
-                if (txPower > 0) {
+                if (txPower != null && txPower > 0) {
                     updateRadioColumns.put("tx_power", new Atom<>(txPower));
                 } else {
                     updateRadioColumns.put("tx_power", new com.vmware.ovsdb.protocol.operation.notation.Set());
@@ -340,8 +344,7 @@ 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() +
+                    throw new RuntimeException("processCellSizeAttributesRequest " + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
-                            " " + ((ErrorResult) res).getDetails());
                 }
             }
 

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

@@ -227,8 +227,9 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         customOptions.put("rts_threshold", String.valueOf(rtsCtsThreshold));
     }
 
-    void configureCustomOptionsForUseRadiusProxy(boolean useRadiusProxy, Map<String, String> customOptions) {
+    void configureCustomOptionsForUseRadiusProxyAndHotspot(boolean useRadiusProxy, boolean enableProxyArpForHotspot, Map<String, String> customOptions) {
         customOptions.put("radproxy", useRadiusProxy ? "1" : "0");
+        customOptions.put("proxy_arp", enableProxyArpForHotspot ? "1" : "0");
     }
 
     /**
@@ -251,13 +252,14 @@ 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) {
+            String radiusOperatorName, Map<String, Value> updateColumns, int dynamicVlan, Boolean useRadiusProxy, Boolean enableProxyArpForHotspot) {
         Map<String, String> customOptions = new HashMap<>();
 
-        configureCustomOptionsForUseRadiusProxy(useRadiusProxy, customOptions);
+        configureCustomOptionsForUseRadiusProxyAndHotspot(useRadiusProxy, enableProxyArpForHotspot, customOptions);
 
         configureCustomOptionsForRatesAndLimits(rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, customOptions);
 
@@ -277,7 +279,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) {
+            String greTunnelName, int dynamicVlan, Boolean useRadiusProxy, List<Operation> operations, Boolean enableProxyArpForHotspot) {
 
         Map<String, Value> updateColumns = new HashMap<>();
         // If we are doing a NAT SSID, no bridge, else yes
@@ -334,7 +336,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);
+                rtsCtsThreshold, dtimPeriod, radiusNasId, radiusNasIp, radiusOperatorName, updateColumns, dynamicVlan, useRadiusProxy, enableProxyArpForHotspot);
         updateBlockList(updateColumns, macBlockList);
         Row row = new Row(updateColumns);
         operations.add(new Insert(wifiVifConfigDbTable, row));
@@ -550,11 +552,15 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 if (ssidConfig.getUseRadiusProxy() != null) {
                     useRadiusProxy = ssidConfig.getUseRadiusProxy();
                 }
+                boolean enableProxyArpForHotspot = false;
+                if (ssidConfig.getEnableProxyArpForHotspot() != null) {
+                    enableProxyArpForHotspot = false;
+                }
                 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);
+                            walledGardenAllowlist, radiusNasId, radiusNasIp, radiusOperName, greTunnelName, dynamicVlan, useRadiusProxy, operations, enableProxyArpForHotspot);
 
                     networkConfig.configureInetVifInterface(ovsdbClient, ifName, enabled, ssidConfig.getForwardMode(), operations);
 
@@ -775,15 +781,10 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
             RadiusServer rServer = profileDetails.getPrimaryRadiusAccountingServer();
             if (rServer != null) {
-                if (ssidConfig.getUseRadiusProxy()) {
-                    security.put("radius_acct_ip", "127.0.0.1");
-                    security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
-                    security.put("radius_acct_secret", "secret");
-                } else {
                 security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
                 security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
                 security.put("radius_acct_secret", rServer.getSecret());
-                }
+
                 if (ssidConfig.getRadiusAcountingServiceInterval() != null && ssidConfig.getRadiusAcountingServiceInterval() > 0) {
                     // if the value is present, use the
                     // radius_acct_interval
@@ -816,18 +817,11 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             Profile profileRadius = radiusProfileList.get(0);
             RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
             RadiusServer radiusServer = profileDetails.getPrimaryRadiusAuthServer();
-            if (ssidConfig.getUseRadiusProxy()) {
-                security.put("radius_server_ip", "127.0.0.1");
-                security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
-                security.put("radius_server_secret", "secret");
-            } else {
             security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
             security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
             security.put("radius_server_secret", radiusServer.getSecret());           
-            }
             LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
                     security.get("radius_server_port"), security.get("radius_server_secret"));
-
         } else {
             LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles());
         }
@@ -870,28 +864,34 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 case "wpa2OnlyEAP":
                 case "wpa2OnlyRadius":
                     security.put("mode", "2");
+                    if (!ssidConfig.getUseRadiusProxy()) {
                         getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
                         getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                     break;
                 case "wpa3OnlyEAP":
                     security.put("mode", "3");
+                    if (!ssidConfig.getUseRadiusProxy()) {
                         getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
                         getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-
+                    }
                     break;
                 case "wpa2EAP":
                 case "wpa2Radius":
                 case "wpa3MixedEAP":
                     security.put("mode", "mixed");
+                    if (!ssidConfig.getUseRadiusProxy()) {
                         getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
                         getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-
+                    }
                     break;
                 case "wpaEAP":
                 case "wpaRadius":
                     security.put("mode", "1");
+                    if (!ssidConfig.getUseRadiusProxy()) {
                         getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
                         getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                     break;
             }
         }