Merge pull request #62 from Telecominfraproject/WIFI-2079-master

[WIFI-2079] change survey_interval_ms from 50ms to 120ms

opensync-ext-cloud/pom.xml

@@ -1,141 +1,139 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-ext-cloud</artifactId>
 	<name>opensync-ext-cloud</name>
 	<description>Configuration interface that provides config from the cloud services.</description>
 	<dependencies>
-<!-- 		<dependency> -->
+		<dependency>
-<!-- 			<groupId>com.telecominfraproject.wlan</groupId> -->
+			<groupId>com.telecominfraproject.wlan</groupId>
-<!-- 			<artifactId>opensync-ext-interface</artifactId> -->
+			<artifactId>opensync-ext-interface</artifactId>
-<!-- 			<version>0.0.1-SNAPSHOT</version> -->
+			<version>1.3.0-SNAPSHOT</version>
-<!-- 		</dependency> -->
+		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.3.0-SNAPSHOT</version>
 		</dependency>
  	 
         <dependency>
             <artifactId>base-client</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>1.3.0-SNAPSHOT</version>
         </dependency>
 
       <dependency>
         <artifactId>equipment-gateway-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>
      
       <dependency>
         <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>profile-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>portal-user-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>service-metric-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>status-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
  
        <dependency>
         <artifactId>firmware-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>manufacturer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>      
  
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
       </dependency>     
 
 	</dependencies>

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

@@ -5,14 +5,23 @@ import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalField;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -25,6 +34,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;
@@ -33,11 +46,11 @@ import com.telecominfraproject.wlan.client.session.models.AssociationState;
 import com.telecominfraproject.wlan.client.session.models.ClientDhcpDetails;
 import com.telecominfraproject.wlan.client.session.models.ClientSession;
 import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
-import com.telecominfraproject.wlan.client.session.models.ClientSessionMetricDetails;
 import com.telecominfraproject.wlan.core.model.entity.CountryCode;
 import com.telecominfraproject.wlan.core.model.equipment.EquipmentType;
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
+import com.telecominfraproject.wlan.core.model.equipment.WiFiSessionUtility;
 import com.telecominfraproject.wlan.core.model.pagination.PaginationContext;
 import com.telecominfraproject.wlan.core.model.pagination.PaginationResponse;
 import com.telecominfraproject.wlan.customer.models.Customer;
@@ -72,7 +85,7 @@ import com.telecominfraproject.wlan.opensync.external.integration.models.Opensyn
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPVIFState;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAWLANNode;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncWifiAssociatedClients;
-import com.telecominfraproject.wlan.opensync.external.integration.utils.MqttStatsPublisher;
+import com.telecominfraproject.wlan.opensync.external.integration.utils.StatsPublisherInterface;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.enumerations.DhcpFpDeviceType;
 import com.telecominfraproject.wlan.opensync.util.OvsdbStringConstants;
 import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
@@ -99,6 +112,7 @@ import com.telecominfraproject.wlan.status.equipment.models.EquipmentProtocolSta
 import com.telecominfraproject.wlan.status.equipment.models.EquipmentUpgradeState;
 import com.telecominfraproject.wlan.status.equipment.models.EquipmentUpgradeState.FailureReason;
 import com.telecominfraproject.wlan.status.equipment.models.EquipmentUpgradeStatusData;
+import com.telecominfraproject.wlan.status.equipment.models.LedStatus;
 import com.telecominfraproject.wlan.status.equipment.models.VLANStatusData;
 import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSID;
 import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSIDs;
@@ -111,16 +125,17 @@ import com.telecominfraproject.wlan.status.models.StatusCode;
 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.ApcElectionEvent.ApcMode;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
 
 import sts.OpensyncStats.Report;
-import traffic.NetworkMetadata.FlowReport;
-import wc.stats.IpDnsTelemetry.WCStatsReport;
 
 @org.springframework.context.annotation.Profile("opensync_cloud_config")
 @Component
 public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegrationInterface {
 
+    protected static final String standard_linux_date_format = "EEE MMM dd HH:mm:ss zzz yyyy";
+
     private static final Logger LOG = LoggerFactory.getLogger(OpensyncExternalIntegrationCloud.class);
 
     @Autowired
@@ -142,7 +157,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
     @Autowired
     private FirmwareServiceInterface firmwareServiceInterface;
     @Autowired
-    private MqttStatsPublisher mqttMessageProcessor;
+    private StatsPublisherInterface statsPublisherInterface;
+    @Autowired
+    private AlarmServiceInterface alarmServiceInterface;
 
     @Autowired
     private OpensyncCloudGatewayController gatewayController;
@@ -210,14 +227,13 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                         && customer.getDetails().getAutoProvisioning().isEnabled()) {
                     locationId = customer.getDetails().getAutoProvisioning().getLocationId();
                 }
-
                 try {
-                    Location location = locationServiceInterface.get(locationId);
+                    Location location = locationServiceInterface.getOrNull(locationId);
-                    ce.setLocationId(location.getId());
+                    if (location != null)
+                        ce.setLocationId(location.getId());
                 } catch (Exception e) {
                     LOG.error("Cannot auto-provision equipment because customer location with id {} cannot be found", locationId);
                     throw new IllegalStateException("Cannot auto-provision equipment because customer location cannot be found : " + locationId);
-
                 }
 
                 ce.setSerial(connectNodeInfo.serialNumber);
@@ -246,7 +262,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                     }
                     if (!radioType.equals(RadioType.UNSUPPORTED)) {
                         advancedRadioConfiguration = RadioConfiguration.createWithDefaults(radioType);
-
                         advancedRadioMap.put(radioType, advancedRadioConfiguration);
                         radioConfiguration = ElementRadioConfiguration.createWithDefaults(radioType);
                         radioMap.put(radioType, radioConfiguration);
@@ -287,6 +302,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) {
@@ -398,21 +414,35 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
             ovsdbSession.setRoutingId(equipmentRoutingRecord.getId());
             ovsdbSession.setEquipmentId(ce.getId());
-            ovsdbSession.setCustomerId(ce.getCustomerId());
 
             LOG.debug("Equipment {}", ce);
             LOG.info("AP {} got connected to the gateway", apId);
             LOG.info("ConnectNodeInfo {}", connectNodeInfo);
 
-            if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY)) {
+            if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY) && connectNodeInfo.versionMatrix.containsKey("DATE")) {
-                reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY), connectNodeInfo.model);
+                // The AP uses standard linux date format. So the format would be:
+                // root@OpenAp-0498b5:~# date
+                // Tue Aug 3 14:55:28 UTC 2021
+                DateFormat dateFormat = new SimpleDateFormat(standard_linux_date_format, Locale.ENGLISH);
+                String dateString = connectNodeInfo.versionMatrix.get("DATE").strip();
+                try {
+                    Date date = dateFormat.parse(dateString);
+                    reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY),
+                            connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_INACTIVE_KEY), date.getTime(), connectNodeInfo.model,
+                            connectNodeInfo.firmwareVersion);
+                } catch (java.text.ParseException p) {
+                    LOG.info("Could not parse release date {} from AP fw, set date to EPOCH start value.", dateString, Instant.EPOCH);
+                    reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY),
+                            connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_INACTIVE_KEY), Instant.EPOCH.getLong(ChronoField.INSTANT_SECONDS), connectNodeInfo.model,
+                            connectNodeInfo.firmwareVersion);
+                }
             } else {
                 LOG.info("Cloud based firmware upgrade is not supported for this AP");
             }
 
         } catch (Exception e) {
             LOG.error("Could not process connection from AP {}", apId, e);
-            throw e;
+            throw new RuntimeException(e);
         }
 
     }
@@ -493,7 +523,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
     private void updateApStatus(Equipment ce, ConnectNodeInfo connectNodeInfo) {
 
         try {
-
             Status statusRecord = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(), StatusDataType.EQUIPMENT_ADMIN);
             if (statusRecord == null) {
                 statusRecord = new Status();
@@ -504,6 +533,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             }
 
             ((EquipmentAdminStatusData) statusRecord.getDetails()).setStatusCode(StatusCode.normal);
+            if (((EquipmentAdminStatusData) statusRecord.getDetails()).getLedStatus() == null) {
+                ((EquipmentAdminStatusData) statusRecord.getDetails()).setLedStatus(LedStatus.UNKNOWN);
+            }
             // Update the equipment admin status
             statusRecord = statusServiceInterface.update(statusRecord);
 
@@ -542,8 +574,12 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             protocolStatusData.setBaseMacAddress(MacAddress.valueOf(connectNodeInfo.macAddress));
             protocolStatusData.setCloudCfgDataVersion(42L);
             protocolStatusData.setReportedCfgDataVersion(42L);
-            protocolStatusData.setCountryCode("CA");
+            CountryCode countryCode = Location.getCountryCode(locationServiceInterface.getOrNull(ce.getLocationId()));
-            protocolStatusData.setReportedCC(CountryCode.CA);
+            if (countryCode != null)
+                protocolStatusData.setCountryCode(countryCode.getName());
+            if (connectNodeInfo.country != null) {
+                protocolStatusData.setReportedCC(CountryCode.getByName(connectNodeInfo.country));
+            }
             protocolStatusData.setReportedHwVersion(connectNodeInfo.platformVersion);
             if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY)) {
                 protocolStatusData.setReportedSwVersion(connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY));
@@ -717,102 +753,97 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
     }
 
-    private void reconcileFwVersionToTrack(Equipment ce, String reportedFwVersionFromAp, String model) {
+    void reconcileFwVersionToTrack(Equipment ce, String activeFirmwareImageAp, String inactiveFirmwareImageAp, Long activeFwReleaseDate, String model,
-
+            String firmwareVersion) {
-        LOG.debug("reconcileFwVersionToTrack for AP {} with active firmware version {} model {}", ce.getInventoryId(), reportedFwVersionFromAp, model);
-        Status statusRecord = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(), StatusDataType.FIRMWARE);
 
+        LOG.debug("reconcileFwVersionToTrack for AP {} with active firmware version {} model {}", ce.getInventoryId(), activeFirmwareImageAp, model);
+        Status statusRecord = statusServiceInterface.getOrNull(autoProvisionedCustomerId, autoProvisionedCustomerId, StatusDataType.FIRMWARE);
+        if (statusRecord == null) {
+            statusRecord = new Status();
+            statusRecord.setCreatedTimestamp(System.currentTimeMillis());
+            statusRecord.setCustomerId(ce.getCustomerId());
+            statusRecord.setEquipmentId(ce.getId());
+            statusRecord.setStatusDataType(StatusDataType.FIRMWARE);
+            statusRecord.setDetails(new EquipmentUpgradeStatusData());
+            ((EquipmentUpgradeStatusData) statusRecord.getDetails()).setActiveSwVersion(activeFirmwareImageAp);
+            if (inactiveFirmwareImageAp != null) {
+                ((EquipmentUpgradeStatusData) statusRecord.getDetails()).setActiveSwVersion(inactiveFirmwareImageAp);
+            }
+        }
         EquipmentUpgradeStatusData fwUpgradeStatusData = (EquipmentUpgradeStatusData) statusRecord.getDetails();
+        fwUpgradeStatusData.setActiveSwVersion(firmwareVersion);
+        fwUpgradeStatusData.setAlternateSwVersion(inactiveFirmwareImageAp);
 
         // default track settings for firmware
         CustomerFirmwareTrackSettings trackSettings = firmwareServiceInterface.getDefaultCustomerTrackSetting();
 
         // check for updated/modified track settings for this customer
         CustomerFirmwareTrackRecord custFwTrackRecord = firmwareServiceInterface.getCustomerFirmwareTrackRecord(ce.getCustomerId());
-
+        if (custFwTrackRecord != null)
-        long trackRecordId = -1;
-        if (custFwTrackRecord != null) {
             trackSettings = custFwTrackRecord.getSettings();
-            trackRecordId = custFwTrackRecord.getTrackRecordId();
+
-        }
         // determine if AP requires FW upgrade before cloud
         // connection/provision
         if (trackSettings.getAutoUpgradeDeprecatedOnBind().equals(TrackFlag.ALWAYS) || trackSettings.getAutoUpgradeUnknownOnBind().equals(TrackFlag.ALWAYS)) {
-
             LOG.debug("reconcileFwVersionToTrack for AP {} track flag for auto-upgrade {}", ce.getInventoryId(),
                     trackSettings.getAutoUpgradeDeprecatedOnBind());
-
             // check the reported fw version for the AP, if it is < than
             // the default version for the cloud, then download and
             // flash the firmware before proceeding.
             // then return;
             FirmwareTrackRecord fwTrackRecord = null;
-            if (trackRecordId == -1) {
+            if (custFwTrackRecord == null) {
                 // take the default
                 fwTrackRecord = firmwareServiceInterface.getFirmwareTrackByName(FirmwareTrackRecord.DEFAULT_TRACK_NAME);
-
             } else {
                 // there must be a customer one
-                fwTrackRecord = firmwareServiceInterface.getFirmwareTrackById(trackRecordId);
+                fwTrackRecord = firmwareServiceInterface.getFirmwareTrackById(custFwTrackRecord.getTrackRecordId());
             }
-
             if (fwTrackRecord != null) {
-
                 LOG.debug("reconcileFwVersionToTrack for AP {} firmwareTrackRecord {}", ce.getInventoryId(), fwTrackRecord);
-
+                Optional<FirmwareTrackAssignmentDetails> assignmentDetails = firmwareServiceInterface.getFirmwareTrackAssignments(fwTrackRecord.getTrackName())
-                List<FirmwareTrackAssignmentDetails> fwTrackAssignmentDetails =
+                        .stream().filter(new Predicate<FirmwareTrackAssignmentDetails>() {
-                        firmwareServiceInterface.getFirmwareTrackAssignments(fwTrackRecord.getTrackName());
+                            @Override
-
+                            public boolean test(FirmwareTrackAssignmentDetails t) {
-                String targetFwVersionNameForTrack = null;
+                                // AP may report type as UPPER case
-
+                                return model.equalsIgnoreCase(t.getModelId());
-                if (fwTrackAssignmentDetails != null) {
+                            }
-                    for (FirmwareTrackAssignmentDetails details : fwTrackAssignmentDetails) {
+                        }).findFirst();
-                        if (model.equalsIgnoreCase(details.getModelId())) {
+                if (assignmentDetails.isPresent()) {
-                            targetFwVersionNameForTrack = details.getVersionName();
+                    FirmwareTrackAssignmentDetails targetFirmwareForTrack = assignmentDetails.get();
-                            break;
+                    if (activeFwReleaseDate == null) {
-                        }
+                        LOG.info("Active FW release date is unknown, firmware upgrade required.");
-                    }
+                        fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
-                }
+                        fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.out_of_date);
-
+                        statusRecord.setDetails(fwUpgradeStatusData);
-                if (targetFwVersionNameForTrack == null) {
+                        statusRecord = statusServiceInterface.update(statusRecord);
-                    LOG.info("No target FW version for this track {}", fwTrackRecord);
+                        triggerFwDownload(ce, fwUpgradeStatusData, trackSettings);
-
+                    } else {
-                } else {
+                        Date activeReleaseDate = new Date(activeFwReleaseDate);
-                    LOG.debug("reconcileFwVersionToTrack for AP {} targetFwVersion for track {}", ce.getInventoryId(), targetFwVersionNameForTrack);
+                        Date targetReleaseDate = new Date(targetFirmwareForTrack.getReleaseDate());
-
+                        if (activeReleaseDate.after(targetReleaseDate) || activeReleaseDate.equals(targetReleaseDate)) {
-                    if (reportedFwVersionFromAp != null) {
+                            LOG.info("Active FW release date {} is more recent than or equal to the target firmware release date {}, no upgrade required.",
-                        if (!targetFwVersionNameForTrack.equals(reportedFwVersionFromAp)) {
+                                    activeReleaseDate, targetReleaseDate);
-                            LOG.debug(
+                            fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.up_to_date);
-                                    "reconcileFwVersionToTrack for AP {} targetFwVersion {} doesn't match reported fw version {}, triggering download and flash",
+                            fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
-                                    ce.getInventoryId(), targetFwVersionNameForTrack, reportedFwVersionFromAp);
+                            statusRecord.setDetails(fwUpgradeStatusData);
-
+                            statusRecord = statusServiceInterface.update(statusRecord);
-                            fwUpgradeStatusData.setTargetSwVersion(targetFwVersionNameForTrack);
+                        } else {
+                            LOG.info("Active FW release date {} is earlier than target firmware release date {}, firmware upgrade required.", activeReleaseDate,
+                                    targetReleaseDate);
+                            fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
                             fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.out_of_date);
                             statusRecord.setDetails(fwUpgradeStatusData);
                             statusRecord = statusServiceInterface.update(statusRecord);
                             triggerFwDownload(ce, fwUpgradeStatusData, trackSettings);
-                        } else if (targetFwVersionNameForTrack.equals(reportedFwVersionFromAp)) {
-                            LOG.debug("reconcileFwVersionToTrack for AP {} targetFwVersion {} is active", ce.getInventoryId(), targetFwVersionNameForTrack);
-
-                            fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.up_to_date);
-                            fwUpgradeStatusData.setActiveSwVersion(targetFwVersionNameForTrack);
-                            fwUpgradeStatusData.setAlternateSwVersion(targetFwVersionNameForTrack);
-                            fwUpgradeStatusData.setTargetSwVersion(targetFwVersionNameForTrack);
-
-                            statusRecord.setDetails(fwUpgradeStatusData);
-                            statusRecord = statusServiceInterface.update(statusRecord);
-
                         }
                     }
-
+                } else {
+                    LOG.info("No firmware assignment present in track for AP model {}. Auto-upgrade of firmware is not possible for this node.", model);
                 }
-
             }
-
+        } else {
-        } else
+            LOG.info("Automatic firmware upgrade is not configured for track {}", trackSettings);
-
-        {
-            LOG.debug("Automatic firmware upgrade is not configured for track {}", trackSettings);
         }
     }
 
@@ -880,6 +911,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());
@@ -944,11 +989,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             if (ovsdbSession == null) {
                 throw new IllegalStateException("AP is not connected " + apId);
             }
-            int customerId = ovsdbSession.getCustomerId();
             Equipment equipmentConfig = equipmentServiceInterface.getByInventoryIdOrNull(apId);
             if (equipmentConfig == null) {
                 throw new IllegalStateException("Cannot retrieve configuration for " + apId);
             }
+            int customerId = equipmentConfig.getCustomerId();
 
             ret = new OpensyncAPConfig();
 
@@ -1024,7 +1069,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             if ((blockedClients != null) && !blockedClients.isEmpty()) {
                 blockedClients.forEach(client -> blockList.add(client.getMacAddress()));
             }
-            
+
             ret.setBlockedClients(blockList);
             ret.setRadiusProfiles(new ArrayList<>(radiusSet));
 
@@ -1037,21 +1082,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         return ret;
     }
 
-    @Override
-    public void processMqttMessage(String topic, Report report) {
-        mqttMessageProcessor.processMqttMessage(topic, report);
-    }
-
-    @Override
-    public void processMqttMessage(String topic, FlowReport flowReport) {
-        mqttMessageProcessor.processMqttMessage(topic, flowReport);
-    }
-
-    @Override
-    public void processMqttMessage(String topic, WCStatsReport wcStatsReport) {
-        mqttMessageProcessor.processMqttMessage(topic, wcStatsReport);
-    }
-
     @Override
     public void wifiVIFStateDbTableUpdate(List<OpensyncAPVIFState> vifStateTables, String apId) {
         LOG.debug("Received Wifi_VIF_State table update for AP {}", apId);
@@ -1063,20 +1093,22 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             return;
         }
 
-        int customerId = ovsdbSession.getCustomerId();
         long equipmentId = ovsdbSession.getEquipmentId();
 
-        if ((customerId < 0) || (equipmentId < 0)) {
-            LOG.debug("wifiVIFStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
-            return;
-        }
-
         Equipment apNode = equipmentServiceInterface.getOrNull(equipmentId);
         if (apNode == null) {
             LOG.debug("wifiVIFStateDbTableUpdate::Cannot get EquipmentId for AP {}", apId);
             return; // we don't have the required info to get the
             // radio type yet
         }
+
+        int customerId = apNode.getCustomerId();
+
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.debug("wifiVIFStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
+
         ApElementConfiguration apElementConfig = (ApElementConfiguration) apNode.getDetails();
 
         ProfileContainer profileContainer = new ProfileContainer(profileServiceInterface.getProfileWithChildren(apNode.getProfileId()));
@@ -1200,20 +1232,19 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             return;
         }
 
-        int customerId = ovsdbSession.getCustomerId();
         long equipmentId = ovsdbSession.getEquipmentId();
-
-        if ((customerId < 0) || (equipmentId < 0)) {
-            LOG.debug("wifiRadioStatusDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
-            return;
-        }
-
         Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
         if (ce == null) {
             LOG.debug("wifiRadioStatusDbTableUpdate::Cannot get Equipment for AP {}", apId);
             return;
         }
 
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.debug("wifiRadioStatusDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
+
         ApElementConfiguration apElementConfiguration = ((ApElementConfiguration) ce.getDetails());
 
         boolean configStateMismatch = false;
@@ -1287,6 +1318,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 LOG.debug("Protocol Status reportedCC {} radioStatus.getCountry {} radioStatus CountryCode fromName {}", protocolStatusData.getReportedCC(),
                         radioState.getCountry(), CountryCode.getByName((radioState.getCountry())));
                 protocolStatusData.setReportedCC(CountryCode.getByName((radioState.getCountry())));
+                protocolStatusData.setCountryCode(radioState.getCountry());
                 protocolStatus.setDetails(protocolStatusData);
 
             } else {
@@ -1307,6 +1339,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             channelStatus.setDetails(channelStatusData);
         }
         ((EquipmentChannelStatusData) channelStatus.getDetails()).getChannelNumberStatusDataMap().put(radioState.getFreqBand(), radioState.getChannel());
+        ((EquipmentChannelStatusData) channelStatus.getDetails()).getTxPowerDataMap().put(radioState.getFreqBand(), radioState.getTxPower());
         return channelStatus;
     }
 
@@ -1424,20 +1457,17 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             return;
         }
 
-        int customerId = ovsdbSession.getCustomerId();
         long equipmentId = ovsdbSession.getEquipmentId();
-
-        if ((customerId < 0) || (equipmentId < 0)) {
-            LOG.debug("wifiInetStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
-            return;
-        }
-
         Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
-
         if (ce == null) {
             LOG.debug("wifiInetStateDbTableUpdate Cannot get customer Equipment for {}", apId);
             return;
         }
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.debug("wifiInetStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
 
         Status lanStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.LANINFO);
         if (lanStatus == null) {
@@ -1553,21 +1583,17 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             LOG.debug("wifiAssociatedClientsDbTableUpdate::Cannot get Session for AP {}", apId);
             return;
         }
-
-        int customerId = ovsdbSession.getCustomerId();
         long equipmentId = ovsdbSession.getEquipmentId();
-
-        if ((customerId < 0) || (equipmentId < 0)) {
-            LOG.debug("wifiAssociatedClientsDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
-            return;
-        }
-
         Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
-
         if (ce == null) {
             LOG.debug("wifiAssociatedClientsDbTableUpdate Cannot get customer Equipment for {}", apId);
             return;
         }
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.debug("wifiAssociatedClientsDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
 
         if ((wifiAssociatedClients == null) || wifiAssociatedClients.isEmpty()) {
             return;
@@ -1585,17 +1611,13 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             MacAddress macAddress = MacAddress.valueOf(mMac);
 
             Client clientInstance = clientServiceInterface.getOrNull(customerId, macAddress);
-            boolean isReassociation = true;
             if (clientInstance == null) {
-
-                isReassociation = false; // new client
-
                 clientInstance = new Client();
                 clientInstance.setCustomerId(customerId);
                 clientInstance.setMacAddress(MacAddress.valueOf(mMac));
+                clientInstance.setCreatedTimestamp(System.currentTimeMillis());
                 clientInstance.setDetails(new ClientInfoDetails());
                 clientInstance = clientServiceInterface.create(clientInstance);
-
                 LOG.info("Created client from Wifi_Associated_Clients ovsdb table change {}", clientInstance);
             }
 
@@ -1607,30 +1629,20 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 clientSession.setMacAddress(clientInstance.getMacAddress());
                 clientSession.setLocationId(ce.getLocationId());
                 clientSession.setDetails(new ClientSessionDetails());
-                clientSession.getDetails().setSessionId(clientInstance.getMacAddress().getAddressAsLong());
+                long derivedSessionId = WiFiSessionUtility.encodeWiFiAssociationId(timestamp / 1000, clientInstance.getMacAddress().getAddressAsLong());
-                clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(clientInstance.getMacAddress().getAddressAsLong()));
+                clientSession.getDetails().setSessionId(Long.toUnsignedString(derivedSessionId));
-                clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
+                clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(derivedSessionId)));
                 clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
+                clientSession.getDetails().setIsReassociation(false);
                 clientSession.getDetails().setAssocTimestamp(timestamp);
+                clientSessions.add(clientSession);
             } else {
-                if (clientSession.getDetails().getPriorEquipmentId() == null) {
-                    clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
-                }
-                if (clientSession.getDetails().getPriorSessionId() == null) {
-                    clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-                }
-                if (clientSession.getDetails().getLastEventTimestamp() == null || clientSession.getDetails().getLastEventTimestamp() < timestamp) {
-                    clientSession.getDetails().setLastEventTimestamp(timestamp);
-                }
                 if (!clientSession.getDetails().getAssociationState().equals(AssociationState._802_11_Associated)) {
                     clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
                     clientSession.getDetails().setAssocTimestamp(timestamp);
+                    clientSessions.add(clientSession);
                 }
             }
-            clientSession.getDetails().setIsReassociation(isReassociation);
-
-            clientSessions.add(clientSession);
-
         }
 
         if (clientSessions.size() > 0) {
@@ -1650,19 +1662,17 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             return;
         }
 
-        int customerId = ovsdbSession.getCustomerId();
         long equipmentId = ovsdbSession.getEquipmentId();
-
-        if ((customerId < 0) || (equipmentId < 0)) {
-            LOG.info("awlanNodeDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
-            return;
-        }
-
         Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
         if (ce == null) {
             LOG.info("awlanNodeDbTableUpdate::Cannot find AP {}", apId);
             return;
         }
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.info("awlanNodeDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
 
         int upgradeStatusFromAp = node.getUpgradeStatus();
         EquipmentUpgradeState fwUpgradeState = null;
@@ -1736,7 +1746,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
         EquipmentManufacturerQrCode qrCode = new EquipmentManufacturerQrCode();
         if (node.qrCode != null) {
-            qrCode.setDeviceType(EquipmentType.getByName(node.qrCode.get("DT")));
+            if (node.qrCode.containsKey("DT")) {
+                qrCode.setDeviceType(EquipmentType.getByName(node.qrCode.get("DT")));
+            }
             qrCode.setVendorName(node.qrCode.get("VN"));
             if (isValidMACAddress(node.qrCode.get("DM"))) {
                 qrCode.setDeviceMac(MacAddress.valueOf(node.qrCode.get("DM")));
@@ -1875,32 +1887,29 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
         LOG.info("wifiVIFStateDbTableDelete for AP {} rows {}", apId, vifStateTables);
         OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
-
         if (ovsdbSession == null) {
             LOG.debug("wifiVIFStateDbTableDelete::Cannot get Session for AP {}", apId);
             return;
         }
-
-        int customerId = ovsdbSession.getCustomerId();
         long equipmentId = ovsdbSession.getEquipmentId();
-
+        Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
+        if (ce == null) {
+            LOG.debug("wifiVIFStateDbTableDelete Cannot get customer Equipment for {}", apId);
+            return;
+        }
+        int customerId = ce.getCustomerId();
         if ((customerId < 0) || (equipmentId < 0)) {
             LOG.debug("wifiVIFStateDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
             return;
         }
 
         Status activeBssidsStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.ACTIVE_BSSIDS);
-
         if (activeBssidsStatus == null) {
             return; // nothing to delete
-
         }
-
         ActiveBSSIDs statusDetails = (ActiveBSSIDs) activeBssidsStatus.getDetails();
-
         List<ActiveBSSID> bssidList = statusDetails.getActiveBSSIDs();
         List<ActiveBSSID> toBeDeleted = new ArrayList<>();
-        Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
         List<ClientSession> clientSessionsForCustomerAndEquipment = new ArrayList<>();
         if (ce != null) {
             PaginationResponse<ClientSession> clientSessions = clientServiceInterface.getSessionsForCustomer(customerId, ImmutableSet.of(equipmentId),
@@ -1943,15 +1952,17 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             LOG.debug("wifiAssociatedClientsDbTableDelete::Cannot get Session for AP {}", apId);
             return;
         }
-
-        int customerId = ovsdbSession.getCustomerId();
         long equipmentId = ovsdbSession.getEquipmentId();
-
+        Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
+        if (ce == null) {
+            LOG.debug("wifiAssociatedClientsDbTableDelete Cannot get customer Equipment for {}", apId);
+            return;
+        }
+        int customerId = ce.getCustomerId();
         if ((customerId < 0) || (equipmentId < 0)) {
             LOG.debug("wifiAssociatedClientsDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
             return;
         }
-
         Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(deletedClientMac));
         ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(deletedClientMac));
 
@@ -1985,20 +1996,17 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             return;
         }
 
-        int customerId = ovsdbSession.getCustomerId();
         long equipmentId = ovsdbSession.getEquipmentId();
-
-        if ((customerId < 0) || (equipmentId < 0)) {
-            LOG.debug("updateDhcpIpClientFingerprints::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
-            return;
-        }
-
         Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
-
         if (ce == null) {
             LOG.debug("updateDhcpIpClientFingerprints::Cannot get Equipment for AP {}", apId);
             return;
         }
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.debug("updateDhcpIpClientFingerprints::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
 
         long locationId = ce.getLocationId();
 
@@ -2027,31 +2035,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")) {
@@ -2110,15 +2095,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                     if (clientServiceInterface.getOrNull(customerId, clientMacAddress) != null) {
                         LOG.info("Deleting invalid client {}", clientServiceInterface.delete(customerId, clientMacAddress));
                     }
-                } else {
-                    LOG.info("Client {} already exists on the cloud, delete the session for the client if it exists", dhcpLeasedIps);
-                    // In this case, we might have a session, as the client
-                    // already exists on the cloud, update if required
-                    ClientSession session = clientServiceInterface.getSessionOrNull(customerId, equipmentId, clientMacAddress);
-                    if (session != null) {
-                        LOG.info("Delete clientSession that was removed from the Dhcp_Leased_IP table {}",
-                                clientServiceInterface.deleteSession(customerId, equipmentId, clientMacAddress));
-                    }
                 }
             }
         }
@@ -2131,34 +2107,10 @@ 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());
-            }
-            if (session.getDetails().getPriorSessionId() == null) {
-                session.getDetails().setPriorSessionId(session.getDetails().getSessionId());
-            }
-            if (session.getDetails().getLastEventTimestamp() == null || session.getDetails().getLastEventTimestamp() < timestamp) {
-                session.getDetails().setLastEventTimestamp(timestamp);
-            }
-            if (!session.getDetails().getAssociationState().equals(AssociationState._802_11_Associated)) {
-                session.getDetails().setAssociationState(AssociationState._802_11_Associated);
-                session.getDetails().setAssocTimestamp(timestamp);
-            }
         }
+
         if (dhcpLeasedIps.containsKey("fingerprint")) {
             session.getDetails().setApFingerprint(dhcpLeasedIps.get("fingerprint"));
         }
@@ -2213,6 +2165,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         if (dhcpLeasedIps.containsKey("lease_time")) {
             Integer leaseTime = Integer.valueOf(dhcpLeasedIps.get("lease_time"));
             session.getDetails().getDhcpDetails().setLeaseTimeInSeconds(leaseTime);
+            session.getDetails().getDhcpDetails().setLeaseStartTimestamp(session.getDetails().getAssocTimestamp());
         }
 
         if (dhcpLeasedIps.containsKey("gateway")) {
@@ -2326,20 +2279,17 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             return;
         }
 
-        int customerId = ovsdbSession.getCustomerId();
         long equipmentId = ovsdbSession.getEquipmentId();
-
-        if ((customerId < 0) || (equipmentId < 0)) {
-            LOG.debug("clearEquipmentStatus::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
-            return;
-        }
-
         Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
-
         if (ce == null) {
             LOG.debug("clearEquipmentStatus Cannot get customer Equipment for {}", apId);
             return;
         }
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.debug("clearEquipmentStatus::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
 
         List<Status> statusList = new ArrayList<>();
 
@@ -2406,22 +2356,26 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
     @Override
     public void apcStateDbTableUpdate(Map<String, String> apcStateAttributes, String apId, RowUpdateOperation rowUpdateOperation) {
         LOG.info("apcStateDbTableUpdate {} operations on AP {} with values {} ", rowUpdateOperation, apId, apcStateAttributes);
+
         OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
         if (ovsdbSession == null) {
             LOG.info("apcStateDbTableUpdate::Cannot get Session for AP {}", apId);
             return;
         }
-        int customerId = ovsdbSession.getCustomerId();
+
         long equipmentId = ovsdbSession.getEquipmentId();
-        if ((customerId < 0) || (equipmentId < 0)) {
-            LOG.info("apcStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
-            return;
-        }
         Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
         if (ce == null) {
             LOG.info("apcStateDbTableUpdate::Cannot get Equipment for AP {}", apId);
             return;
         }
+
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.info("apcStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
+
         InetAddress drIpAddr = null;
         InetAddress bdrIpAddr = null;
         try {
@@ -2435,6 +2389,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) {
@@ -2443,13 +2398,76 @@ 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());
-        mqttMessageProcessor.publishSystemEventFromTableStateMonitor(electionEvent);
+        statsPublisherInterface.publishSystemEventFromTableStateMonitor(electionEvent);
+    }
+
+    @Override
+    public void nodeStateDbTableUpdate(List<Map<String, String>> nodeStateAttributes, String apId) {
+        LOG.debug("start nodeStateDbTableUpdate for {}", apId);
+        if (LOG.isTraceEnabled())
+            LOG.trace("nodeStateDbTableUpdate tableAttributes {}", nodeStateAttributes);
+
+        OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
+        if (ovsdbSession == null) {
+            LOG.warn("nodeStateDbTableUpdate::Cannot get Session for AP {}", apId);
+            return;
+        }
+
+        long equipmentId = ovsdbSession.getEquipmentId();
+        Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
+        if (ce == null) {
+            LOG.warn("nodeStateDbTableUpdate::Cannot get Equipment for AP {}", apId);
+            return;
+        }
+
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.warn("nodeStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
+
+        Status eqAdminStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.EQUIPMENT_ADMIN);
+
+        LedStatus ledStatus = null;
+        for (Map<String, String> nsa : nodeStateAttributes) {
+            if (nsa.get("module").equals("led")) {
+                if (nsa.get("key").equals("led_blink") && nsa.get("value").equals("on")) {
+                    ledStatus = LedStatus.led_blink;
+                } else if (nsa.get("key").equals("led_off") && nsa.get("value").equals("off")) {
+                    ledStatus = LedStatus.led_off;
+                } else {
+                    ledStatus = LedStatus.UNKNOWN;
+                }
+            }
+        }
+
+        if (ledStatus != null) {
+            if (eqAdminStatus != null) {
+                if (((EquipmentAdminStatusData) eqAdminStatus.getDetails()).getLedStatus() == null
+                        || !((EquipmentAdminStatusData) eqAdminStatus.getDetails()).getLedStatus().equals(ledStatus)) {
+                    ((EquipmentAdminStatusData) eqAdminStatus.getDetails()).setLedStatus(ledStatus);
+                    eqAdminStatus = statusServiceInterface.update(eqAdminStatus);
+                    LOG.debug("nodeStateDbTableUpdate updated status {}", eqAdminStatus);
+                }
+            }
+        }
+
+        LOG.debug("finished nodeStateDbTableUpdate for {}", apId);
+
+    }
+
+    @Override
+    public void processMqttMessage(String topic, Report report) {
+        statsPublisherInterface.processMqttMessage(topic, report);
     }
 }

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;
@@ -24,6 +25,7 @@ import org.springframework.security.web.bind.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.telecominfraproject.wlan.core.client.PingClient;
@@ -32,6 +34,7 @@ import com.telecominfraproject.wlan.core.model.service.GatewayType;
 import com.telecominfraproject.wlan.core.model.service.ServiceInstanceInformation;
 import com.telecominfraproject.wlan.core.server.container.ConnectorProperties;
 import com.telecominfraproject.wlan.datastore.exceptions.DsEntityNotFoundException;
+import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWBaseCommand;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWBlinkRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWChangeRedirectorHost;
@@ -42,11 +45,13 @@ import com.telecominfraproject.wlan.equipmentgateway.models.CEGWConfigChangeNoti
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWFirmwareDownloadRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWFirmwareFlashRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWNewChannelRequest;
+import com.telecominfraproject.wlan.equipmentgateway.models.CEGWCellSizeAttributesRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRadioResetRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRebootRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRouteCheck;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWStartDebugEngine;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWStopDebugEngine;
+import com.telecominfraproject.wlan.equipmentgateway.models.CEGatewayCommand;
 import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommand;
 import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommandResponse;
 import com.telecominfraproject.wlan.equipmentgateway.models.GatewayDefaults;
@@ -147,19 +152,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;
                 }
 
@@ -199,30 +201,35 @@ 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));
                         break;
+                    case CellSizeAttributesRequest:
+                        ret.add(sendCellSizeRequest(session, (CEGWCellSizeAttributesRequest) command));
+                        break;
+//                    case MostRecentStatsTimestamp:
+//                        ret.add(sendGetMostRecentStatsTimestampRequest(command, inventoryId));
+//                        break;
                     default:
                         LOG.warn("[{}] Failed to deliver command {}, unsupported command type", inventoryId, command);
-                        ret.add(new EquipmentCommandResponse(
+                        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);
     }
 
@@ -242,6 +249,8 @@ public class OpensyncCloudGatewayController {
     public GatewayDefaults retrieveGatewayDefaults() {
         return new GatewayDefaults();
     }
+    
+
 
     /**
      * Verify a route to customer equipment
@@ -254,19 +263,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("[E:{} R:{}] Stale routing entry ({}) detected", 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);
     }
@@ -276,20 +284,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);
     }
 
@@ -297,6 +302,10 @@ public class OpensyncCloudGatewayController {
         return sendMessage(session, command.getInventoryId(), command);
     }
 
+    private EquipmentCommandResponse sendCellSizeRequest(OvsdbSession session, CEGWCellSizeAttributesRequest command) {
+        return sendMessage(session, command.getInventoryId(), command);
+    }
+
     /**
      * Deliver a message in payload to the CE
      *
@@ -308,15 +317,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);
@@ -331,7 +342,13 @@ public class OpensyncCloudGatewayController {
             Map<RadioType, Integer> newBackupChannels = request.getNewBackupChannels();
             Map<RadioType, Integer> newPrimaryChannels = request.getNewPrimaryChannels();
 
-            String resultDetails = tipwlanOvsdbClient.processNewChannelsRequest(inventoryId, newBackupChannels,newPrimaryChannels);
+            String resultDetails = tipwlanOvsdbClient.processNewChannelsRequest(inventoryId, newBackupChannels, newPrimaryChannels);
+            response.setResultDetail(resultDetails);
+        } else if (command instanceof CEGWCellSizeAttributesRequest) {
+            CEGWCellSizeAttributesRequest request = (CEGWCellSizeAttributesRequest) command;
+            Map<RadioType, CellSizeAttributes> cellSizeAttributeMap = request.getCellSizeAttributesMap();
+
+            String resultDetails = tipwlanOvsdbClient.processCellSizeAttributesRequest(inventoryId, cellSizeAttributeMap);
             response.setResultDetail(resultDetails);
 
         } else if (command instanceof CEGWFirmwareDownloadRequest) {
@@ -342,8 +359,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);
 
@@ -355,15 +371,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;
@@ -387,10 +403,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;
@@ -408,15 +423,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
@@ -449,8 +463,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();
@@ -466,13 +479,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());
             }
         }
     }
@@ -497,8 +508,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());
@@ -509,9 +519,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());
         }
     }
 
@@ -535,14 +544,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;
         }
@@ -560,12 +568,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
@@ -577,13 +583,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;
     }
@@ -596,7 +600,7 @@ public class OpensyncCloudGatewayController {
      * Gateway does not exist, delete the equipmentRouting entry.
      * 
      * @param equipmentId:
-     *            Equipment's ID
+     *        Equipment's ID
      */
     protected void cleanupStaleEqptRoutingRecord(Long equipmentId) {
         LOG.debug("In Clean Up stale Equipment Routing record for Equipment ID {}", equipmentId);
@@ -609,20 +613,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);
                     }
                 }
@@ -631,9 +632,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());
         }
     }
 
@@ -642,8 +644,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;
@@ -651,18 +652,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/RealtimeEventPublisher.java

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

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

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

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

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

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

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

opensync-ext-interface/pom.xml

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

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

@@ -36,12 +36,6 @@ public interface OpensyncExternalIntegrationInterface {
 
     void wifiInetStateDbTableDelete(List<OpensyncAPInetState> inetStateTables, String apId);
 
-    void processMqttMessage(String topic, Report report);
-
-    void processMqttMessage(String topic, FlowReport flowReport);
-
-    void processMqttMessage(String topic, WCStatsReport wcStatsReport);
-
     void wifiAssociatedClientsDbTableUpdate(List<OpensyncWifiAssociatedClients> wifiAssociatedClients, String apId);
 
     void wifiAssociatedClientsDbTableDelete(String deletedClientMac, String apId);
@@ -56,6 +50,10 @@ public interface OpensyncExternalIntegrationInterface {
 
     void apcStateDbTableUpdate(Map<String, String> apcStateAttributes, String apId,
             RowUpdateOperation rowUpdateOperation);
+    
+    void nodeStateDbTableUpdate(List<Map<String, String>> nodeStateAttributes, String apId);
 
     void clearEquipmentStatus(String apId);
+    
+    void processMqttMessage(String topic, Report report);
 }

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

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

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

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

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

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

opensync-ext-static/pom.xml

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

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

@@ -207,4 +207,9 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 
     }
 
+    @Override
+    public void nodeStateDbTableUpdate(List<Map<String, String>> nodeStateAttributes, String apId) {
+        LOG.info("nodeStateDbTableUpdate for AP {}", apId);
+    }
+
 }

opensync-gateway-build/pom.xml

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

opensync-gateway-cloud-docker/pom.xml

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

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

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

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

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

opensync-gateway-cloud-process/pom.xml

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

opensync-gateway-cloud-process/src/main/resources/logback.xml

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

opensync-gateway-static-docker/pom.xml

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

opensync-gateway-static-process/pom.xml

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

opensync-gateway/pom.xml

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

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java

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

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;
@@ -10,6 +11,7 @@ import com.netflix.servo.tag.TagList;
 import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
+import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
 import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface;
 import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface.RowUpdateOperation;
 import com.telecominfraproject.wlan.opensync.external.integration.OvsdbClientInterface;
@@ -26,6 +28,7 @@ import com.vmware.ovsdb.callback.ConnectionCallback;
 import com.vmware.ovsdb.exception.OvsdbClientException;
 import com.vmware.ovsdb.protocol.methods.*;
 import com.vmware.ovsdb.protocol.operation.notation.Row;
+import com.vmware.ovsdb.protocol.operation.notation.Value;
 import com.vmware.ovsdb.service.OvsdbClient;
 import com.vmware.ovsdb.service.OvsdbPassiveConnectionListener;
 import io.netty.handler.ssl.SslContext;
@@ -49,17 +52,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;
@@ -126,8 +125,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);
@@ -188,8 +186,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
                     }
@@ -203,8 +200,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 {
@@ -227,8 +223,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
@@ -248,7 +243,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
 
         if (opensyncAPConfig != null) {
-            ovsdbDao.configureNtpServer(ovsdbClient, opensyncAPConfig);
+            ovsdbDao.configureNode(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
             ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
@@ -265,6 +260,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
                 ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
             }
+            ovsdbDao.enableNetworkProbeForSyntheticClient(ovsdbClient);
             ovsdbDao.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
 
         } else {
@@ -294,6 +290,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);
@@ -316,10 +321,11 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         ovsdbDao.removeAllInetConfigs(ovsdbClient);
         ovsdbDao.removeWifiRrm(ovsdbClient);
         ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
+        ovsdbDao.removeAllStatsConfigs(ovsdbClient);
 
         extIntegrationInterface.clearEquipmentStatus(apId);
-        
+
-        ovsdbDao.configureNtpServer(ovsdbClient, opensyncAPConfig);
+        ovsdbDao.configureNode(ovsdbClient, opensyncAPConfig);
         ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
         ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
         ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
@@ -331,8 +337,15 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
         ovsdbDao.configureInterfaces(ovsdbClient);
         ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
+        
+        ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig);
+        if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
+            ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
+        }
+        ovsdbDao.enableNetworkProbeForSyntheticClient(ovsdbClient);
+        ovsdbDao.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
+        
         LOG.debug("Finished processConfigChanged for {}", apId);
-
     }
 
     @Override
@@ -412,27 +425,24 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         } catch (OvsdbClientException e) {
             LOG.debug("Could not enable monitor for Node_State table. {}", e.getMessage());
         }
-        
+
         try {
             if (ovsdbClient.getSchema(OvsdbDao.ovsdbName).get().getTables().containsKey("APC_State")) {
                 monitorAPCStateTable(ovsdbClient, key);
             }
         } catch (InterruptedException | ExecutionException | OvsdbClientException e) {
-           LOG.debug("Could not enable monitor for APC_State table. {}", e);
+            LOG.debug("Could not enable monitor for APC_State table. {}", e);
         }
         LOG.debug("Finished (re)setting monitors for AP {}", key);
     }
 
     private void monitorDhcpLeasedIpDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
-        CompletableFuture<TableUpdates> awCf = ovsdbClient.monitor(OvsdbDao.ovsdbName,
+        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<>();
@@ -444,8 +454,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
@@ -453,8 +462,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 {
@@ -463,8 +471,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);
 
@@ -497,13 +504,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<>();
@@ -515,8 +519,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
@@ -524,8 +527,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 {
@@ -534,8 +536,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);
 
@@ -567,33 +568,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<>();
 
@@ -610,8 +605,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));
                                 }
                             }
 
@@ -625,20 +619,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<>();
@@ -648,11 +638,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));
                                 }
 
                             }
@@ -669,42 +657,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<>();
@@ -714,14 +693,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));
 
                                 }
 
@@ -746,32 +723,43 @@ 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) -> {
+                    extIntegrationInterface.nodeStateDbTableUpdate(processNodeStateTableUpdate(key, tableUpdates), key);
-                        LOG.info("TableUpdate for {}", key1);
+                    
-                        value.getRowUpdates().values().forEach(r -> {
-                            if (r.getOld() != null) {
-                                LOG.info("Node_State old row {}", r.getOld().getColumns());
-                            }
-                            if (r.getNew() != null) {
-                                LOG.info("Node_State new row {}", r.getNew().getColumns());
-                            }
-                        });
-
-                    });
                 });
-        nsCf.join();
+        extIntegrationInterface.nodeStateDbTableUpdate(processNodeStateTableUpdate(key, nsCf.join()), key);
+    }
+
+    private List<Map<String,String>> processNodeStateTableUpdate(String key, TableUpdates tableUpdates) {
+        List<Map<String, String>> updates = new ArrayList<>();
+        tableUpdates.getTableUpdates().forEach((key1, value) -> {
+            LOG.info("TableUpdate for {}", key1);
+            value.getRowUpdates().values().forEach(r -> {
+                if (r.getOld() != null) {
+                    LOG.info("Node_State old row {}", r.getOld().getColumns());
+                }
+                if (r.getNew() != null) {
+                    LOG.info("Node_State new row {}", r.getNew().getColumns());
+                    Map<String, Value> columns = r.getNew().getColumns();
+                    Map<String, String> update = new HashMap<>();
+                    update.put("key", columns.get("key").toString());
+                    update.put("module", columns.get("module").toString());
+                    update.put("persist", columns.get("persist").toString());
+                    update.put("value", columns.get("value").toString());
+                    updates.add(update);
+                }
+            });
+
+        });
+        
+        return updates;
     }
 
     private void monitorAPCStateTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
-        CompletableFuture<TableUpdates> nsCf = ovsdbClient.monitor(
+        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);
@@ -779,14 +767,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
@@ -836,8 +829,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);
@@ -845,17 +837,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;
         }
     }
 
@@ -900,8 +889,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);
@@ -947,23 +935,34 @@ 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;
         }
     }
 
+    public String processCellSizeAttributesRequest(String apId, Map<RadioType, CellSizeAttributes> cellSizeAttributeMap) {
+        LOG.info("TipWlanOvsdbClient::processCellSizeAttributesRequest for AP {}", apId);
+
+        try {
+            OvsdbSession session = ovsdbSessionMapInterface.getSession(apId);
+            OvsdbClient ovsdbClient = session.getOvsdbClient();
+            ovsdbDao.processCellSizeAttributesRequest(ovsdbClient, cellSizeAttributeMap);
+            LOG.info("TipWlanOvsdbClient::processCellSizeAttributesRequest change cellSizeAttributes for AP {}", apId);
+            return " change cell size attributes for AP " + apId;
+        } catch (Exception e) {
+            LOG.error("TipWlanOvsdbClient::processCellSizeAttributesRequest failed to change cell size attributes for AP {}", apId, e);
+            return "failed to change cell size attributes for AP " + apId;
+        }
+    }
+
 }

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

@@ -9,6 +9,8 @@ import org.springframework.stereotype.Component;
 
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
+import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
+import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
 import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPInetState;
@@ -60,7 +62,7 @@ public class OvsdbDao extends OvsdbDaoBase {
 
     public void configureCommands(OvsdbClient ovsdbClient, String startdebugengineapcommand,
             Map<String, String> payload, long l, long defaultCommandDurationSec) {
-	    ovsdbCommand.configureCommands(ovsdbClient, startdebugengineapcommand, payload, l, defaultCommandDurationSec);
+        ovsdbCommand.configureCommands(ovsdbClient, startdebugengineapcommand, payload, l, defaultCommandDurationSec);
     }
 
     public void configureFirmwareDownload(OvsdbClient ovsdbClient, String apId, String firmwareUrl,
@@ -84,9 +86,20 @@ public class OvsdbDao extends OvsdbDaoBase {
         ovsdbNetwork.configureInterfaces(ovsdbClient);
     }
     
-    public void configureNtpServer(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
+    public void configureNode(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
+        configureNtpServer(ovsdbClient, opensyncAPConfig);
+        configureSyslog(ovsdbClient, opensyncAPConfig);
+        processBlinkRequest(ovsdbClient, opensyncAPConfig.getCustomerEquipment().getInventoryId(),
+                ((ApElementConfiguration) opensyncAPConfig.getCustomerEquipment().getDetails()).isBlinkAllLEDs());
+    }
+    
+    void configureNtpServer(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
         ovsdbNodeConfig.configureNtpServer(ovsdbClient, opensyncAPConfig);
     }
+    
+    void configureSyslog(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
+        ovsdbNodeConfig.configureSyslog(ovsdbClient, opensyncAPConfig);
+    }
 
     public void configureRadsecRadiusAndRealm(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
         ovsdbRadiusProxyConfig.configureRadius(ovsdbClient, opensyncAPConfig);
@@ -180,6 +193,10 @@ public class OvsdbDao extends OvsdbDaoBase {
             Map<RadioType, Integer> primaryChannelMap) {
         ovsdbRrm.processNewChannelsRequest(ovsdbClient, backupChannelMap, primaryChannelMap);
     }
+    
+    public void processCellSizeAttributesRequest(OvsdbClient ovsdbClient, Map<RadioType, CellSizeAttributes> cellSizeAttributeMap) {
+        ovsdbRrm.processCellSizeAttributesRequest(ovsdbClient, cellSizeAttributeMap);
+    }
 
     public void rebootOrResetAp(OvsdbClient ovsdbClient, String ovsdbAwlanApSwitchSoftwareBank) {
         ovsdbNode.rebootOrResetAp(ovsdbClient, ovsdbAwlanApSwitchSoftwareBank);
@@ -224,4 +241,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/OvsdbDaoBase.java

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

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

@@ -576,26 +576,25 @@ public class OvsdbHotspotConfig extends OvsdbDaoBase {
                                 rowColumns.put("access_network_type", new Atom<>(hs2Profile.getAccessNetworkType().getId()));
                             }
                         }
-                        
+
-                        
+
                         // # format: <1-octet encoded value as hex str>
-                        // # (ipv4_type & 0x3f) << 2 | (ipv6_type & 0x3) << 2
+                        // # (ipv4_type & 0x3f) << 2 | (ipv6_type & 0x3) 
                         // 0x3f = 63 in decimal
                         // 0x3 = 3 in decimal
                         if (PasspointIPv6AddressType.getByName(
                                 hs2Profile.getIpAddressTypeAvailability()) != PasspointIPv6AddressType.UNSUPPORTED) {
                             int availability = PasspointIPv6AddressType
                                     .getByName(hs2Profile.getIpAddressTypeAvailability()).getId();
-                            String hexString = Integer.toHexString((availability & 3) << 2);
+                            String hexString = String.format("%02x", (availability & 0x3));
                             rowColumns.put("ipaddr_type_availability", new Atom<>(hexString));
-                        } else if (PasspointIPv4AddressType.getByName(
+                        }else  if (PasspointIPv4AddressType.getByName(
                                 hs2Profile.getIpAddressTypeAvailability()) != PasspointIPv4AddressType.UNSUPPORTED) {
                             int availability = PasspointIPv4AddressType
                                     .getByName(hs2Profile.getIpAddressTypeAvailability()).getId();
-                            String hexString = Integer.toHexString((availability & 63) << 2);
+                            String hexString = String.format("%02x", ((availability & 0x3f) << 2));
                             rowColumns.put("ipaddr_type_availability", new Atom<>(hexString));
-                        }
+                        } 
-
                         Row row = new Row(rowColumns);
 
                         Insert newHs20Config = new Insert(hotspot20ConfigDbTable, row);
@@ -676,8 +675,8 @@ public class OvsdbHotspotConfig extends OvsdbDaoBase {
                             operations.add(newOsuProvider);
                         } else {
                             List<Condition> conditions = new ArrayList<>();
-                            conditions.add(new Condition("server_uri", Function.EQUALS,
+                            conditions.add(new Condition("osu_provider_name", Function.EQUALS,
-                                    new Atom<>(providerProfile.getOsuServerUri())));
+                                    new Atom<>(apOsuProviderName)));
                             Update updatedOsuProvider = new Update(hotspot20OsuProvidersDbTable, conditions, row);
                             operations.add(updatedOsuProvider);
                         }

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

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

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

@@ -238,7 +238,7 @@ public class OvsdbNode extends OvsdbDaoBase {
             }
             fillInLanIpAddressAndMac(ovsdbClient, ret, defaultLanInterfaceType);
 
-            fillInRadioInterfaceNames(ovsdbClient, ret);
+            fillInRadioInterfaceNamesAndCountry(ovsdbClient, ret);
 
         } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);

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

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

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

@@ -1,8 +1,8 @@
+
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
-import com.telecominfraproject.wlan.core.model.equipment.SourceType;
 import com.telecominfraproject.wlan.equipment.models.*;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiRadioConfigInfo;
@@ -14,6 +14,7 @@ import com.vmware.ovsdb.protocol.operation.Operation;
 import com.vmware.ovsdb.protocol.operation.Update;
 import com.vmware.ovsdb.protocol.operation.notation.*;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
+import com.vmware.ovsdb.protocol.schema.DatabaseSchema;
 import com.vmware.ovsdb.service.OvsdbClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -34,154 +35,174 @@ 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<>();
-        for (RadioType radioType : apElementConfiguration.getRadioMap().keySet()) {
+        try {
-            Map<String, String> hwConfig = new HashMap<>();
+            CompletableFuture<DatabaseSchema> cfDatabaseSchema = ovsdbClient.getSchema(ovsdbName);
-            ElementRadioConfiguration elementRadioConfig = apElementConfiguration.getRadioMap().get(radioType);
+            DatabaseSchema databaseSchema = cfDatabaseSchema.get();
-            RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
+            Set<String> columnNames = databaseSchema.getTables().get(wifiRadioConfigDbTable).getColumns().keySet();
-            boolean autoChannelSelection = rfElementConfig.getAutoChannelSelection();
+ 
-            int channel = elementRadioConfig.getActiveChannel(autoChannelSelection);
+            for (RadioType radioType : apElementConfiguration.getRadioMap().keySet()) {
-            LOG.debug("configureWifiRadios autoChannelSelection {} activeChannel {} getChannelNumber {} ",
+                Map<String, String> hwConfig = new HashMap<>();
-                    autoChannelSelection, channel, elementRadioConfig.getChannelNumber());
+                ElementRadioConfiguration elementRadioConfig = apElementConfiguration.getRadioMap().get(radioType);
-            ChannelBandwidth bandwidth = rfElementConfig.getChannelBandwidth();
+                RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
-            String ht_mode = getBandwidth(bandwidth);
+                if (elementRadioConfig == null || rfElementConfig == null) {
-            RadioConfiguration radioConfig = apElementConfiguration.getAdvancedRadioMap().get(radioType);
+                    continue;
-            int beaconInterval = rfElementConfig.getBeaconInterval();
+                }
-            boolean enabled = radioConfig.getRadioAdminState().equals(StateSetting.enabled);
+                boolean autoChannelSelection = rfElementConfig.getAutoChannelSelection();
-            int txPower;
+                int channel = elementRadioConfig.getActiveChannel(autoChannelSelection);
-            if (elementRadioConfig.getEirpTxPower().getSource() == SourceType.profile) {
+                ChannelBandwidth bandwidth = rfElementConfig.getChannelBandwidth();
-                txPower = rfElementConfig.getEirpTxPower();
+                String ht_mode = getBandwidth(bandwidth);
-            } else {
+                RadioConfiguration radioConfig = apElementConfiguration.getAdvancedRadioMap().get(radioType);
-                txPower = elementRadioConfig.getEirpTxPower().getValue();
+                int beaconInterval = rfElementConfig.getBeaconInterval();
-            }
+                boolean enabled = radioConfig.getRadioAdminState().equals(StateSetting.enabled);
-            String hwMode = getHwMode(rfElementConfig);
+                boolean autoCellSizeSelection = rfElementConfig.getAutoCellSizeSelection();
-            String freqBand = getHwConfigAndFreq(radioType, hwConfig);
+                int txPower = 0;
-            String radioName = null;
+                if (autoCellSizeSelection) {
-            for (String key : provisionedRadioConfigs.keySet()) {
+                    if (elementRadioConfig.getEirpTxPower() != null) {
-                if (provisionedRadioConfigs.get(key).freqBand.equals(freqBand)) {
+                        txPower = elementRadioConfig.getEirpTxPower().getValue();
-                    radioName = key;
+                    }
-                    break;
+                } else {
+                    txPower = rfElementConfig.getEirpTxPower();
+                }
+                String hwMode = getHwMode(rfElementConfig);
+                String freqBand = getHwConfigAndFreq(radioType, hwConfig);
+                String radioName = null;
+                for (String key : provisionedRadioConfigs.keySet()) {
+                    if (provisionedRadioConfigs.get(key).freqBand.equals(freqBand)) {
+                        radioName = key;
+                        break;
+                    }
+                }
+                LOG.debug(
+                        "configureWifiRadios for AP {} autoChannelSelection={} activeChannel={} getChannelNumber={} radioName={} freqBand={} hwMode={} txPower={} enabled={} adminStateSetting={} autoCellSizeSelection={}",
+                        opensyncAPConfig.getCustomerEquipment().getInventoryId(), autoChannelSelection, channel, elementRadioConfig.getChannelNumber(), radioName, freqBand, hwMode, txPower,
+                        enabled, radioConfig.getRadioAdminState(), autoCellSizeSelection);
+                if (radioName == null)
+                    continue;
+                String ifName = null; // for vifConfigs
+                if (radioName.equals(radio0)) {
+                    ifName = defaultRadio0;
+                } else if (radioName.equals(radio1)) {
+                    ifName = defaultRadio1;
+                } else if (radioName.equals(radio2)) {
+                    ifName = defaultRadio2;
+                }
+                if (ifName == null)
+                    continue;
+                Set<Uuid> vifUuidsForRadio = new HashSet<>();
+                for (String key : vifConfigs.keySet()) {
+                    if (key.contains(ifName))
+                        vifUuidsForRadio.add(vifConfigs.get(key).uuid);
+                }
+                int mimoMode = MimoMode.none.getId();
+                if (rfElementConfig.getMimoMode() != null) {
+                    mimoMode = rfElementConfig.getMimoMode().getId();
+                }
+                int maxNumClients = 0;
+                if (rfElementConfig.getMaxNumClients() != null) {
+                    maxNumClients = rfElementConfig.getMaxNumClients();
+                }
+                try {
+                    configureWifiRadios(freqBand, channel, hwConfig, country.toUpperCase(), beaconInterval, enabled, hwMode, ht_mode, txPower, mimoMode,
+                            vifUuidsForRadio, operations, maxNumClients,columnNames);
+                } catch (OvsdbClientException e) {
+                    LOG.error("ConfigureWifiRadios failed with OvsdbClient exception.", e);
+                    throw new RuntimeException(e);
+                } catch (TimeoutException e) {
+                    LOG.error("ConfigureWifiRadios failed with Timeout.", e);
+                    throw new RuntimeException(e);
+                } catch (ExecutionException e) {
+                    LOG.error("ConfigureWifiRadios excecution failed.", e);
+                    throw new RuntimeException(e);
+                } catch (InterruptedException e) {
+                    LOG.error("ConfigureWifiRadios interrupted.", e);
+                    throw new RuntimeException(e);
                 }
             }
-            if (radioName == null) continue;
+
-            String ifName = null; // for vifConfigs
-            if (radioName.equals(radio0)) {
-                ifName = defaultRadio0;
-            } else if (radioName.equals(radio1)) {
-                ifName = defaultRadio1;
-            } else if (radioName.equals(radio2)) {
-                ifName = defaultRadio2;
-            }
-            if (ifName == null) continue;
-            Set<Uuid> vifUuidsForRadio = new HashSet<>();
-            for (String key : vifConfigs.keySet()) {
-                if (key.contains(ifName))
-                    vifUuidsForRadio.add(vifConfigs.get(key).uuid);
-            }
-            int mimoMode = MimoMode.none.getId();
-            if (rfElementConfig.getMimoMode() != null) {
-                mimoMode = rfElementConfig.getMimoMode().getId();
-            }           
-            int maxNumClients = 0;          
-            if (rfElementConfig.getMaxNumClients() != null) {
-                maxNumClients = rfElementConfig.getMaxNumClients();
-            }
-            try {
-                configureWifiRadios(freqBand, channel, hwConfig, country.toUpperCase(), beaconInterval,
-                        enabled, hwMode, ht_mode, txPower, mimoMode, vifUuidsForRadio, operations, maxNumClients);
-            } catch (OvsdbClientException e) {
-                LOG.error("ConfigureWifiRadios failed with OvsdbClient exception.", e);
-                throw new RuntimeException(e);
-            } catch (TimeoutException e) {
-                LOG.error("ConfigureWifiRadios failed with Timeout.", e);
-                throw new RuntimeException(e);
-            } catch (ExecutionException e) {
-                LOG.error("ConfigureWifiRadios excecution failed.", e);
-                throw new RuntimeException(e);
-            } catch (InterruptedException e) {
-                LOG.error("ConfigureWifiRadios interrupted.", e);
-                throw new RuntimeException(e);
-            }
-        }
-        try {
             CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
             OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
             for (OperationResult res : result) {
-                LOG.debug("Op Result {}", res);
+                LOG.trace("configureWifiRadios Op Result {}", res);
             }
+            
+            ovsdbGet.getProvisionedWifiRadioConfigs(ovsdbClient).entrySet().forEach(r -> {
+                LOG.debug("configureWifiRadios for AP {} Wifi_Radio_Config for if_name:{}\n{}",  opensyncAPConfig.getCustomerEquipment().getInventoryId(), r.getKey(),r.getValue());
+            });
+
         } catch (OvsdbClientException | ExecutionException | InterruptedException | TimeoutException e) {
-            LOG.error("configureWifiRadios error", e); throw new RuntimeException(e);
+            LOG.error("configureWifiRadios error", e);
+            throw new RuntimeException(e);
         }
 
     }
 
     String getHwConfigAndFreq(RadioType radioType, Map<String, String> hwConfig) {
         switch (radioType) {
-        case is2dot4GHz:
+            case is2dot4GHz:
-            return "2.4G";
+                return "2.4G";
-        case is5GHz:
+            case is5GHz:
-            // 802.11h dfs (Dynamic Frequency Selection) aka military
+                // 802.11h dfs (Dynamic Frequency Selection) aka military
-            // and
+                // and
-            // weather radar
+                // weather radar
-            // avoidance protocol
+                // avoidance protocol
-            // Must not be disabled (by law)
+                // Must not be disabled (by law)
-            // NA for 2.4GHz
+                // NA for 2.4GHz
-            hwConfig.put("dfs_enable", "1");
+                hwConfig.put("dfs_enable", "1");
-            hwConfig.put("dfs_ignorecac", "0");
+                hwConfig.put("dfs_ignorecac", "0");
-            hwConfig.put("dfs_usenol", "1");
+                hwConfig.put("dfs_usenol", "1");
-            return "5G";
+                return "5G";
-        case is5GHzL:
+            case is5GHzL:
-            // 802.11h dfs (Dynamic Frequency Selection) aka military
+                // 802.11h dfs (Dynamic Frequency Selection) aka military
-            // and
+                // and
-            // weather radar
+                // weather radar
-            // avoidance protocol
+                // avoidance protocol
-            // Must not be disabled (by law)
+                // Must not be disabled (by law)
-            // NA for 2.4GHz
+                // NA for 2.4GHz
-            hwConfig.put("dfs_enable", "1");
+                hwConfig.put("dfs_enable", "1");
-            hwConfig.put("dfs_ignorecac", "0");
+                hwConfig.put("dfs_ignorecac", "0");
-            hwConfig.put("dfs_usenol", "1");
+                hwConfig.put("dfs_usenol", "1");
-            return "5GL";
+                return "5GL";
-        case is5GHzU:
+            case is5GHzU:
-            // 802.11h dfs (Dynamic Frequency Selection) aka military
+                // 802.11h dfs (Dynamic Frequency Selection) aka military
-            // and
+                // and
-            // weather radar
+                // weather radar
-            // avoidance protocol
+                // avoidance protocol
-            // Must not be disabled (by law)
+                // Must not be disabled (by law)
-            // NA for 2.4GHz
+                // NA for 2.4GHz
-            hwConfig.put("dfs_enable", "1");
+                hwConfig.put("dfs_enable", "1");
-            hwConfig.put("dfs_ignorecac", "0");
+                hwConfig.put("dfs_ignorecac", "0");
-            hwConfig.put("dfs_usenol", "1");
+                hwConfig.put("dfs_usenol", "1");
-            return "5GU";
+                return "5GU";
-        default: // don't know this interface
+            default: // don't know this interface
-            return null;
+                return null;
         }
     }
 
     private String getBandwidth(ChannelBandwidth bandwidth) {
         String ht_mode;
         switch (bandwidth) {
-        case is20MHz:
+            case is20MHz:
-            ht_mode = "HT20";
+                ht_mode = "HT20";
-            break;
+                break;
-        case is40MHz:
+            case is40MHz:
-            ht_mode = "HT40";
+                ht_mode = "HT40";
-            break;
+                break;
-        case is80MHz:
+            case is80MHz:
-            ht_mode = "HT80";
+                ht_mode = "HT80";
-            break;
+                break;
-        case is160MHz:
+            case is160MHz:
-            ht_mode = "HT160";
+                ht_mode = "HT160";
-            break;
+                break;
-        case auto:
+            case auto:
-            ht_mode = "0";
+                ht_mode = "0";
-            break;
+                break;
-        default:
+            default:
-            ht_mode = null;
+                ht_mode = null;
         }
         return ht_mode;
     }
@@ -189,43 +210,45 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
     String getHwMode(RfElementConfiguration rfElementConfig) {
         String hwMode = null;
         switch (rfElementConfig.getRadioMode()) {
-        case modeA:
+            case modeA:
-            hwMode = "11a";
+                hwMode = "11a";
-            break;
+                break;
-        case modeAB:
+            case modeAB:
-            hwMode = "11ab";
+                hwMode = "11ab";
-            break;
+                break;
-        case modeAC:
+            case modeAC:
-            hwMode = "11ac";
+                hwMode = "11ac";
-            break;
+                break;
-        case modeB:
+            case modeB:
-            hwMode = "11b";
+                hwMode = "11b";
-            break;
+                break;
-        case modeG:
+            case modeG:
-            hwMode = "11g";
+                hwMode = "11g";
-            break;
+                break;
-        case modeAX:
+            case modeAX:
-            hwMode = "11ax";
+                hwMode = "11ax";
-            break;
+                break;
-        case modeN:
+            case modeN:
-            hwMode = "11n";
+                hwMode = "11n";
-            break;
+                break;
-        default:
+            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, Set<String> tableColumns)
-                             int mimoMode, Set<Uuid> vifUuidsForRadio, List<Operation> operations, int maxNumClients) 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));
@@ -243,10 +266,9 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
             updateColumns.put("hw_mode", new Atom<>(hwMode));
         }
         configureCustomOptionsMap(maxNumClients, updateColumns);
-        setTxAndRxChainmask(mimoMode, updateColumns);
+        setTxAndRxChainmask(mimoMode, updateColumns,tableColumns);
         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);
@@ -254,31 +276,60 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
     }
 
     void configureCustomOptionsMap(int maxNumClients, Map<String, Value> updateColumns) {
-        Map<String,String> customOptions = new HashMap<>();
+        Map<String, String> customOptions = new HashMap<>();
         customOptions.put("max_clients", String.valueOf(maxNumClients));
         @SuppressWarnings("unchecked")
-        com.vmware.ovsdb.protocol.operation.notation.Map<String, String> customOptionsMap = com.vmware.ovsdb.protocol.operation.notation.Map
+        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);
-        updateColumns.put("custom_options", customOptionsMap);           
     }
 
-    void setTxAndRxChainmask(int mimoMode, Map<String, Value> updateColumns) {
+    void setTxAndRxChainmask(int mimoMode, Map<String, Value> updateColumns, Set<String> tableColumns) {
         /*
          * Chainmask is a bitmask, so map mimo mode values accordingly
-         * Note values 0, 1 remain unchanged 
+         * Note values 0, 1 remain unchanged
          * 
-         * mimoMode  bitmask 
+         * mimoMode bitmask
-         *    0         0 
+         * 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) {mimoMode = 3;}
+        switch (mimoMode) {
-        else if (mimoMode == 3) {mimoMode = 7;}
+            case 0: // unchanged
-        else if (mimoMode == 4) {mimoMode = 15;}
+                break;
+            case 1: // unchanged
+                break;
+            case 2:
+                mimoMode = 3;
+                break;
+            case 3:
+                mimoMode = 7;
+                break;
+            case 4:
+                mimoMode = 15;
+                break;
+            case 5:
+                mimoMode = 31;
+                break;
+            case 6:
+                mimoMode = 63;
+                break;
+            case 7:
+                mimoMode = 127;
+                break;
+            case 8:
+                mimoMode = 255;
+                break;
+        }
         updateColumns.put("tx_chainmask", new Atom<>(mimoMode));
-        updateColumns.put("rx_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,19 +67,78 @@ 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()));
+            if (rsc.getServer() != null)
-            getCertificateUrls(rsc, updateColumns);
+                updateColumns.put("server", new Atom<>(rsc.getServer().getHostAddress()));
-            updateColumns.put("radius_config_name", new Atom<>(rsc.getName()));
+            if (rsc.getName() != null)
-            updateColumns.put("passphrase", new Atom<>(rsc.getPassphrase()));          
+                updateColumns.put("radius_config_name", new Atom<>(rsc.getName()));
-            updateColumns.put("port", new Atom<>(rsc.getPort()));           
+            if (rsc.getPort() != null)
-            updateColumns.put("realm", Set.of(rsc.getRealm()));
+                updateColumns.put("port", new Atom<>(rsc.getPort()));
-            updateColumns.put("radsec", new Atom<>(rsc.getUseRadSec()));
+            if (rsc.getRealm() != null)
+                updateColumns.put("realm", Set.of(rsc.getRealm()));
+            if (rsc.getUseRadSec() != null) {
+                updateColumns.put("radsec", new Atom<>(rsc.getUseRadSec()));
+                if (rsc.getUseRadSec()) {
+                    getCertificateUrls(rsc, updateColumns);
+                    updateColumns.put("passphrase", new Atom<>(rsc.getPassphrase()));
+                }
+            }
+            if (rsc.getSharedSecret() != null)
+                updateColumns.put("secret", new Atom<>(rsc.getSharedSecret()));
+            if (rsc.getAcctServer() != null) {
+                updateColumns.put("acct_server", new Atom<>(rsc.getAcctServer().getHostAddress()));
+            }
+            if (rsc.getSharedSecret() != null) {
+                updateColumns.put("acct_secret", new Atom<>(rsc.getSharedSecret()));
+            }
+            if (rsc.getAcctPort() != null) {
+                updateColumns.put("acct_port", new Atom<>(rsc.getAcctPort()));
+            }
+            if (databaseSchema.getTables().get(radiusConfigDbTable).getColumns().containsKey("auto_discover")) {
+                if (rsc.getUseRadSec() != null && rsc.getUseRadSec() && rsc.getDynamicDiscovery() != null &&  rsc.getDynamicDiscovery()) {
+                    // if useRadSec && dynamicDiscovery enabled, do not send server information
+                    updateColumns.put("auto_discover", new Atom<>(true));
+                    updateColumns.remove("acct_server");
+                    updateColumns.remove("acct_secret");
+                    updateColumns.remove("acct_port");
+                    updateColumns.remove("server");
+                    updateColumns.remove("port");
+                    updateColumns.remove("secret");
+                } else {
+                    // if !useRadSec, auto_discover is false regardless of it's desired setting
+                    // retain server information
+                    updateColumns.put("auto_discover", new Atom<>(false));
+                }
+            }
             Row row = new Row(updateColumns);
             operations.add(new Insert(radiusConfigDbTable, row));
         }
@@ -104,7 +165,7 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
         }
         if (!caCertFilestoreUrl.contains("filestore")) {
             caCertFilestoreUrl = externalFileStoreURL + "/filestore/" + rsc.getCaCert().getApExportUrl();
-        }           
+        }
         updateColumns.put("client_cert", new Atom<>(clientCertFilestoreUrl));
         updateColumns.put("client_key", new Atom<>(clientKeyFilestoreUrl));
         updateColumns.put("ca_cert", new Atom<>(caCertFilestoreUrl));
@@ -124,8 +185,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,9 +1,11 @@
+
 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;
@@ -12,10 +14,12 @@ import java.util.concurrent.TimeoutException;
 import org.springframework.stereotype.Component;
 
 import com.telecominfraproject.wlan.core.model.equipment.AutoOrManualValue;
+import com.telecominfraproject.wlan.core.model.equipment.OBSSHopMode;
 import com.telecominfraproject.wlan.core.model.equipment.RadioBestApSettings;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
 import com.telecominfraproject.wlan.core.model.equipment.SourceType;
 import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
+import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
 import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration;
 import com.telecominfraproject.wlan.equipment.models.ManagementRate;
 import com.telecominfraproject.wlan.equipment.models.MulticastRate;
@@ -38,15 +42,16 @@ 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;
             if (radioType == RadioType.is2dot4GHz) {
@@ -66,28 +71,24 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
             ElementRadioConfiguration elementRadioConfig = apElementConfig.getRadioMap().get(radioType);
             RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
             if (elementRadioConfig == null || rfElementConfig == null) {
-            	continue; // don't have a radio of this kind in the map
+                continue; // don't have a radio of this kind in the map
             }
-            
+
             boolean autoChannelSelection = rfElementConfig.getAutoChannelSelection();
             int backupChannel = elementRadioConfig.getActiveBackupChannel(autoChannelSelection);
-            LOG.debug("configureWifiRadios autoChannelSelection {} activeBackupChannel {}",
+
-                    autoChannelSelection, backupChannel);
+            boolean autoCellSizeSelection = rfElementConfig.getAutoCellSizeSelection();
-            
+            Integer probeResponseThresholdDb = null;
-            AutoOrManualValue probeResponseThresholdDb = null;
+            Integer clientDisconnectThresholdDb = null;
-            AutoOrManualValue clientDisconnectThresholdDb = null;
+
-            
             if (elementRadioConfig.getProbeResponseThresholdDb() != null) {
-	            probeResponseThresholdDb = getSourcedValue(elementRadioConfig.getProbeResponseThresholdDb().getSource(),
+                probeResponseThresholdDb = getSourcedValue(autoCellSizeSelection, rfElementConfig.getProbeResponseThresholdDb(),
-	                    rfElementConfig.getProbeResponseThresholdDb(),
+                        elementRadioConfig.getProbeResponseThresholdDb().getValue());
-	                    elementRadioConfig.getProbeResponseThresholdDb().getValue());
             }
-            
+
             if (elementRadioConfig.getClientDisconnectThresholdDb() != null) {
-	            clientDisconnectThresholdDb = getSourcedValue(
+                clientDisconnectThresholdDb = getSourcedValue(autoCellSizeSelection, rfElementConfig.getClientDisconnectThresholdDb(),
-	                    elementRadioConfig.getClientDisconnectThresholdDb().getSource(),
+                        elementRadioConfig.getClientDisconnectThresholdDb().getValue());
-	                    rfElementConfig.getClientDisconnectThresholdDb(),
-	                    elementRadioConfig.getClientDisconnectThresholdDb().getValue());
             }
 
             RadioConfiguration radioConfig = apElementConfig.getAdvancedRadioMap().get(radioType);
@@ -95,62 +96,30 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
             ManagementRate managementRate = null;
             RadioBestApSettings bestApSettings = null;
             if (radioConfig != null) {
-            	if (radioConfig.getMulticastRate() != 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
-                        ? rfElementConfig.getManagementRate()
-                        : radioConfig.getManagementRate().getValue();
-            	}
-            	
-            	if (radioConfig.getBestApSettings() != null) {
-                	bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile
-                        ? rfElementConfig.getBestApSettings()
-                        : radioConfig.getBestApSettings().getValue();
-            	}
-            }
 
-            int multicastRateMbps = 0;
+                if (radioConfig.getManagementRate() != null) {
-            if (multicastRate != null) {
+                    managementRate = autoCellSizeSelection ? radioConfig.getManagementRate().getValue() : rfElementConfig.getManagementRate();
-                switch (multicastRate) {
+                }
-                case rate6mbps:
+
-                    multicastRateMbps = 6;
+                if (radioConfig.getBestApSettings() != null) {
-                    break;
+                    bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile ? rfElementConfig.getBestApSettings()
-                case rate9mbps:
+                            : radioConfig.getBestApSettings().getValue();
-                    multicastRateMbps = 9;
-                    break;
-                case rate12mbps:
-                    multicastRateMbps = 12;
-                    break;
-                case rate18mbps:
-                    multicastRateMbps = 18;
-                    break;
-                case rate24mbps:
-                    multicastRateMbps = 24;
-                    break;
-                case rate36mbps:
-                    multicastRateMbps = 36;
-                    break;
-                case rate48mbps:
-                    multicastRateMbps = 48;
-                    break;
-                case rate54mbps:
-                    multicastRateMbps = 54;
-                    break;
-                case auto:
-                default:
-                    multicastRateMbps = 0;
                 }
             }
 
+            OBSSHopMode obssHopMode = rfElementConfig.getChannelHopSettings().getObssHopMode();
+            int noiseFloorThresholdInDB = rfElementConfig.getChannelHopSettings().getNoiseFloorThresholdInDB();
+            int noiseFloorThresholdTimeInSeconds = rfElementConfig.getChannelHopSettings().getNoiseFloorThresholdTimeInSeconds();
+            int nonWifiThresholdInPercentage = rfElementConfig.getChannelHopSettings().getNonWifiThresholdInPercentage();
+            int nonWifiThresholdTimeInSeconds = rfElementConfig.getChannelHopSettings().getNonWifiThresholdTimeInSeconds();
             if (freqBand != null) {
                 try {
-                    configureWifiRrm(ovsdbClient, freqBand, backupChannel, probeResponseThresholdDb, 
+                    configureWifiRrm(ovsdbClient, freqBand, backupChannel, probeResponseThresholdDb, clientDisconnectThresholdDb, managementRate,
-                    		clientDisconnectThresholdDb, managementRate, bestApSettings, multicastRateMbps);
+                            bestApSettings, multicastRate, obssHopMode, noiseFloorThresholdInDB, noiseFloorThresholdTimeInSeconds, nonWifiThresholdInPercentage,
+                            nonWifiThresholdTimeInSeconds);
                 } catch (OvsdbClientException e) {
                     LOG.error("configureRrm failed with OvsdbClient exception.", e);
                     throw new RuntimeException(e);
@@ -167,53 +136,82 @@ 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, int 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));
+        if (columnNames.contains("freq_band")) updateColumns.put("freq_band", new Atom<>(freqBand));
-        updateColumns.put("backup_channel", new Atom<>(backupChannel));
+        if (columnNames.contains("backup_channel")) updateColumns.put("backup_channel", new Atom<>(backupChannel));
-
+        if (columnNames.contains("mcast_rate")) {
-        updateColumns.put("mcast_rate", new Atom<>(multicastRate));
+            if (multicastRate == null || multicastRate == MulticastRate.auto) {
-
+                updateColumns.put("mcast_rate", new Atom<>(0));
-        if (probeResponseThreshold == null || probeResponseThreshold.isAuto()) {
+            } else {
-            updateColumns.put("probe_resp_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
+                updateColumns.put("mcast_rate", new Atom<>(multicastRate.getId()));
-        } else {
+            }
-            updateColumns.put("probe_resp_threshold", new Atom<>(probeResponseThreshold.getValue()));
         }
 
-        if (probeResponseThreshold == null || clientDisconnectThreshold.isAuto()) {
+        if (columnNames.contains("probe_resp_threshold")) {
-            updateColumns.put("client_disconnect_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
+            if (probeResponseThreshold == null) {
-        } else {
+                updateColumns.put("probe_resp_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
-            updateColumns.put("client_disconnect_threshold", new Atom<>(clientDisconnectThreshold.getValue()));
+            } else {
+                updateColumns.put("probe_resp_threshold", new Atom<>(probeResponseThreshold.intValue()));
+            }
+        }
+        if (columnNames.contains("client_disconnect_threshold")) {
+            if (clientDisconnectThreshold == null) {
+                updateColumns.put("client_disconnect_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
+            } else {
+                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 (managementRate == null || managementRate == ManagementRate.auto) {
+        if (columnNames.contains("min_load") && columnNames.contains("snr_percentage_drop")) {
-            updateColumns.put("beacon_rate", new Atom<>(0));
+            if (bestApSettings == null) {
-        } else {
+                updateColumns.put("min_load", new com.vmware.ovsdb.protocol.operation.notation.Set());
-            updateColumns.put("beacon_rate", new Atom<>(managementRate.getId() * 10));
-        }
-
-        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());
-        } else {
-            if (bestApSettings.getDropInSnrPercentage() == null) {
                 updateColumns.put("snr_percentage_drop", new com.vmware.ovsdb.protocol.operation.notation.Set());
             } else {
-                updateColumns.put("snr_percentage_drop", new Atom<>(bestApSettings.getDropInSnrPercentage()));
+                if (bestApSettings.getDropInSnrPercentage() == null) {
-            }
+                    updateColumns.put("snr_percentage_drop", new com.vmware.ovsdb.protocol.operation.notation.Set());
-            if (bestApSettings.getMinLoadFactor() == null) {
+                } else {
-                updateColumns.put("min_load", new com.vmware.ovsdb.protocol.operation.notation.Set());
+                    updateColumns.put("snr_percentage_drop", new Atom<>(bestApSettings.getDropInSnrPercentage()));
-            } else {
+                }
-                updateColumns.put("min_load", new Atom<>(bestApSettings.getMinLoadFactor()));
+                if (bestApSettings.getMinLoadFactor() == null) {
+                    updateColumns.put("min_load", new com.vmware.ovsdb.protocol.operation.notation.Set());
+                } else {
+                    updateColumns.put("min_load", new Atom<>(bestApSettings.getMinLoadFactor()));
+                }
             }
         }
 
+        if (obssHopMode != null && columnNames.contains("obss_hop_mode"))
+
+        {
+            updateColumns.put("obss_hop_mode", new Atom<>(obssHopMode.equals(OBSSHopMode.NON_WIFI) ? 1 : 2));
+        }
+        if (columnNames.contains("noise_floor_thresh"))
+            updateColumns.put("noise_floor_thresh", new Atom<>(noiseFloorThresholdInDB));
+        if (columnNames.contains("noise_floor_time"))
+            updateColumns.put("noise_floor_time", new Atom<>(noiseFloorThresholdTimeInSeconds));
+        if (columnNames.contains("non_wifi_thresh"))
+            updateColumns.put("non_wifi_thresh", new Atom<>(nonWifiThresholdInPercentage));
+        if (columnNames.contains("non_wifi_time"))
+            updateColumns.put("non_wifi_time", new Atom<>(nonWifiThresholdTimeInSeconds));
+
         Row row = new Row(updateColumns);
         operations.add(new Insert(wifiRrmConfigDbTable, row));
 
@@ -233,7 +231,6 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
                 LOG.error("configureWifiRrm error {}", (res));
                 throw new RuntimeException("configureWifiRrm " + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
             }
-
         }
     }
 
@@ -246,8 +243,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 {
@@ -290,6 +296,87 @@ public class OvsdbRrmConfig extends OvsdbDaoBase {
 
     }
 
+    void processCellSizeAttributesRequest(OvsdbClient ovsdbClient, Map<RadioType, CellSizeAttributes> cellSizeAttributesMap) {
+
+        LOG.info("OvsdbDao::processCellSizeAttributesRequest cellSizeAttributes {}", cellSizeAttributesMap);
+        try {
+            List<Operation> operations = new ArrayList<>();
+
+            cellSizeAttributesMap.entrySet().stream().forEach(c -> {
+                String freqBand = OvsdbToWlanCloudTypeMappingUtility.getOvsdbRadioFreqBandForRadioType(c.getKey());
+                List<Condition> conditions = new ArrayList<>();
+                conditions.add(new Condition("freq_band", Function.EQUALS, new Atom<>(freqBand)));
+                Map<String, Value> updateRrmColumns = new HashMap<>();
+
+                CellSizeAttributes cellSizeAttributes = c.getValue();
+                MulticastRate multicastRate = cellSizeAttributes.getMulticastRate();
+                if (multicastRate == null || multicastRate == MulticastRate.auto) {
+                    updateRrmColumns.put("mcast_rate", new Atom<>(0));
+                } else {
+                    updateRrmColumns.put("mcast_rate", new Atom<>(multicastRate.getId()));
+                }
+
+                Integer probeResponseThreshold = cellSizeAttributes.getProbeResponseThresholdDb();
+                if (probeResponseThreshold == null) {
+                    updateRrmColumns.put("probe_resp_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
+                } else {
+                    updateRrmColumns.put("probe_resp_threshold", new Atom<>(probeResponseThreshold.intValue()));
+                }
+
+                Integer clientDisconnectThreshold = cellSizeAttributes.getClientDisconnectThresholdDb();
+                if (clientDisconnectThreshold == null) {
+                    updateRrmColumns.put("client_disconnect_threshold", new com.vmware.ovsdb.protocol.operation.notation.Set());
+                } else {
+                    updateRrmColumns.put("client_disconnect_threshold", new Atom<>(clientDisconnectThreshold.intValue()));
+                }
+
+                ManagementRate managementRate = cellSizeAttributes.getManagementRate();
+                if (managementRate == null || managementRate == ManagementRate.auto) {
+                    updateRrmColumns.put("beacon_rate", new Atom<>(0));
+                } else {
+                    updateRrmColumns.put("beacon_rate", new Atom<>(managementRate.getId() * 10));
+                }
+
+                Row rowRrm = new Row(updateRrmColumns);
+                operations.add(new Update(wifiRrmConfigDbTable, conditions, rowRrm));
+
+                Map<String, Value> updateRadioColumns = new HashMap<>();
+                Integer txPower = cellSizeAttributes.getEirpTxPowerDb();
+                if (txPower != null && txPower > 0) {
+                    updateRadioColumns.put("tx_power", new Atom<>(txPower));
+                } else {
+                    updateRadioColumns.put("tx_power", new com.vmware.ovsdb.protocol.operation.notation.Set());
+                }
+                Row rowRadio = new Row(updateRadioColumns);
+                operations.add(new Update(wifiRadioConfigDbTable, conditions, rowRadio));
+            });
+
+            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
+            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+
+            for (OperationResult res : result) {
+                LOG.info("Op Result {}", res);
+
+                if (res instanceof InsertResult) {
+                    LOG.info("processCellSizeAttributesRequest insert new row result {}", (res));
+                    // for insert, make sure it is actually in the table
+                    confirmRowExistsInTable(ovsdbClient, ((InsertResult) res).getUuid(), wifiRrmConfigDbTable);
+                } else if (res instanceof ErrorResult) {
+                    LOG.error("processCellSizeAttributesRequest error {}", (res));
+                    throw new RuntimeException("processCellSizeAttributesRequest " + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails());
+                }
+            }
+
+            LOG.info("Updated ovsdb config for cell size attributes.");
+        } catch (ExecutionException e) {
+            LOG.error("Error in processCellSizeAttributesRequest", e);
+        } catch (OvsdbClientException | TimeoutException | InterruptedException e) {
+            LOG.error("Error in processCellSizeAttributesRequest", e);
+            throw new RuntimeException(e);
+        }
+
+    }
+
     void removeWifiRrm(OvsdbClient ovsdbClient) {
         try {
             List<Operation> operations = new ArrayList<>();

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

@@ -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));
@@ -443,7 +445,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 if (radioConfiguration != null) {
                     dtimPeriod = radioConfiguration.getDtimPeriod();
                     uapsdEnabled = radioConfiguration.getUapsdState() == StateSetting.enabled;
-                    apBridge = radioConfiguration.getStationIsolation() == StateSetting.disabled; // stationIsolation
+                    if (ssidConfig.getNoLocalSubnets()) apBridge = false; // no local access
                 }
 
                 String minHwMode = "11n"; // min_hw_mode is 11n
@@ -550,11 +552,15 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 if (ssidConfig.getUseRadiusProxy() != null) {
                     useRadiusProxy = ssidConfig.getUseRadiusProxy();
                 }
+                boolean enableProxyArpForHotspot = false;
+                if (ssidConfig.getEnableProxyArpForHotspot() != null) {
+                    enableProxyArpForHotspot = ssidConfig.getEnableProxyArpForHotspot();
+                }
                 try {
                     configureSingleSsid(ovsdbClient, ifName, ssidConfig.getSsid(), ssidBroadcast, security, vlanId, rrmEnabled, enable80211r, mobilityDomain,
                             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);
 
@@ -637,10 +643,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 if ((ssidConfig.getCaptivePortalId() == profileCaptive.getId()) && (profileCaptive.getDetails() != null)) {
                     CaptivePortalConfiguration captiveProfileDetails = ((CaptivePortalConfiguration) profileCaptive.getDetails());
 
-                    // +#define SCHEMA_CONSTS_PAGE_TITLE "page_title"
                     if (captiveProfileDetails.getBrowserTitle() != null) {
                         captiveMap.put("session_timeout", String.valueOf(captiveProfileDetails.getSessionTimeoutInMinutes()));
-                        captiveMap.put("page_title", captiveProfileDetails.getBrowserTitle());
                     }
                     if (captiveProfileDetails.getAuthenticationType().equals(CaptivePortalAuthenticationType.radius)) {
                         Optional<Profile> optional =
@@ -757,6 +761,9 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             case "wpa3MixedEAP":
                 opensyncSecurityMode = "WPA3-EAP";
                 break;
+            case "wpa3OnlyEAP192":
+                opensyncSecurityMode = "WPA3-EAP-192";
+                break;
         }
         return opensyncSecurityMode;
     }
@@ -775,15 +782,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", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
-                    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_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
+                security.put("radius_acct_secret", rServer.getSecret());
-                    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 +818,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", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
-                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_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
+            security.put("radius_server_secret", radiusServer.getSecret());           
-                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 +865,41 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 case "wpa2OnlyEAP":
                 case "wpa2OnlyRadius":
                     security.put("mode", "2");
-                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    if (!ssidConfig.getUseRadiusProxy()) {
-                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                     break;
                 case "wpa3OnlyEAP":
                     security.put("mode", "3");
-                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    if (!ssidConfig.getUseRadiusProxy()) {
-                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
+                    break;
+                case "wpa3OnlyEAP192":
+                    security.put("mode", "3");
+                    if (!ssidConfig.getUseRadiusProxy()) {
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                     break;
                 case "wpa2EAP":
                 case "wpa2Radius":
                 case "wpa3MixedEAP":
                     security.put("mode", "mixed");
-                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    if (!ssidConfig.getUseRadiusProxy()) {
-                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                     break;
                 case "wpaEAP":
                 case "wpaRadius":
                     security.put("mode", "1");
-                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                    if (!ssidConfig.getUseRadiusProxy()) {
-                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                     break;
             }
         }

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

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

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/util/OvsdbStringConstants.java

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