Merge branch 'master' of github.com:Telecominfraproject/wlan-cloud-opensync-controller

WIFI-1151: Update Opensync GW to align with the new RealSipCall data …

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

@@ -30,6 +30,7 @@ import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
 import com.telecominfraproject.wlan.client.session.models.ClientSessionMetricDetails;
 import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
 import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
+import com.telecominfraproject.wlan.core.model.equipment.ChannelHopReason;
 import com.telecominfraproject.wlan.core.model.equipment.DetectedAuthMode;
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.NeighborScanPacketType;
@@ -39,8 +40,9 @@ import com.telecominfraproject.wlan.core.model.equipment.SecurityType;
 import com.telecominfraproject.wlan.core.model.equipment.WiFiSessionUtility;
 import com.telecominfraproject.wlan.core.model.utils.DecibelUtils;
 import com.telecominfraproject.wlan.equipment.EquipmentServiceInterface;
+import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
 import com.telecominfraproject.wlan.equipment.models.Equipment;
-import com.telecominfraproject.wlan.opensync.ovsdb.dao.utilities.OvsdbToWlanCloudTypeMappingUtility;
+import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
 import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
 import com.telecominfraproject.wlan.profile.models.Profile;
 import com.telecominfraproject.wlan.profile.models.ProfileContainer;
@@ -76,6 +78,7 @@ import com.telecominfraproject.wlan.status.models.Status;
 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.RealTimeChannelHopEvent;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeSipCallReportEvent;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeSipCallStartEvent;
@@ -92,6 +95,7 @@ import sts.OpensyncStats.AssocType;
 import sts.OpensyncStats.CallReport;
 import sts.OpensyncStats.CallStart;
 import sts.OpensyncStats.CallStop;
+import sts.OpensyncStats.ChannelSwitchReason;
 import sts.OpensyncStats.Client;
 import sts.OpensyncStats.ClientReport;
 import sts.OpensyncStats.DNSProbeMetric;
@@ -150,7 +154,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
     void processMqttMessage(String topic, WCStatsReport wcStatsReport) {
         LOG.info("Received WCStatsReport {}", wcStatsReport.toString());
 
-        LOG.info("Received report on topic {}", topic);
+        LOG.debug("Received report on topic {}", topic);
         int customerId = extractCustomerIdFromTopic(topic);
 
         long equipmentId = extractEquipmentIdFromTopic(topic);
@@ -245,7 +249,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
         }
 
         if (!metricRecordList.isEmpty()) {
-            LOG.info("Publishing Metrics {}", metricRecordList);
+            LOG.debug("Publishing Metrics {}", metricRecordList);
             equipmentMetricsCollectorInterface.publishMetrics(metricRecordList);
         }
 
@@ -296,7 +300,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             for (sts.OpensyncStats.EventReport.ClientSession apEventClientSession : e.getClientSessionList()) {
 
-                LOG.info("Processing EventReport::ClientSession {}", apEventClientSession);
+                LOG.debug("Processing EventReport::ClientSession {}", apEventClientSession);
 
                 processClientConnectEvent(customerId, equipmentId, locationId, e, apEventClientSession);
 
@@ -318,10 +322,74 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             }
 
+            publishChannelHopEvents(customerId, equipmentId, e);
+
         });
 
     }
 
+    private void publishChannelHopEvents(int customerId, long equipmentId, EventReport e) {
+        
+        LOG.info("publishChannelHopEvents for customerId {} equipmentId {}");
+        
+        List<SystemEvent> events = new ArrayList<>();
+        
+        for (sts.OpensyncStats.EventReport.ChannelSwitchEvent channelSwitchEvent : e.getChannelSwitchList()) {
+            Equipment equipment = equipmentServiceInterface.getOrNull(equipmentId);
+            if (equipment == null)
+                continue;
+            RadioType radioType = null;
+            Long timestamp = null;
+            ChannelHopReason reason = null;
+            Integer channel = null;
+            if (channelSwitchEvent.hasBand()) {                   
+               radioType = OvsdbToWlanCloudTypeMappingUtility
+                .getRadioTypeFromOpensyncStatsRadioBandType(channelSwitchEvent.getBand());            
+            }
+            if (RadioType.isUnsupported(radioType)) {
+                LOG.warn("publishChannelHopEvents:RadioType {} is unsupported, cannot send RealTimeChannelHopEvent for {}", radioType, channelSwitchEvent);
+                continue;
+            }
+            if (channelSwitchEvent.hasTimestampMs()) {
+                timestamp = channelSwitchEvent.getTimestampMs();
+            }
+            if (timestamp == null) {
+                LOG.warn("publishChannelHopEvents:timestamp is null, cannot send RealTimeChannelHopEvent for {}", channelSwitchEvent);
+                continue;  
+            }
+            
+            if (channelSwitchEvent.hasReason()) {
+                if (channelSwitchEvent.getReason().equals(ChannelSwitchReason.high_interference)) reason = ChannelHopReason.HighInterference;
+                else if (channelSwitchEvent.getReason().equals(ChannelSwitchReason.radar_detected)) reason = ChannelHopReason.RadarDetected;
+            }
+            if (ChannelHopReason.isUnsupported(reason)) {
+                LOG.warn("publishChannelHopEvents:reason {} is unsupported, cannot send RealTimeChannelHopEvent for {}", channelSwitchEvent.getReason(), channelSwitchEvent);
+                continue; 
+            }
+            if (channelSwitchEvent.hasChannel()) {
+                channel = channelSwitchEvent.getChannel();
+            }
+            if (channel == null) {
+                LOG.warn("publishChannelHopEvents:channel is null, cannot send RealTimeChannelHopEvent for {}", channelSwitchEvent);
+                continue; 
+            }
+
+            RealTimeChannelHopEvent channelHopEvent = new RealTimeChannelHopEvent(RealTimeEventType.Channel_Hop, customerId, equipmentId, radioType, channel, ((ApElementConfiguration)equipment.getDetails()).getRadioMap().get(radioType).getChannelNumber(), reason, timestamp);
+            
+            events.add(channelHopEvent);
+            
+            LOG.debug("publishChannelHopEvents:Adding ChannelHopEvent to bulk list {}", channelHopEvent);
+        }
+        
+
+        if (events.size() > 0) {
+            LOG.info("publishChannelHopEvents:publishEventsBulk: {}", events);
+            equipmentMetricsCollectorInterface.publishEventsBulk(events);
+        } else {
+            LOG.info("publishChannelHopEvents:No ChannelHopEvents in report");
+        }
+    }
+
     protected void processClientConnectEvent(int customerId, long equipmentId, long locationId, EventReport e,
             sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
         for (ClientConnectEvent clientConnectEvent : apEventClientSession.getClientConnectEventList()) {
@@ -533,7 +601,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.info("Cannot update client or client session when no client mac address is present");
+                LOG.warn("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -593,7 +661,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.info("Cannot update client or client session when no client mac address is present");
+                LOG.warn("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -666,7 +734,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.info("Cannot update client or client session when no client mac address is present");
+                LOG.warn("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -728,7 +796,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.info("Cannot update client or client session when no client mac address is present");
+                LOG.warn("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -787,7 +855,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.info("Cannot update client or client session when no client mac address is present");
+                LOG.warn("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -836,7 +904,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.info("Cannot update client or client session when no client mac address is present");
+                LOG.warn("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -893,7 +961,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.info("Cannot update client or client session when no clientmac address is present");
+                LOG.warn("Cannot update client or client session when no clientmac address is present");
             }
         }
     }
@@ -960,7 +1028,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.info("Cannot update client or client session when no client mac address is present");
+                LOG.warn("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -978,9 +1046,9 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 eventTimestamp = videoVoiceReport.getTimestampMs();
             }
 
-            LOG.info("Received VideoVoiceReport {} for SIP call", videoVoiceReport);
+            LOG.debug("Received VideoVoiceReport {} for SIP call", videoVoiceReport);
 
-            processRealTImeSipCallReportEvent(customerId, equipmentId, eventTimestamp, eventsList, videoVoiceReport);
+            processRealTimeSipCallReportEvent(customerId, equipmentId, eventTimestamp, eventsList, videoVoiceReport);
 
             processRealTimeSipCallStartEvent(customerId, equipmentId, eventTimestamp, eventsList, videoVoiceReport);
 
@@ -1000,111 +1068,65 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
     }
 
-    protected void processRealTImeSipCallReportEvent(int customerId, long equipmentId, long eventTimestamp,
+    protected void processRealTimeSipCallReportEvent(int customerId, long equipmentId, long eventTimestamp,
-            List<SystemEvent> eventsList, VideoVoiceReport videoVoiceReport) {
+                                                     List<SystemEvent> eventsList, VideoVoiceReport videoVoiceReport) {
         if (videoVoiceReport.hasCallReport()) {
 
             CallReport callReport = videoVoiceReport.getCallReport();
-            List<com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowStats> cloudRtpFlowStatsList = new ArrayList<>();
-            for (RtpFlowStats apRtpFlowStats : callReport.getStatsList()) {
-
-                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowStats cloudRtpStats = new com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowStats();
-
-                if (apRtpFlowStats.hasCodec()) {
-                    cloudRtpStats.setCodec(apRtpFlowStats.getCodec());
-                }
-
-                if (apRtpFlowStats.hasBlockCodecs()) {
-                    cloudRtpStats.setBlockCodecs(apRtpFlowStats.getBlockCodecs().toByteArray());
-                }
-
-                if (apRtpFlowStats.hasLatency()) {
-                    cloudRtpStats.setLatency(apRtpFlowStats.getLatency());
-                }
-
-                if (apRtpFlowStats.hasRtpSeqFirst()) {
-                    cloudRtpStats.setFirstRTPSeq(apRtpFlowStats.getRtpSeqFirst());
-                }
-
-                if (apRtpFlowStats.hasRtpSeqLast()) {
-                    cloudRtpStats.setLastRTPSeq(apRtpFlowStats.getRtpSeqLast());
-                }
-
-                if (apRtpFlowStats.hasDirection()) {
-                    switch (apRtpFlowStats.getDirection()) {
-                    case RTP_DOWNSTREAM:
-                        cloudRtpStats.setDirection(
-                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowDirection.DOWNSTREAM);
-                        break;
-                    case RTP_UPSTREAM:
-                        cloudRtpStats.setDirection(
-                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowDirection.UPSTREAM);
-                        break;
-                    default:
-                        cloudRtpStats.setDirection(
-                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowDirection.UNSUPPORTED);
-                    }
-                }
-
-                if (apRtpFlowStats.hasRtpFlowType()) {
-                    switch (apRtpFlowStats.getRtpFlowType()) {
-                    case RTP_VIDEO:
-                        cloudRtpStats.setFlowType(
-                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowType.VIDEO);
-                        break;
-                    case RTP_VOICE:
-                        cloudRtpStats.setFlowType(
-                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowType.VOICE);
-                        break;
-                    default:
-                        cloudRtpStats.setFlowType(
-                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowType.UNSUPPORTED);
-                        break;
-                    }
-                }
-
-                if (apRtpFlowStats.hasJitter()) {
-                    cloudRtpStats.setJitter(apRtpFlowStats.getJitter());
-                }
-
-                if (apRtpFlowStats.hasTotalPacketsSent()) {
-                    cloudRtpStats.setTotalPacket(apRtpFlowStats.getTotalPacketsSent());
-                }
-
-                if (apRtpFlowStats.hasTotalPacketsLost()) {
-                    cloudRtpStats.setTotalPacketLost(apRtpFlowStats.getTotalPacketsLost());
-                }
-
-                if (apRtpFlowStats.hasMosx100()) {
-                    cloudRtpStats.setMosMultipliedBy100(apRtpFlowStats.getMosx100());
-                }
-
-                if (apRtpFlowStats.hasPacketLossConsec()) {
-                    cloudRtpStats.setPacketLossConsecutive(apRtpFlowStats.getPacketLossConsec());
-                }
-
-                if (apRtpFlowStats.hasPacketLossPercent()) {
-                    cloudRtpStats.setPacketLossPercentage(apRtpFlowStats.getPacketLossPercent());
-                }
-
-                cloudRtpFlowStatsList.add(cloudRtpStats);
-
-            }
 
             RealTimeSipCallReportEvent cloudSipCallReportEvent = new RealTimeSipCallReportEvent(customerId, equipmentId,
                     eventTimestamp);
-            cloudSipCallReportEvent.setClientMacAddress(MacAddress.valueOf(callReport.getClientMac()));
+
-            cloudSipCallReportEvent.setStatuses(cloudRtpFlowStatsList);
+            if (callReport.hasClientMac() && callReport.getClientMac().isValidUtf8()) {
+                cloudSipCallReportEvent.setClientMacAddress(MacAddress.valueOf(callReport.getClientMac().toStringUtf8()));
+            }
+            cloudSipCallReportEvent.setStatuses(processRtpFlowStats(callReport.getStatsList()));
             cloudSipCallReportEvent.setEventType(RealTimeEventType.SipCallReport);
-            cloudSipCallReportEvent.setReportReason(SIPCallReportReason.GOT_PUBLISH);
+
             cloudSipCallReportEvent.setSipCallId(callReport.getWifiSessionId());
             cloudSipCallReportEvent.setAssociationId(callReport.getSessionId());
 
+            if (callReport.hasReason()) {
+                cloudSipCallReportEvent.setReportReason(getCallReportReason(callReport.getReason()));
+            }
+            if (callReport.hasProviderDomain()) {
+                cloudSipCallReportEvent.setProviderDomain(callReport.getProviderDomain());
+            }
+
+            if (callReport.getCodecsCount() > 0) {
+                cloudSipCallReportEvent.setCodecs(callReport.getCodecsList());
+            }
+
+            if (callReport.hasChannel()) {
+                cloudSipCallReportEvent.setChannel(callReport.getChannel());
+            }
+
+            if (callReport.hasBand()) {
+                cloudSipCallReportEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
+                        .getRadioTypeFromOpensyncStatsRadioBandType(callReport.getBand()));
+            }
+
             eventsList.add(cloudSipCallReportEvent);
 
         }
     }
 
+    private SIPCallReportReason getCallReportReason(CallReport.CallReportReason reason) {
+        if (reason != null) {
+            switch (reason) {
+                case ROAMED_TO:
+                    return SIPCallReportReason.ROAMED_TO;
+                case GOT_PUBLISH:
+                    return SIPCallReportReason.GOT_PUBLISH;
+                case ROAMED_FROM:
+                    return SIPCallReportReason.ROAMED_FROM;
+                default:
+                    return SIPCallReportReason.UNSUPPORTED;
+            }
+        }
+        return SIPCallReportReason.UNSUPPORTED;
+    }
+
     protected void processRealTimeSipCallStartEvent(int customerId, long equipmentId, long eventTimestamp,
             List<SystemEvent> eventsList, VideoVoiceReport videoVoiceReport) {
         if (videoVoiceReport.hasCallStart()) {
@@ -1114,8 +1136,8 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             RealTimeSipCallStartEvent cloudSipCallStartEvent = new RealTimeSipCallStartEvent(customerId, equipmentId,
                     eventTimestamp);
 
-            if (apCallStart.hasClientMac()) {
+            if (apCallStart.hasClientMac() && apCallStart.getClientMac().isValidUtf8()) {
-                cloudSipCallStartEvent.setClientMacAddress(MacAddress.valueOf(apCallStart.getClientMac()));
+                cloudSipCallStartEvent.setClientMacAddress(MacAddress.valueOf(apCallStart.getClientMac().toStringUtf8()));
             }
 
             if (apCallStart.hasDeviceInfo()) {
@@ -1128,13 +1150,25 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             if (apCallStart.hasSessionId()) {
                 cloudSipCallStartEvent.setAssociationId(apCallStart.getSessionId());
-
             }
 
             if (apCallStart.hasWifiSessionId()) {
                 cloudSipCallStartEvent.setAssociationId(apCallStart.getWifiSessionId());
             }
 
+            if (apCallStart.getCodecsCount() > 0) {
+                cloudSipCallStartEvent.setCodecs(apCallStart.getCodecsList());
+            }
+
+            if (apCallStart.hasChannel()) {
+                cloudSipCallStartEvent.setChannel(apCallStart.getChannel());
+            }
+
+            if (apCallStart.hasBand()) {
+                cloudSipCallStartEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
+                        .getRadioTypeFromOpensyncStatsRadioBandType(apCallStart.getBand()));
+            }
+
             eventsList.add(cloudSipCallStartEvent);
 
         }
@@ -1155,9 +1189,9 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             }
 
-            if (apCallStop.hasClientMac()) {
+            if (apCallStop.hasClientMac() && apCallStop.getClientMac().isValidUtf8()) {
 
-                cloudSipCallStopEvent.setClientMacAddress(MacAddress.valueOf(apCallStop.getClientMac()));
+                cloudSipCallStopEvent.setClientMacAddress(MacAddress.valueOf(apCallStop.getClientMac().toStringUtf8()));
 
             }
 
@@ -1188,6 +1222,27 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             }
 
+            if (apCallStop.getStatsCount() > 0) {
+                cloudSipCallStopEvent.setStatuses(processRtpFlowStats(apCallStop.getStatsList()));
+            }
+
+            if (apCallStop.hasProviderDomain()) {
+                cloudSipCallStopEvent.setProviderDomain(apCallStop.getProviderDomain());
+            }
+
+            if (apCallStop.getCodecsCount() > 0) {
+                cloudSipCallStopEvent.setCodecs(apCallStop.getCodecsList());
+            }
+
+            if (apCallStop.hasChannel()) {
+                cloudSipCallStopEvent.setChannel(apCallStop.getChannel());
+            }
+
+            if (apCallStop.hasBand()) {
+                cloudSipCallStopEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
+                        .getRadioTypeFromOpensyncStatsRadioBandType(apCallStop.getBand()));
+            }
+
             eventsList.add(cloudSipCallStopEvent);
 
         }
@@ -1233,6 +1288,95 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
         }
     }
 
+    private List<com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowStats> processRtpFlowStats(List<OpensyncStats.RtpFlowStats> stats) {
+        List<com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowStats> cloudRtpFlowStatsList = new ArrayList<>();
+        for (RtpFlowStats apRtpFlowStats : stats) {
+
+            com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowStats cloudRtpStats = new com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowStats();
+
+            if (apRtpFlowStats.hasCodec()) {
+                cloudRtpStats.setCodec(apRtpFlowStats.getCodec());
+            }
+
+            if (apRtpFlowStats.hasBlockCodecs()) {
+                cloudRtpStats.setBlockCodecs(apRtpFlowStats.getBlockCodecs().toByteArray());
+            }
+
+            if (apRtpFlowStats.hasLatency()) {
+                cloudRtpStats.setLatency(apRtpFlowStats.getLatency());
+            }
+
+            if (apRtpFlowStats.hasRtpSeqFirst()) {
+                cloudRtpStats.setFirstRTPSeq(apRtpFlowStats.getRtpSeqFirst());
+            }
+
+            if (apRtpFlowStats.hasRtpSeqLast()) {
+                cloudRtpStats.setLastRTPSeq(apRtpFlowStats.getRtpSeqLast());
+            }
+
+            if (apRtpFlowStats.hasDirection()) {
+                switch (apRtpFlowStats.getDirection()) {
+                    case RTP_DOWNSTREAM:
+                        cloudRtpStats.setDirection(
+                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowDirection.DOWNSTREAM);
+                        break;
+                    case RTP_UPSTREAM:
+                        cloudRtpStats.setDirection(
+                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowDirection.UPSTREAM);
+                        break;
+                    default:
+                        cloudRtpStats.setDirection(
+                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowDirection.UNSUPPORTED);
+                }
+            }
+
+            if (apRtpFlowStats.hasRtpFlowType()) {
+                switch (apRtpFlowStats.getRtpFlowType()) {
+                    case RTP_VIDEO:
+                        cloudRtpStats.setFlowType(
+                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowType.VIDEO);
+                        break;
+                    case RTP_VOICE:
+                        cloudRtpStats.setFlowType(
+                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowType.VOICE);
+                        break;
+                    default:
+                        cloudRtpStats.setFlowType(
+                                com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowType.UNSUPPORTED);
+                        break;
+                }
+            }
+
+            if (apRtpFlowStats.hasJitter()) {
+                cloudRtpStats.setJitter(apRtpFlowStats.getJitter());
+            }
+
+            if (apRtpFlowStats.hasTotalPacketsSent()) {
+                cloudRtpStats.setTotalPacket(apRtpFlowStats.getTotalPacketsSent());
+            }
+
+            if (apRtpFlowStats.hasTotalPacketsLost()) {
+                cloudRtpStats.setTotalPacketLost(apRtpFlowStats.getTotalPacketsLost());
+            }
+
+            if (apRtpFlowStats.hasMosx100()) {
+                cloudRtpStats.setMosMultipliedBy100(apRtpFlowStats.getMosx100());
+            }
+
+            if (apRtpFlowStats.hasPacketLossConsec()) {
+                cloudRtpStats.setPacketLossConsecutive(apRtpFlowStats.getPacketLossConsec());
+            }
+
+            if (apRtpFlowStats.hasPacketLossPercent()) {
+                cloudRtpStats.setPacketLossPercentage(apRtpFlowStats.getPacketLossPercent());
+            }
+
+            cloudRtpFlowStatsList.add(cloudRtpStats);
+
+        }
+        return cloudRtpFlowStatsList;
+    }
+
     protected void processRtsStartSessionEvent(int customerId, long equipmentId, long eventTimestamp,
             List<SystemEvent> eventsList, VideoVoiceReport videoVoiceReport) {
         if (videoVoiceReport.hasStreamVideoSessionStart()) {
@@ -1601,7 +1745,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             NetworkAdminStatusData statusData = (NetworkAdminStatusData) networkAdminStatus.getDetails();
             
             if (n.getDnsState() == null) {
-                LOG.info("No DnsState present in networkProbeMetrics, DnsState and CloudLinkStatus set to 'normal");
+                LOG.debug("No DnsState present in networkProbeMetrics, DnsState and CloudLinkStatus set to 'normal");
                 statusData.setDnsStatus(StatusCode.normal);
                 statusData.setCloudLinkStatus(StatusCode.normal);
             } else {
@@ -1609,13 +1753,13 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 statusData.setCloudLinkStatus(stateUpDownErrorToStatusCode(n.getDnsState()));
             }
             if (n.getDhcpState() == null) {
-                LOG.info("No DhcpState present in networkProbeMetrics, set to 'normal");
+                LOG.debug("No DhcpState present in networkProbeMetrics, set to 'normal");
                 statusData.setDhcpStatus(StatusCode.normal);
             } else {
                 statusData.setDhcpStatus(stateUpDownErrorToStatusCode(n.getDhcpState()));
             }
             if (n.getRadiusState() == null) {
-                LOG.info("No RadiusState present in networkProbeMetrics, set to 'normal");
+                LOG.debug("No RadiusState present in networkProbeMetrics, set to 'normal");
                 statusData.setRadiusStatus(StatusCode.normal);
             } else {
                 statusData.setRadiusStatus(stateUpDownErrorToStatusCode(n.getRadiusState()));
@@ -1625,7 +1769,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             networkAdminStatus = statusServiceInterface.update(networkAdminStatus);
 
-            LOG.info("Updated NetworkAdminStatus {}", networkAdminStatus);
+            LOG.debug("Updated NetworkAdminStatus {}", networkAdminStatus);
 
         });
 
@@ -1658,7 +1802,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 StatusDataType.RADIO_UTILIZATION);
 
         if (radioUtilizationStatus == null) {
-            LOG.info("Create new radioUtilizationStatus");
+            LOG.debug("Create new radioUtilizationStatus");
             radioUtilizationStatus = new Status();
             radioUtilizationStatus.setCustomerId(customerId);
             radioUtilizationStatus.setEquipmentId(equipmentId);
@@ -1719,17 +1863,16 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 if (radiusMetrics.hasLatency()) {
                     networkProbeMetrics.setRadiusLatencyInMs(radiusMetrics.getLatency());
                 }
+
                 if (radiusMetrics.hasRadiusState()) {
+                    StateUpDownError radiusState = OvsdbToWlanCloudTypeMappingUtility
+                            .getCloudMetricsStateFromOpensyncStatsStateUpDown(radiusMetrics.getRadiusState());
 
-                    if (radiusMetrics.hasRadiusState()) {
+                    networkProbeMetrics.setRadiusState(radiusState);
-                        StateUpDownError radiusState = OvsdbToWlanCloudTypeMappingUtility
-                                .getCloudMetricsStateFromOpensyncStatsStateUpDown(radiusMetrics.getRadiusState());
-
-                        networkProbeMetrics.setRadiusState(radiusState);
-
-                    }
 
                 }
+
+
             }
 
             if (networkProbe.hasVlanProbe()) {
@@ -1769,7 +1912,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
         eqOsPerformance.setTotalAvailableMemoryKb(deviceReport.getMemUtil().getMemTotal());
         status.setDetails(eqOsPerformance);
         status = statusServiceInterface.update(status);
-        LOG.info("updated status {}", status);
+        LOG.debug("updated status {}", status);
     }
 
     void populateApClientMetrics(List<ServiceMetric> metricRecordList, Report report, int customerId, long equipmentId,
@@ -1780,12 +1923,12 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             for (Client cl : clReport.getClientListList()) {
 
                 if (cl.getMacAddress() == null) {
-                    LOG.info("No mac address for Client {}, cannot set device mac address for client in ClientMetrics.",
+                    LOG.debug("No mac address for Client {}, cannot set device mac address for client in ClientMetrics.",
                             cl);
                     continue;
                 }
 
-                LOG.info("Processing ClientReport from AP {}", cl.getMacAddress());
+                LOG.debug("Processing ClientReport from AP {}", cl.getMacAddress());
 
                 ServiceMetric smr = new ServiceMetric(customerId, equipmentId, new MacAddress(cl.getMacAddress()));
                 smr.setLocationId(locationId);
@@ -1809,7 +1952,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 long sessionId = WiFiSessionUtility.encodeWiFiAssociationId(clReport.getTimestampMs() / 1000L,
                         MacAddress.convertMacStringToLongValue(cl.getMacAddress()));
 
-                LOG.info("populateApClientMetrics Session Id {}", sessionId);
+                LOG.debug("populateApClientMetrics Session Id {}", sessionId);
                 cMetrics.setSessionId(sessionId);
 
                 if (cl.hasStats()) {
@@ -1867,7 +2010,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                     }
                 }
 
-                LOG.info("ApClientMetrics Report {}", cMetrics);
+                LOG.debug("ApClientMetrics Report {}", cMetrics);
 
             }
 
@@ -1951,18 +2094,18 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             boolean isReassociation = true;
             if (clientInstance == null) {
 
-                LOG.info("Cannot get client instance for {}", client.getMacAddress());
+                LOG.debug("Cannot get client instance for {}", client.getMacAddress());
                 return null;
 
             }
 
-            LOG.info("Client {}", clientInstance);
+            LOG.debug("Client {}", clientInstance);
 
             ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId,
                     clientInstance.getMacAddress());
 
             if (clientSession == null) {
-                LOG.info("Cannot get client session for {}", clientInstance.getMacAddress());
+                LOG.warn("Cannot get client session for {}", clientInstance.getMacAddress());
                 return null;
             }
 
@@ -2002,6 +2145,9 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                         || ssidConfig.getSecureMode().equals(SecureMode.wpa2PSK)
                         || ssidConfig.getSecureMode().equals(SecureMode.wpa2OnlyPSK)) {
                     latestClientSessionDetails.setSecurityType(SecurityType.PSK);
+                } else if (ssidConfig.getSecureMode().equals(SecureMode.wpa3OnlySAE)
+                        || ssidConfig.getSecureMode().equals(SecureMode.wpa3MixedSAE)){
+                    latestClientSessionDetails.setSecurityType(SecurityType.SAE);
                 } else if (ssidConfig.getSecureMode().equals(SecureMode.wpa2Radius)
                         || ssidConfig.getSecureMode().equals(SecureMode.wpaRadius)
                         || ssidConfig.getSecureMode().equals(SecureMode.wpa2OnlyRadius)) {
@@ -2009,7 +2155,9 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                     latestClientSessionDetails.setEapDetails(new ClientEapDetails());
                 } else if (ssidConfig.getSecureMode().equals(SecureMode.wpaEAP)
                         || ssidConfig.getSecureMode().equals(SecureMode.wpa2EAP)
-                        || ssidConfig.getSecureMode().equals(SecureMode.wpa2OnlyEAP)) {
+                        || ssidConfig.getSecureMode().equals(SecureMode.wpa2OnlyEAP)
+                        || ssidConfig.getSecureMode().equals(SecureMode.wpa3OnlyEAP)
+                        || ssidConfig.getSecureMode().equals(SecureMode.wpa3MixedEAP)) {
                     latestClientSessionDetails.setSecurityType(SecurityType.RADIUS);
                     latestClientSessionDetails.setEapDetails(new ClientEapDetails());
                 } else {
@@ -2037,7 +2185,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             clientSession = clientServiceInterface.updateSession(clientSession);
 
-            LOG.info("Updated client session {}", clientSession);
+            LOG.debug("Updated client session {}", clientSession);
 
             return clientSession;
         } catch (Exception e) {
@@ -2054,7 +2202,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
         ClientSessionMetricDetails metricDetails = new ClientSessionMetricDetails();
 
         if (LOG.isDebugEnabled())
-            LOG.info("Stats: {} DurationMs {}", client.getStats(), client.getDurationMs());
+            LOG.debug("Stats: {} DurationMs {}", client.getStats(), client.getDurationMs());
         int rssi = client.getStats().getRssi();
         metricDetails.setRssi(rssi);
         metricDetails.setRxBytes(client.getStats().getRxBytes());
@@ -2072,7 +2220,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
         metricDetails.setRxRateKbps((long) client.getStats().getRxRate());
         metricDetails.setTxRateKbps((long) client.getStats().getTxRate());
         if (LOG.isDebugEnabled())
-            LOG.info("RxRateKbps {} TxRateKbps {}", metricDetails.getRxRateKbps(), metricDetails.getTxRateKbps());
+            LOG.debug("RxRateKbps {} TxRateKbps {}", metricDetails.getRxRateKbps(), metricDetails.getTxRateKbps());
 
         // Throughput, do rate / duration
         if (client.getDurationMs() > 1000) {
@@ -2085,15 +2233,15 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             float txBytesToMb = txBytesFv / 125000F;
 
             if (LOG.isDebugEnabled())
-                LOG.info("rxBytesToMb {} txBytesToMb {} ", rxBytesToMb, txBytesToMb);
+                LOG.debug("rxBytesToMb {} txBytesToMb {} ", rxBytesToMb, txBytesToMb);
 
             metricDetails.setRxMbps(rxBytesToMb / durationSec);
             metricDetails.setTxMbps(txBytesToMb / durationSec);
             if (LOG.isDebugEnabled())
-                LOG.info("RxMbps {} TxMbps {} ", metricDetails.getRxMbps(), metricDetails.getTxMbps());
+                LOG.debug("RxMbps {} TxMbps {} ", metricDetails.getRxMbps(), metricDetails.getTxMbps());
 
         } else {
-            LOG.info("Cannot calculate tx/rx throughput for Client {} based on duration of {} Ms",
+            LOG.warn("Cannot calculate tx/rx throughput for Client {} based on duration of {} Ms",
                     client.getMacAddress(), client.getDurationMs());
         }
         metricDetails.setLastMetricTimestamp(timestamp);
@@ -2114,7 +2262,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
         for (ClientReport clientReport : report.getClientsList()) {
 
-            LOG.info("ClientReport for channel {} RadioBand {}", clientReport.getChannel(), clientReport.getBand());
+            LOG.debug("ClientReport for channel {} RadioBand {}", clientReport.getChannel(), clientReport.getBand());
 
             if (smr.getCreatedTimestamp() < clientReport.getTimestampMs()) {
                 smr.setCreatedTimestamp(clientReport.getTimestampMs());
@@ -2157,7 +2305,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                     }
                 }
             }
-            LOG.info("Client Report Date is {}", new Date(clientReport.getTimestampMs()));
+            LOG.debug("Client Report Date is {}", new Date(clientReport.getTimestampMs()));
             int numConnectedClients = 0;
             for (Client client : clientReport.getClientListList()) {
                 if (client.hasStats()) {
@@ -2237,7 +2385,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                         }
 
                     } catch (Exception e) {
-                        LOG.info("Unabled to update client {} session {}", client, e);
+                        LOG.error("Unabled to update client {}", client, e);
                     }
 
                 }
@@ -2267,7 +2415,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
         }
 
-        LOG.info("ApSsidMetrics {}", apSsidMetrics);
+        LOG.debug("ApSsidMetrics {}", apSsidMetrics);
 
     }
 
@@ -2313,8 +2461,18 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
         ProfileContainer profileContainer = new ProfileContainer(
                 profileServiceInterface.getProfileWithChildren(profileId));
-        RfConfiguration rfConfig = (RfConfiguration) profileContainer.getChildOfTypeOrNull(profileId, ProfileType.rf)
+        
+        Profile rfProfile = profileContainer.getChildOfTypeOrNull(profileId, ProfileType.rf);
+        RfConfiguration rfConfig = null;
+        if (rfProfile != null) {
+         rfConfig = (RfConfiguration) profileContainer.getChildOfTypeOrNull(profileId, ProfileType.rf)
                 .getDetails();
+        }
+        
+        if (rfConfig == null) {
+            LOG.warn("Cannot get RfConfiguration for customerId {} equipmentId {}", customerId,equipmentId);
+            return;
+        }
 
         for (Survey survey : report.getSurveyList()) {
 
@@ -2374,7 +2532,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             smr.setCreatedTimestamp(survey.getTimestampMs());
             metricRecordList.add(smr);
 
-            LOG.info("ChannelInfoReports {}", channelInfoReports);
+            LOG.debug("ChannelInfoReports {}", channelInfoReports);
 
         }
 

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

@@ -88,7 +88,6 @@ import sts.OpensyncStats.Client;
 import sts.OpensyncStats.ClientReport;
 import sts.OpensyncStats.EventReport;
 import sts.OpensyncStats.EventReport.ClientAssocEvent;
-import sts.OpensyncStats.EventType;
 import sts.OpensyncStats.RadioBandType;
 import sts.OpensyncStats.Report;
 
@@ -162,20 +161,6 @@ public class OpensyncExternalIntegrationCloudTest {
 
     }
 
-    @Test
-    public void testGetCustomerEquipment() {
-
-        Equipment equipment = new Equipment();
-        equipment.setDetails(ApElementConfiguration.createWithDefaults());
-
-        Mockito.when(
-                equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
-                .thenReturn(equipment);
-        assertNotNull(opensyncExternalIntegrationCloud.getCustomerEquipment("Test_Client_21P10C68818122"));
-        assertNull(opensyncExternalIntegrationCloud.getCustomerEquipment("Test_Client_21P10C68818133"));
-
-    }
-
     @Test
     public void testApConnected() {
 

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

@@ -7,6 +7,7 @@ import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.telecominfraproject.wlan.systemevent.models.SystemEvent;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -39,6 +40,8 @@ import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
 import com.telecominfraproject.wlan.customer.service.CustomerServiceInterface;
 import com.telecominfraproject.wlan.equipment.EquipmentServiceInterface;
+import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
+import com.telecominfraproject.wlan.equipment.models.Equipment;
 import com.telecominfraproject.wlan.firmware.FirmwareServiceInterface;
 import com.telecominfraproject.wlan.location.service.LocationServiceInterface;
 import com.telecominfraproject.wlan.opensync.external.integration.controller.OpensyncCloudGatewayController;
@@ -52,18 +55,21 @@ import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSIDs;
 import com.telecominfraproject.wlan.status.models.Status;
 import com.telecominfraproject.wlan.status.models.StatusDataType;
 
+import sts.OpensyncStats;
 import sts.OpensyncStats.AssocType;
+import sts.OpensyncStats.ChannelSwitchReason;
 import sts.OpensyncStats.Client;
 import sts.OpensyncStats.ClientReport;
 import sts.OpensyncStats.DNSProbeMetric;
 import sts.OpensyncStats.EventReport;
+import sts.OpensyncStats.EventReport.ChannelSwitchEvent;
+import sts.OpensyncStats.EventReport.ClientAssocEvent;
 import sts.OpensyncStats.NetworkProbe;
 import sts.OpensyncStats.RADIUSMetrics;
 import sts.OpensyncStats.RadioBandType;
 import sts.OpensyncStats.Report;
 import sts.OpensyncStats.StateUpDown;
 import sts.OpensyncStats.VLANMetrics;
-import sts.OpensyncStats.EventReport.ClientAssocEvent;
 
 @RunWith(SpringRunner.class)
 @ActiveProfiles(profiles = { "integration_test", })
@@ -164,6 +170,20 @@ public class OpensyncExternalIntegrationMqttMessageProcessorTest {
 
     @Test
     public void testProcessMqttMessageStringReport() {
+        Equipment equipment = new Equipment();
+
+        equipment.setDetails(ApElementConfiguration.createWithDefaults());
+        
+        equipment.setId(1L);
+
+        Mockito.when(
+                equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
+                .thenReturn(equipment);
+        
+        equipment.setProfileId(0L);
+        
+        Mockito.when(equipmentServiceInterface.getOrNull(1L)).thenReturn(equipment);
+        Mockito.when(equipmentServiceInterface.get(1L)).thenReturn(equipment);
 
         Report report = Report.newBuilder().setNodeID("21P10C68818122")
                 .addAllClients(getOpensyncStatsClientReportsList())
@@ -239,6 +259,55 @@ public class OpensyncExternalIntegrationMqttMessageProcessorTest {
         // TODO: implement me when wcs stats reports supported
     }
 
+    // Verify CallStart, CallStop and CallReport are properly processed and published as
+    // respective events (5 events in total)
+    @Test
+    public void testProcessMqttMessageStringMultipleVideoVoiceReport() {
+        OpensyncStats.VideoVoiceReport.Builder callStartVoiceReportBuilder = OpensyncStats.VideoVoiceReport.newBuilder().
+                setCallStart(getDefaultCallStart());
+        OpensyncStats.VideoVoiceReport.Builder callReportGotPublishVoiceReportBuilder = OpensyncStats.VideoVoiceReport.newBuilder().
+                setCallReport(getDefaultCallReport(OpensyncStats.CallReport.CallReportReason.GOT_PUBLISH, 121, 1028, 1316, 1888, 298, 2, 100, 200));
+        OpensyncStats.VideoVoiceReport.Builder callReportRoamedToVoiceReportBuilder = OpensyncStats.VideoVoiceReport.newBuilder().
+                setCallReport(getDefaultCallReport(OpensyncStats.CallReport.CallReportReason.ROAMED_TO, 123, 1020, 1116, 1345, 223, 0, 102, 203));
+        OpensyncStats.VideoVoiceReport.Builder callReportRoamedFromVoiceReportBuilder = OpensyncStats.VideoVoiceReport.newBuilder().
+                setCallReport(getDefaultCallReport(OpensyncStats.CallReport.CallReportReason.ROAMED_FROM, 122, 1029, 1300, 1234, 111, 3, 101, 201));
+        OpensyncStats.VideoVoiceReport.Builder callStopVoiceReportBuilder = OpensyncStats.VideoVoiceReport.newBuilder().
+                setCallStop(getDefaultCallStop());
+        // Create report with multiple voiceReports in one
+        Report multipleVoiceReportsInOneReport = Report.newBuilder().addVideoVoiceReport(callStartVoiceReportBuilder).
+                addVideoVoiceReport(callReportGotPublishVoiceReportBuilder).
+                addVideoVoiceReport(callReportRoamedFromVoiceReportBuilder).
+                addVideoVoiceReport(callReportRoamedToVoiceReportBuilder).
+                addVideoVoiceReport(callStopVoiceReportBuilder).
+                setNodeID("1").
+                build();
+
+        opensyncExternalIntegrationMqttProcessor.populateSipCallReport(null, multipleVoiceReportsInOneReport, 1, 2L, "TestAP", 12L);
+
+        Mockito.verify(equipmentMetricsCollectorInterface, Mockito.times(1)).publishEventsBulk(Mockito.anyList());
+    }
+
+    // Create report with 1 voiceReports that contains multiple Calls
+    // Note that GOT_PUBLISH and ROAMED_FROM are ignored in the CallReport. ROAMED_TO overwrites them
+    @Test
+    public void testProcessMqttMessageStringOneVideoVoiceReport() {
+
+        OpensyncStats.VideoVoiceReport.Builder videoVoiceReportBuilder = OpensyncStats.VideoVoiceReport.newBuilder().
+                setCallReport(getDefaultCallReport(OpensyncStats.CallReport.CallReportReason.GOT_PUBLISH, 121, 1028, 1316,1888, 298, 2, 100,200)).
+                setCallReport(getDefaultCallReport(OpensyncStats.CallReport.CallReportReason.ROAMED_FROM, 122, 1029, 1300,1234, 111, 3, 101,201)).
+                setCallReport(getDefaultCallReport(OpensyncStats.CallReport.CallReportReason.ROAMED_TO, 123, 1020, 1116,1345, 223, 0, 102,203)).
+                setCallStart(getDefaultCallStart()).
+                setCallStop(getDefaultCallStop());
+        Report oneVoiceReportWithMultipleCallsInOneReport = Report.getDefaultInstance().toBuilder().
+                addVideoVoiceReport(videoVoiceReportBuilder).
+                setNodeID("1").
+                build();
+
+        opensyncExternalIntegrationMqttProcessor.populateSipCallReport(null, oneVoiceReportWithMultipleCallsInOneReport, 1, 2L, "TestAP", 12L);
+
+        Mockito.verify(equipmentMetricsCollectorInterface, Mockito.times(1)).publishEventsBulk(Mockito.anyList());
+    }
+
     @Test
     public void testpopulateNetworkProbeMetrics() throws Exception {
 
@@ -297,6 +366,74 @@ public class OpensyncExternalIntegrationMqttMessageProcessorTest {
         return bssidList;
     }
 
+    private OpensyncStats.CallStart getDefaultCallStart() {
+        OpensyncStats.CallStart.Builder callStartBuilder = OpensyncStats.CallStart.newBuilder();
+        callStartBuilder.setBand(RadioBandType.BAND5G);
+        callStartBuilder.setChannel(40);
+        callStartBuilder.addCodecs("110 opus/48000/2");
+        callStartBuilder.addCodecs("102 iLBC/8000");
+        callStartBuilder.setClientMac(ByteString.copyFrom("C0:9A:D0:76:A9:69".getBytes()));
+        callStartBuilder.setDeviceInfo("Test Device");
+        callStartBuilder.setProviderDomain("skype");
+        callStartBuilder.setSessionId(123L);
+        callStartBuilder.setWifiSessionId(1234L);
+
+        return callStartBuilder.build();
+    }
+
+    private OpensyncStats.CallStop getDefaultCallStop() {
+        OpensyncStats.CallStop.Builder callStopBuilder = OpensyncStats.CallStop.newBuilder();
+        callStopBuilder.setBand(RadioBandType.BAND5G);
+        callStopBuilder.setChannel(40);
+        callStopBuilder.addCodecs("110 opus/48000/2");
+        callStopBuilder.addCodecs("102 iLBC/8000");
+        callStopBuilder.setClientMac(ByteString.copyFrom("C0:9A:D0:76:A9:69".getBytes()));
+        callStopBuilder.setCallDuration(1230);
+        callStopBuilder.setProviderDomain("skype");
+        callStopBuilder.setSessionId(123L);
+        callStopBuilder.setWifiSessionId(1234L);
+        callStopBuilder.setReason(OpensyncStats.CallStop.CallStopReason.BYE_OK);
+        callStopBuilder.addStats(getRtpFlowStats(121, 1380, 1400,3000, 119, 3, 205,350));
+
+        return callStopBuilder.build();
+    }
+    
+    private OpensyncStats.RtpFlowStats getRtpFlowStats(int codec, int jitter, int latency, int totalPackets,
+                                                       int totalPacketsLost, int mos, int firstRtpSeq, int lastRtpSeq) {
+        OpensyncStats.RtpFlowStats.Builder rtpFlowStatsBuilder = OpensyncStats.RtpFlowStats.newBuilder();
+        rtpFlowStatsBuilder.setCodec(codec);
+        rtpFlowStatsBuilder.setBlockCodecs(ByteString.copyFrom(new byte[] { (byte) 0xe6, 0x1 }));
+        rtpFlowStatsBuilder.setDirection(OpensyncStats.RtpFlowStats.RtpFlowDirection.RTP_DOWNSTREAM);
+        rtpFlowStatsBuilder.setRtpFlowType(OpensyncStats.RtpFlowStats.RtpFlowType.RTP_VOICE);
+        rtpFlowStatsBuilder.setJitter(jitter);
+        rtpFlowStatsBuilder.setLatency(latency);
+        rtpFlowStatsBuilder.setTotalPacketsSent(totalPackets);
+        rtpFlowStatsBuilder.setTotalPacketsLost(totalPacketsLost);
+        rtpFlowStatsBuilder.setMosx100(mos);
+        rtpFlowStatsBuilder.setRtpSeqFirst(firstRtpSeq);
+        rtpFlowStatsBuilder.setRtpSeqLast(lastRtpSeq);
+
+        return rtpFlowStatsBuilder.build();
+    }
+
+    private OpensyncStats.CallReport getDefaultCallReport(OpensyncStats.CallReport.CallReportReason reason, int codec,
+                                                          int jitter, int latency, int totalPackets, int totalPacketsLost,
+                                                          int mos, int firstRtpSeq, int lastRtpSeq) {
+        OpensyncStats.CallReport.Builder callReportBuilder = OpensyncStats.CallReport.newBuilder();
+        callReportBuilder.setBand(RadioBandType.BAND5G);
+        callReportBuilder.setChannel(40);
+        callReportBuilder.addCodecs("110 opus/48000/2");
+        callReportBuilder.addCodecs("102 iLBC/8000");
+        callReportBuilder.setClientMac(ByteString.copyFrom("C0:9A:D0:76:A9:69".getBytes()));
+        callReportBuilder.setProviderDomain("skype");
+        callReportBuilder.setSessionId(123L);
+        callReportBuilder.setWifiSessionId(1234L);
+        callReportBuilder.setReason(reason);
+        callReportBuilder.addStats(getRtpFlowStats(codec, jitter, latency, totalPackets, totalPacketsLost,
+                mos, firstRtpSeq, lastRtpSeq));
+
+        return callReportBuilder.build();
+    }
 
     private List<EventReport> getOpensyncStatsEventReportsList() {
 
@@ -342,7 +479,14 @@ public class OpensyncExternalIntegrationMqttMessageProcessorTest {
         List<sts.OpensyncStats.EventReport.ClientSession> clientSessionList = new ArrayList<>();
         clientSessionList.add(clientSessionBuilder.build());
         
+        sts.OpensyncStats.EventReport.ChannelSwitchEvent.Builder channelSwitchEventBuilder = sts.OpensyncStats.EventReport.ChannelSwitchEvent.getDefaultInstance().toBuilder();
+        channelSwitchEventBuilder.setBand(RadioBandType.BAND5GL).setChannel(40).setReason(ChannelSwitchReason.high_interference).setTimestampMs(System.currentTimeMillis());
+
+        List<ChannelSwitchEvent> channelSwitchEventList = new ArrayList<>();
+        channelSwitchEventList.add(channelSwitchEventBuilder.build());
+        
         eventReportBuilder.addAllClientSession(clientSessionList);
+        eventReportBuilder.addAllChannelSwitch(channelSwitchEventList);
 
         eventReportList.add(eventReportBuilder.build());
 

opensync-ext-static/src/main/resources/EquipmentExample.json

@@ -2,7 +2,7 @@
   "model_type": "Equipment",
   "id": 51,
   "customerId": 2,
-  "profileId": 5,
+  "profileId": 12,
   "locationId": 8,
   "equipmentType": "AP",
   "inventoryId": "Test_Client_21P10C68818122",

opensync-ext-static/src/main/resources/ProfileAPExample.json

@@ -1,55 +1,56 @@
 {
-	"model_type": "Profile",
+    "model_type": "Profile",
-	"id": 23,
+    "id": 12,
-	"customerId": 2,
+    "customerId": 2,
-	"profileType": "equipment_ap",
+    "profileType": "equipment_ap",
-	"name": "ApProfile-3-radios-passpoint",
+    "name": "ApProfile-3-radios",
-	"details": {
+    "details": {
-		"model_type": "ApNetworkConfiguration",
+        "model_type": "ApNetworkConfiguration",
-		"networkConfigVersion": "AP-1",
+        "networkConfigVersion": "AP-1",
-		"equipmentType": "AP",
+        "equipmentType": "AP",
-		"vlanNative": true,
+        "vlanNative": true,
-		"vlan": 0,
+        "vlan": 0,
-		"ntpServer": {
+        "ntpServer": {
-			"model_type": "AutoOrManualString",
+            "model_type": "AutoOrManualString",
-			"auto": true,
+            "auto": true,
-			"value": "pool.ntp.org"
+            "value": "pool.ntp.org"
-		},
+        },
-		"syslogRelay": null,
+        "syslogRelay": null,
-		"rtlsSettings": null,
+        "rtlsSettings": null,
-		"syntheticClientEnabled": true,
+        "syntheticClientEnabled": true,
-		"ledControlEnabled": true,
+        "ledControlEnabled": true,
-		"equipmentDiscovery": false,
+        "equipmentDiscovery": false,
-		"greTunnelName": null,
+        "greTunnelName": null,
-		"greParentIfName": null,
+        "greParentIfName": null,
-		"greLocalInetAddr": null,
+        "greLocalInetAddr": null,
-		"greRemoteInetAddr": null,
+        "greRemoteInetAddr": null,
-		"greRemoteMacAddr": null,
+        "greRemoteMacAddr": null,
-		"radioMap": {
+        "radioMap": {
-			"is2dot4GHz": {
+            "is2dot4GHz": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			},
+            },
-			"is5GHzU": {
+            "is5GHzU": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			},
+            },
-			"is5GHzL": {
+            "is5GHzL": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			}
+            }
-		},
+        },
-		"profileType": "equipment_ap"
+        "profileType": "equipment_ap"
-	},
+    },
-	"createdTimestamp": 1605711197140,
+    "createdTimestamp": 1606778369934,
-	"lastModifiedTimestamp": 1605711197140,
+    "lastModifiedTimestamp": 1606778443413,
-	"childProfileIds": [
+    "childProfileIds": [
-		16,
+        16,
-		21,
+        5,
-		22,
+        10,
-		15
+        11,
-	]
+        15
+    ]
 }

opensync-ext-static/src/main/resources/ProfileHotspot20.json

@@ -1,72 +1,71 @@
 [
-{
+	{
-        "model_type": "Profile",
+		"model_type": "Profile",
-        "id": 24,
+		"id": 24,
-        "customerId": 2,
+		"customerId": 2,
-        "profileType": "passpoint",
+		"profileType": "passpoint",
-        "name": "TipWlan-Hotspot20-Config",
+		"name": "TipWlan-Passpoint-Config",
-        "details": {
+		"details": {
-            "model_type": "PasspointProfile",
+			"model_type": "PasspointProfile",
-            "enableInterworkingAndHs20": true,
+			"enableInterworkingAndHs20": true,
-            "hessid": null,
+			"hessid": null,
-            "additionalStepsRequiredForAccess": 0,
+			"passpointAccessNetworkType": "free_public_network",
-            "deauthRequestTimeout": 0,
+			"passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions",
-            "operatingClass": 0,
+			"additionalStepsRequiredForAccess": 0,
-            "termsAndConditionsFile": {
+			"deauthRequestTimeout": 0,
-                "model_type": "ManagedFileInfo",
+			"operatingClass": 0,
-                "md5checksum": null,
+			"termsAndConditionsFile": {
-                "lastModifiedTimestamp": null,
+				"model_type": "ManagedFileInfo",
-                "apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
+				"md5checksum": null,
-                "fileCategory": "ExternalPolicyConfiguration",
+				"lastModifiedTimestamp": null,
-                "fileType": "TEXT",
+				"apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
-                "altSlot": false
+				"fileCategory": "ExternalPolicyConfiguration",
-            },
+				"fileType": "TEXT",
-            "whitelistDomain": null,
+				"altSlot": false
-            "emergencyServicesReachable": true,
+			},
-            "unauthenticatedEmergencyServiceAccessible": false,
+			"whitelistDomain": null,
-            "internetConnectivity": true,
+			"emergencyServicesReachable": true,
-            "connectionCapabilitySet": [
+			"unauthenticatedEmergencyServiceAccessible": false,
-                {
+			"internetConnectivity": true,
-                    "model_type": "PasspointConnectionCapability",
+			"connectionCapabilitySet": [
-                    "connectionCapabilitiesPortNumber": 8888,
+				{
-                    "connectionCapabilitiesIpProtocol": "TCP",
+					"model_type": "PasspointConnectionCapability",
-                    "connectionCapabilitiesStatus": "open"
+					"connectionCapabilitiesPortNumber": 8888,
-                }
+					"connectionCapabilitiesStatus": "open",
-            ],
+					"connectionCapabilitiesIpProtocol": "TCP"
-            "ipAddressTypeAvailability": "public_IPv4_address_available",
+				}
-            "qosMapSetConfiguration": null,
+			],
-            "apGeospatialLocation": null,
+			"ipAddressTypeAvailability": "public_IPv4_address_available",
-            "apCivicLocation": null,
+			"qosMapSetConfiguration": null,
-            "apPublicLocationIdUri": null,
+			"apGeospatialLocation": null,
-            "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
+			"apCivicLocation": null,
-            "anqpDomainId": 1234,
+			"apPublicLocationIdUri": null,
-            "disableDownstreamGroupAddressedForwarding": false,
+			"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
-            "enable2pt4GHz": true,
+			"anqpDomainId": 1234,
-            "enable5GHz": true,
+			"disableDownstreamGroupAddressedForwarding": false,
-            "associatedAccessSsidNames": [
+			"enable2pt4GHz": true,
-                "TipWlan-cloud-hotspot-access"
+			"enable5GHz": true,
-            ],
+			"associatedAccessSsidProfileIds": [
-            "osuSsidName": "TipWlan-cloud-hotspot-osu",
+				15
-            "operatorProfileName": "TipWlan-Hotspot20-Operator",
+			],
-            "venueProfileName": "TipWlan-Hotspot20-Venue",
+			"osuSsidProfileId": 16,
-            "idProviderProfileNames": [
+			"passpointOperatorProfileId": 17,
-                "TipWlan-Hotspot20-OSU-Provider-2",
+			"passpointVenueProfileId": 18,
-                "TipWlan-Hotspot20-OSU-Provider"
+			"passpointOsuProviderProfileIds": [
-            ],
+				19,
-            "accessNetworkType": "free_public_network",
+				20
-            "networkAuthenticationType": "acceptance_of_terms_and_conditions",
+			],
-            "associatedSsids": [
+			"accessNetworkType": "free_public_network",
-                "TipWlan-cloud-hotspot-access"
+			"networkAuthenticationType": "acceptance_of_terms_and_conditions",
-            ],
+			"profileType": "passpoint"
-            "profileType": "passpoint"
+		},
-        },
+		"createdTimestamp": 1606778370807,
-        "createdTimestamp": 1605711223339,
+		"lastModifiedTimestamp": 1606778370807,
-        "lastModifiedTimestamp": 1605711223339,
+		"childProfileIds": [
-        "childProfileIds": [
+			17,
-            17,
+			18,
-            18,
+			19,
-            19,
+			20
-            20
+		]
-        ]
+	}
-    }
 ]

opensync-ext-static/src/main/resources/ProfileIdProvider.json

@@ -4,7 +4,7 @@
 		"id": 19,
 		"customerId": 2,
 		"profileType": "passpoint_osu_id_provider",
-		"name": "TipWlan-Hotspot20-OSU-Provider",
+		"name": "TipWlan-Passpoint-OSU-Provider",
 		"details": {
 			"model_type": "PasspointOsuProviderProfile",
 			"domainName": "rogers.com",
@@ -128,8 +128,8 @@
 			],
 			"profileType": "passpoint_osu_id_provider"
 		},
-		"createdTimestamp": 1605711165325,
+		"createdTimestamp": 1606778370345,
-		"lastModifiedTimestamp": 1605711165325,
+		"lastModifiedTimestamp": 1606778370345,
 		"childProfileIds": [
 		]
 	},
@@ -138,7 +138,7 @@
 		"id": 20,
 		"customerId": 2,
 		"profileType": "passpoint_osu_id_provider",
-		"name": "TipWlan-Hotspot20-OSU-Provider-2",
+		"name": "TipWlan-Passpoint-OSU-Provider-2",
 		"details": {
 			"model_type": "PasspointOsuProviderProfile",
 			"domainName": "telus.com",
@@ -262,8 +262,8 @@
 			],
 			"profileType": "passpoint_osu_id_provider"
 		},
-		"createdTimestamp": 1605711165330,
+		"createdTimestamp": 1606778370351,
-		"lastModifiedTimestamp": 1605711165330,
+		"lastModifiedTimestamp": 1606778370351,
 		"childProfileIds": [
 		]
 	}

opensync-ext-static/src/main/resources/ProfileMetrics.json

@@ -1,10 +1,10 @@
 [
 	{
 		"model_type": "Profile",
-		"id": 22,
+		"id": 10,
 		"customerId": 2,
 		"profileType": "service_metrics_collection_config",
-		"name": "Metrics-Profile-Passpoint",
+		"name": "Metrics-Profile-3-Radios",
 		"details": {
 			"model_type": "ServiceMetricsCollectionConfigProfile",
 			"radioTypes": [
@@ -21,30 +21,6 @@
 			],
 			"metricConfigParameterMap": {
 				"ApNode": [
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -69,18 +45,6 @@
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -92,9 +56,52 @@
 						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzU",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzL",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
 					}
 				],
 				"ApSsid": [
+					{
+						"model_type": "ServiceMetricRadioConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"radioType": "is5GHzU",
+						"serviceMetricDataType": "ApSsid"
+					},
 					{
 						"model_type": "ServiceMetricRadioConfigParameters",
 						"samplingInterval": 30,
@@ -108,13 +115,6 @@
 						"reportingIntervalSeconds": 60,
 						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "ApSsid"
-					},
-					{
-						"model_type": "ServiceMetricRadioConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApSsid"
 					}
 				],
 				"Client": [
@@ -144,12 +144,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
+						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "ON_CHANNEL",
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -168,12 +168,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
+						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "ON_CHANNEL",
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -192,41 +192,29 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
+						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "OFF_CHANNEL",
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
+						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "OFF_CHANNEL",
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					}
 				],
 				"Neighbour": [
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
-						"serviceMetricDataType": "Neighbour",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -251,18 +239,6 @@
 						"serviceMetricDataType": "Neighbour",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "Neighbour",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -286,13 +262,37 @@
 						"radioType": "is5GHzU",
 						"serviceMetricDataType": "Neighbour",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzL",
+						"serviceMetricDataType": "Neighbour",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "Neighbour",
+						"statsReportFormat": "RAW"
 					}
 				]
 			},
 			"profileType": "service_metrics_collection_config"
 		},
-		"createdTimestamp": 1605711195528,
+		"createdTimestamp": 1606778369931,
-		"lastModifiedTimestamp": 1605711195528,
+		"lastModifiedTimestamp": 1606778369931,
 		"childProfileIds": [
 		]
 	}

opensync-ext-static/src/main/resources/ProfileOperator.json

@@ -4,7 +4,7 @@
 		"id": 17,
 		"customerId": 2,
 		"profileType": "passpoint_operator",
-		"name": "TipWlan-Hotspot20-Operator",
+		"name": "TipWlan-Passpoint-Operator",
 		"details": {
 			"model_type": "PasspointOperatorProfile",
 			"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -29,8 +29,8 @@
 			],
 			"profileType": "passpoint_operator"
 		},
-		"createdTimestamp": 1605711164952,
+		"createdTimestamp": 1606778369945,
-		"lastModifiedTimestamp": 1605711164952,
+		"lastModifiedTimestamp": 1606778369945,
 		"childProfileIds": [
 		]
 	}

opensync-ext-static/src/main/resources/ProfileRf.json

@@ -1,205 +1,204 @@
 {
-	"model_type": "Profile",
+    "model_type": "Profile",
-	"id": 21,
+    "id": 11,
-	"customerId": 2,
+    "customerId": 2,
-	"profileType": "rf",
+    "profileType": "rf",
-	"name": "TipWlan-rf-passpoint",
+    "name": "TipWlan-rf",
-	"details": {
+    "details": {
-		"model_type": "RfConfiguration",
+        "model_type": "RfConfiguration",
-		"rfConfigMap": {
+        "rfConfigMap": {
-			"is5GHz": {
+            "is5GHz": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHz",
+                "radioType": "is5GHz",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			},
+            },
-			"is2dot4GHz": {
+            "is2dot4GHz": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is2dot4GHz",
+                "radioType": "is2dot4GHz",
-				"radioMode": "modeN",
+                "radioMode": "modeN",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is20MHz",
+                "channelBandwidth": "is20MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 20,
+                    "dropInSnrPercentage": 20,
-					"minLoadFactor": 50
+                    "minLoadFactor": 50
-				}
+                }
-			},
+            },
-			"is5GHzU": {
+            "is5GHzU": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHzU",
+                "radioType": "is5GHzU",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			},
+            },
-			"is5GHzL": {
+            "is5GHzL": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHzL",
+                "radioType": "is5GHzL",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			}
+            }
-		},
+        },
-		"profileType": "rf"
+        "profileType": "rf"
-	},
+    },
-	"createdTimestamp": 1605711191976,
+    "createdTimestamp": 1606778369933,
-	"lastModifiedTimestamp": 1605711191976,
+    "lastModifiedTimestamp": 1606778369933,
-	"childProfileIds": [
+    "childProfileIds": []
-	]
 }

opensync-ext-static/src/main/resources/ProfileSsid.json

@@ -1,13 +1,80 @@
 [
+	{
+		"model_type": "Profile",
+		"id": 5,
+		"customerId": 2,
+		"profileType": "ssid",
+		"name": "TipWlan-cloud-3-radios",
+		"details": {
+			"model_type": "SsidConfiguration",
+			"ssid": "TipWlan-cloud-3-radios",
+			"appliedRadios": [
+				"is5GHzL",
+				"is2dot4GHz",
+				"is5GHzU"
+			],
+			"ssidAdminState": "enabled",
+			"secureMode": "wpa2OnlyPSK",
+			"vlanId": 1,
+			"keyStr": "openwifi",
+			"broadcastSsid": "enabled",
+			"keyRefresh": 0,
+			"noLocalSubnets": false,
+			"radiusServiceName": null,
+			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
+			"captivePortalId": null,
+			"bandwidthLimitDown": 0,
+			"bandwidthLimitUp": 0,
+			"clientBandwidthLimitDown": 0,
+			"clientBandwidthLimitUp": 0,
+			"videoTrafficOnly": false,
+			"radioBasedConfigs": {
+				"is5GHzL": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is2dot4GHz": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is5GHz": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is5GHzU": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				}
+			},
+			"bonjourGatewayProfileId": null,
+			"enable80211w": null,
+			"wepConfig": null,
+			"forwardMode": "BRIDGE",
+			"profileType": "ssid"
+		},
+		"createdTimestamp": 1606778369598,
+		"lastModifiedTimestamp": 1606778369598,
+		"childProfileIds": [
+		]
+	},
 	{
 		"model_type": "Profile",
 		"id": 15,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-hotspot-access",
+		"name": "TipWlan-cloud-passpoint-access",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-hotspot-access",
+			"ssid": "TipWlan-cloud-passpoint-access",
 			"appliedRadios": [
 				"is5GHzL",
 				"is5GHzU"
@@ -21,6 +88,7 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -28,7 +96,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHz": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -40,13 +108,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzL": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -59,8 +127,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1605711164949,
+		"createdTimestamp": 1606778369943,
-		"lastModifiedTimestamp": 1605711223372,
+		"lastModifiedTimestamp": 1606778370811,
 		"childProfileIds": [
 			24
 		]
@@ -70,10 +138,10 @@
 		"id": 16,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-hotspot-osu",
+		"name": "TipWlan-cloud-passpoint-osu",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-hotspot-osu",
+			"ssid": "TipWlan-cloud-passpoint-osu",
 			"appliedRadios": [
 				"is2dot4GHz"
 			],
@@ -86,6 +154,7 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -93,7 +162,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHz": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -105,13 +174,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzL": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -124,8 +193,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1605711164950,
+		"createdTimestamp": 1606778369944,
-		"lastModifiedTimestamp": 1605711171732,
+		"lastModifiedTimestamp": 1606778370352,
 		"childProfileIds": [
 			19,
 			20

opensync-ext-static/src/main/resources/ProfileVenue.json

@@ -4,7 +4,7 @@
 		"id": 18,
 		"customerId": 2,
 		"profileType": "passpoint_venue",
-		"name": "TipWlan-Hotspot20-Venue",
+		"name": "TipWlan-Passpoint-Venue",
 		"details": {
 			"model_type": "PasspointVenueProfile",
 			"venueNameSet": [
@@ -28,15 +28,15 @@
 				}
 			],
 			"venueTypeAssignment": {
-				"model_type": "ProfileVenueTypeAssignment",
+				"model_type": "PasspointVenueTypeAssignment",
 				"venueDescription": "Research and Development Facility",
 				"venueGroupId": 2,
 				"venueTypeId": 8
 			},
 			"profileType": "passpoint_venue"
 		},
-		"createdTimestamp": 1605711164956,
+		"createdTimestamp": 1606778369950,
-		"lastModifiedTimestamp": 1605711164956,
+		"lastModifiedTimestamp": 1606778369950,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch

@@ -7,6 +7,7 @@
         <listEntry value="1"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">

opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json

@@ -2,7 +2,7 @@
   "model_type": "Equipment",
   "id": 51,
   "customerId": 2,
-  "profileId": 5,
+  "profileId": 12,
   "locationId": 8,
   "equipmentType": "AP",
   "inventoryId": "Test_Client_21P10C68818122",

opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json

@@ -1,55 +1,56 @@
 {
-	"model_type": "Profile",
+    "model_type": "Profile",
-	"id": 23,
+    "id": 12,
-	"customerId": 2,
+    "customerId": 2,
-	"profileType": "equipment_ap",
+    "profileType": "equipment_ap",
-	"name": "ApProfile-3-radios-passpoint",
+    "name": "ApProfile-3-radios",
-	"details": {
+    "details": {
-		"model_type": "ApNetworkConfiguration",
+        "model_type": "ApNetworkConfiguration",
-		"networkConfigVersion": "AP-1",
+        "networkConfigVersion": "AP-1",
-		"equipmentType": "AP",
+        "equipmentType": "AP",
-		"vlanNative": true,
+        "vlanNative": true,
-		"vlan": 0,
+        "vlan": 0,
-		"ntpServer": {
+        "ntpServer": {
-			"model_type": "AutoOrManualString",
+            "model_type": "AutoOrManualString",
-			"auto": true,
+            "auto": true,
-			"value": "pool.ntp.org"
+            "value": "pool.ntp.org"
-		},
+        },
-		"syslogRelay": null,
+        "syslogRelay": null,
-		"rtlsSettings": null,
+        "rtlsSettings": null,
-		"syntheticClientEnabled": true,
+        "syntheticClientEnabled": true,
-		"ledControlEnabled": true,
+        "ledControlEnabled": true,
-		"equipmentDiscovery": false,
+        "equipmentDiscovery": false,
-		"greTunnelName": null,
+        "greTunnelName": null,
-		"greParentIfName": null,
+        "greParentIfName": null,
-		"greLocalInetAddr": null,
+        "greLocalInetAddr": null,
-		"greRemoteInetAddr": null,
+        "greRemoteInetAddr": null,
-		"greRemoteMacAddr": null,
+        "greRemoteMacAddr": null,
-		"radioMap": {
+        "radioMap": {
-			"is2dot4GHz": {
+            "is2dot4GHz": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			},
+            },
-			"is5GHzU": {
+            "is5GHzU": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			},
+            },
-			"is5GHzL": {
+            "is5GHzL": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			}
+            }
-		},
+        },
-		"profileType": "equipment_ap"
+        "profileType": "equipment_ap"
-	},
+    },
-	"createdTimestamp": 1605711197140,
+    "createdTimestamp": 1606778369934,
-	"lastModifiedTimestamp": 1605711197140,
+    "lastModifiedTimestamp": 1606778443413,
-	"childProfileIds": [
+    "childProfileIds": [
-		16,
+        16,
-		21,
+        5,
-		22,
+        10,
-		15
+        11,
-	]
+        15
+    ]
 }

opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json

@@ -1,72 +1,71 @@
 [
-{
+	{
-        "model_type": "Profile",
+		"model_type": "Profile",
-        "id": 24,
+		"id": 24,
-        "customerId": 2,
+		"customerId": 2,
-        "profileType": "passpoint",
+		"profileType": "passpoint",
-        "name": "TipWlan-Hotspot20-Config",
+		"name": "TipWlan-Passpoint-Config",
-        "details": {
+		"details": {
-            "model_type": "PasspointProfile",
+			"model_type": "PasspointProfile",
-            "enableInterworkingAndHs20": true,
+			"enableInterworkingAndHs20": true,
-            "hessid": null,
+			"hessid": null,
-            "additionalStepsRequiredForAccess": 0,
+			"passpointAccessNetworkType": "free_public_network",
-            "deauthRequestTimeout": 0,
+			"passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions",
-            "operatingClass": 0,
+			"additionalStepsRequiredForAccess": 0,
-            "termsAndConditionsFile": {
+			"deauthRequestTimeout": 0,
-                "model_type": "ManagedFileInfo",
+			"operatingClass": 0,
-                "md5checksum": null,
+			"termsAndConditionsFile": {
-                "lastModifiedTimestamp": null,
+				"model_type": "ManagedFileInfo",
-                "apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
+				"md5checksum": null,
-                "fileCategory": "ExternalPolicyConfiguration",
+				"lastModifiedTimestamp": null,
-                "fileType": "TEXT",
+				"apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
-                "altSlot": false
+				"fileCategory": "ExternalPolicyConfiguration",
-            },
+				"fileType": "TEXT",
-            "whitelistDomain": null,
+				"altSlot": false
-            "emergencyServicesReachable": true,
+			},
-            "unauthenticatedEmergencyServiceAccessible": false,
+			"whitelistDomain": null,
-            "internetConnectivity": true,
+			"emergencyServicesReachable": true,
-            "connectionCapabilitySet": [
+			"unauthenticatedEmergencyServiceAccessible": false,
-                {
+			"internetConnectivity": true,
-                    "model_type": "PasspointConnectionCapability",
+			"connectionCapabilitySet": [
-                    "connectionCapabilitiesPortNumber": 8888,
+				{
-                    "connectionCapabilitiesIpProtocol": "TCP",
+					"model_type": "PasspointConnectionCapability",
-                    "connectionCapabilitiesStatus": "open"
+					"connectionCapabilitiesPortNumber": 8888,
-                }
+					"connectionCapabilitiesStatus": "open",
-            ],
+					"connectionCapabilitiesIpProtocol": "TCP"
-            "ipAddressTypeAvailability": "public_IPv4_address_available",
+				}
-            "qosMapSetConfiguration": null,
+			],
-            "apGeospatialLocation": null,
+			"ipAddressTypeAvailability": "public_IPv4_address_available",
-            "apCivicLocation": null,
+			"qosMapSetConfiguration": null,
-            "apPublicLocationIdUri": null,
+			"apGeospatialLocation": null,
-            "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
+			"apCivicLocation": null,
-            "anqpDomainId": 1234,
+			"apPublicLocationIdUri": null,
-            "disableDownstreamGroupAddressedForwarding": false,
+			"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
-            "enable2pt4GHz": true,
+			"anqpDomainId": 1234,
-            "enable5GHz": true,
+			"disableDownstreamGroupAddressedForwarding": false,
-            "associatedAccessSsidNames": [
+			"enable2pt4GHz": true,
-                "TipWlan-cloud-hotspot-access"
+			"enable5GHz": true,
-            ],
+			"associatedAccessSsidProfileIds": [
-            "osuSsidName": "TipWlan-cloud-hotspot-osu",
+				15
-            "operatorProfileName": "TipWlan-Hotspot20-Operator",
+			],
-            "venueProfileName": "TipWlan-Hotspot20-Venue",
+			"osuSsidProfileId": 16,
-            "idProviderProfileNames": [
+			"passpointOperatorProfileId": 17,
-                "TipWlan-Hotspot20-OSU-Provider-2",
+			"passpointVenueProfileId": 18,
-                "TipWlan-Hotspot20-OSU-Provider"
+			"passpointOsuProviderProfileIds": [
-            ],
+				19,
-            "accessNetworkType": "free_public_network",
+				20
-            "networkAuthenticationType": "acceptance_of_terms_and_conditions",
+			],
-            "associatedSsids": [
+			"accessNetworkType": "free_public_network",
-                "TipWlan-cloud-hotspot-access"
+			"networkAuthenticationType": "acceptance_of_terms_and_conditions",
-            ],
+			"profileType": "passpoint"
-            "profileType": "passpoint"
+		},
-        },
+		"createdTimestamp": 1606778370807,
-        "createdTimestamp": 1605711223339,
+		"lastModifiedTimestamp": 1606778370807,
-        "lastModifiedTimestamp": 1605711223339,
+		"childProfileIds": [
-        "childProfileIds": [
+			17,
-            17,
+			18,
-            18,
+			19,
-            19,
+			20
-            20
+		]
-        ]
+	}
-    }
 ]

opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json

@@ -4,7 +4,7 @@
 		"id": 19,
 		"customerId": 2,
 		"profileType": "passpoint_osu_id_provider",
-		"name": "TipWlan-Hotspot20-OSU-Provider",
+		"name": "TipWlan-Passpoint-OSU-Provider",
 		"details": {
 			"model_type": "PasspointOsuProviderProfile",
 			"domainName": "rogers.com",
@@ -128,8 +128,8 @@
 			],
 			"profileType": "passpoint_osu_id_provider"
 		},
-		"createdTimestamp": 1605711165325,
+		"createdTimestamp": 1606778370345,
-		"lastModifiedTimestamp": 1605711165325,
+		"lastModifiedTimestamp": 1606778370345,
 		"childProfileIds": [
 		]
 	},
@@ -138,7 +138,7 @@
 		"id": 20,
 		"customerId": 2,
 		"profileType": "passpoint_osu_id_provider",
-		"name": "TipWlan-Hotspot20-OSU-Provider-2",
+		"name": "TipWlan-Passpoint-OSU-Provider-2",
 		"details": {
 			"model_type": "PasspointOsuProviderProfile",
 			"domainName": "telus.com",
@@ -262,8 +262,8 @@
 			],
 			"profileType": "passpoint_osu_id_provider"
 		},
-		"createdTimestamp": 1605711165330,
+		"createdTimestamp": 1606778370351,
-		"lastModifiedTimestamp": 1605711165330,
+		"lastModifiedTimestamp": 1606778370351,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json

@@ -1,10 +1,10 @@
 [
 	{
 		"model_type": "Profile",
-		"id": 22,
+		"id": 10,
 		"customerId": 2,
 		"profileType": "service_metrics_collection_config",
-		"name": "Metrics-Profile-Passpoint",
+		"name": "Metrics-Profile-3-Radios",
 		"details": {
 			"model_type": "ServiceMetricsCollectionConfigProfile",
 			"radioTypes": [
@@ -21,30 +21,6 @@
 			],
 			"metricConfigParameterMap": {
 				"ApNode": [
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -69,18 +45,6 @@
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -92,9 +56,52 @@
 						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzU",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzL",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
 					}
 				],
 				"ApSsid": [
+					{
+						"model_type": "ServiceMetricRadioConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"radioType": "is5GHzU",
+						"serviceMetricDataType": "ApSsid"
+					},
 					{
 						"model_type": "ServiceMetricRadioConfigParameters",
 						"samplingInterval": 30,
@@ -108,13 +115,6 @@
 						"reportingIntervalSeconds": 60,
 						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "ApSsid"
-					},
-					{
-						"model_type": "ServiceMetricRadioConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApSsid"
 					}
 				],
 				"Client": [
@@ -144,12 +144,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
+						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "ON_CHANNEL",
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -168,12 +168,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
+						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "ON_CHANNEL",
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -192,41 +192,29 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
+						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "OFF_CHANNEL",
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
+						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "OFF_CHANNEL",
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					}
 				],
 				"Neighbour": [
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
-						"serviceMetricDataType": "Neighbour",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -251,18 +239,6 @@
 						"serviceMetricDataType": "Neighbour",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "Neighbour",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -286,13 +262,37 @@
 						"radioType": "is5GHzU",
 						"serviceMetricDataType": "Neighbour",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzL",
+						"serviceMetricDataType": "Neighbour",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "Neighbour",
+						"statsReportFormat": "RAW"
 					}
 				]
 			},
 			"profileType": "service_metrics_collection_config"
 		},
-		"createdTimestamp": 1605711195528,
+		"createdTimestamp": 1606778369931,
-		"lastModifiedTimestamp": 1605711195528,
+		"lastModifiedTimestamp": 1606778369931,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json

@@ -4,7 +4,7 @@
 		"id": 17,
 		"customerId": 2,
 		"profileType": "passpoint_operator",
-		"name": "TipWlan-Hotspot20-Operator",
+		"name": "TipWlan-Passpoint-Operator",
 		"details": {
 			"model_type": "PasspointOperatorProfile",
 			"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -29,8 +29,8 @@
 			],
 			"profileType": "passpoint_operator"
 		},
-		"createdTimestamp": 1605711164952,
+		"createdTimestamp": 1606778369945,
-		"lastModifiedTimestamp": 1605711164952,
+		"lastModifiedTimestamp": 1606778369945,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json

@@ -1,205 +1,204 @@
 {
-	"model_type": "Profile",
+    "model_type": "Profile",
-	"id": 21,
+    "id": 11,
-	"customerId": 2,
+    "customerId": 2,
-	"profileType": "rf",
+    "profileType": "rf",
-	"name": "TipWlan-rf-passpoint",
+    "name": "TipWlan-rf",
-	"details": {
+    "details": {
-		"model_type": "RfConfiguration",
+        "model_type": "RfConfiguration",
-		"rfConfigMap": {
+        "rfConfigMap": {
-			"is5GHz": {
+            "is5GHz": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHz",
+                "radioType": "is5GHz",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			},
+            },
-			"is2dot4GHz": {
+            "is2dot4GHz": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is2dot4GHz",
+                "radioType": "is2dot4GHz",
-				"radioMode": "modeN",
+                "radioMode": "modeN",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is20MHz",
+                "channelBandwidth": "is20MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 20,
+                    "dropInSnrPercentage": 20,
-					"minLoadFactor": 50
+                    "minLoadFactor": 50
-				}
+                }
-			},
+            },
-			"is5GHzU": {
+            "is5GHzU": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHzU",
+                "radioType": "is5GHzU",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			},
+            },
-			"is5GHzL": {
+            "is5GHzL": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHzL",
+                "radioType": "is5GHzL",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			}
+            }
-		},
+        },
-		"profileType": "rf"
+        "profileType": "rf"
-	},
+    },
-	"createdTimestamp": 1605711191976,
+    "createdTimestamp": 1606778369933,
-	"lastModifiedTimestamp": 1605711191976,
+    "lastModifiedTimestamp": 1606778369933,
-	"childProfileIds": [
+    "childProfileIds": []
-	]
 }

opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json

@@ -1,13 +1,80 @@
 [
+	{
+		"model_type": "Profile",
+		"id": 5,
+		"customerId": 2,
+		"profileType": "ssid",
+		"name": "TipWlan-cloud-3-radios",
+		"details": {
+			"model_type": "SsidConfiguration",
+			"ssid": "TipWlan-cloud-3-radios",
+			"appliedRadios": [
+				"is5GHzL",
+				"is2dot4GHz",
+				"is5GHzU"
+			],
+			"ssidAdminState": "enabled",
+			"secureMode": "wpa2OnlyPSK",
+			"vlanId": 1,
+			"keyStr": "openwifi",
+			"broadcastSsid": "enabled",
+			"keyRefresh": 0,
+			"noLocalSubnets": false,
+			"radiusServiceName": null,
+			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
+			"captivePortalId": null,
+			"bandwidthLimitDown": 0,
+			"bandwidthLimitUp": 0,
+			"clientBandwidthLimitDown": 0,
+			"clientBandwidthLimitUp": 0,
+			"videoTrafficOnly": false,
+			"radioBasedConfigs": {
+				"is5GHzL": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is2dot4GHz": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is5GHz": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is5GHzU": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				}
+			},
+			"bonjourGatewayProfileId": null,
+			"enable80211w": null,
+			"wepConfig": null,
+			"forwardMode": "BRIDGE",
+			"profileType": "ssid"
+		},
+		"createdTimestamp": 1606778369598,
+		"lastModifiedTimestamp": 1606778369598,
+		"childProfileIds": [
+		]
+	},
 	{
 		"model_type": "Profile",
 		"id": 15,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-hotspot-access",
+		"name": "TipWlan-cloud-passpoint-access",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-hotspot-access",
+			"ssid": "TipWlan-cloud-passpoint-access",
 			"appliedRadios": [
 				"is5GHzL",
 				"is5GHzU"
@@ -21,6 +88,7 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -28,7 +96,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHz": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -40,13 +108,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzL": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -59,8 +127,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1605711164949,
+		"createdTimestamp": 1606778369943,
-		"lastModifiedTimestamp": 1605711223372,
+		"lastModifiedTimestamp": 1606778370811,
 		"childProfileIds": [
 			24
 		]
@@ -70,10 +138,10 @@
 		"id": 16,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-hotspot-osu",
+		"name": "TipWlan-cloud-passpoint-osu",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-hotspot-osu",
+			"ssid": "TipWlan-cloud-passpoint-osu",
 			"appliedRadios": [
 				"is2dot4GHz"
 			],
@@ -86,6 +154,7 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -93,7 +162,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHz": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -105,13 +174,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzL": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -124,8 +193,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1605711164950,
+		"createdTimestamp": 1606778369944,
-		"lastModifiedTimestamp": 1605711171732,
+		"lastModifiedTimestamp": 1606778370352,
 		"childProfileIds": [
 			19,
 			20

opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json

@@ -4,7 +4,7 @@
 		"id": 18,
 		"customerId": 2,
 		"profileType": "passpoint_venue",
-		"name": "TipWlan-Hotspot20-Venue",
+		"name": "TipWlan-Passpoint-Venue",
 		"details": {
 			"model_type": "PasspointVenueProfile",
 			"venueNameSet": [
@@ -28,15 +28,15 @@
 				}
 			],
 			"venueTypeAssignment": {
-				"model_type": "ProfileVenueTypeAssignment",
+				"model_type": "PasspointVenueTypeAssignment",
 				"venueDescription": "Research and Development Facility",
 				"venueGroupId": 2,
 				"venueTypeId": 8
 			},
 			"profileType": "passpoint_venue"
 		},
-		"createdTimestamp": 1605711164956,
+		"createdTimestamp": 1606778369950,
-		"lastModifiedTimestamp": 1605711164956,
+		"lastModifiedTimestamp": 1606778369950,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json

@@ -2,7 +2,7 @@
   "model_type": "Equipment",
   "id": 51,
   "customerId": 2,
-  "profileId": 5,
+  "profileId": 12,
   "locationId": 8,
   "equipmentType": "AP",
   "inventoryId": "Test_Client_21P10C68818122",

opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json

@@ -1,55 +1,56 @@
 {
-	"model_type": "Profile",
+    "model_type": "Profile",
-	"id": 23,
+    "id": 12,
-	"customerId": 2,
+    "customerId": 2,
-	"profileType": "equipment_ap",
+    "profileType": "equipment_ap",
-	"name": "ApProfile-3-radios-passpoint",
+    "name": "ApProfile-3-radios",
-	"details": {
+    "details": {
-		"model_type": "ApNetworkConfiguration",
+        "model_type": "ApNetworkConfiguration",
-		"networkConfigVersion": "AP-1",
+        "networkConfigVersion": "AP-1",
-		"equipmentType": "AP",
+        "equipmentType": "AP",
-		"vlanNative": true,
+        "vlanNative": true,
-		"vlan": 0,
+        "vlan": 0,
-		"ntpServer": {
+        "ntpServer": {
-			"model_type": "AutoOrManualString",
+            "model_type": "AutoOrManualString",
-			"auto": true,
+            "auto": true,
-			"value": "pool.ntp.org"
+            "value": "pool.ntp.org"
-		},
+        },
-		"syslogRelay": null,
+        "syslogRelay": null,
-		"rtlsSettings": null,
+        "rtlsSettings": null,
-		"syntheticClientEnabled": true,
+        "syntheticClientEnabled": true,
-		"ledControlEnabled": true,
+        "ledControlEnabled": true,
-		"equipmentDiscovery": false,
+        "equipmentDiscovery": false,
-		"greTunnelName": null,
+        "greTunnelName": null,
-		"greParentIfName": null,
+        "greParentIfName": null,
-		"greLocalInetAddr": null,
+        "greLocalInetAddr": null,
-		"greRemoteInetAddr": null,
+        "greRemoteInetAddr": null,
-		"greRemoteMacAddr": null,
+        "greRemoteMacAddr": null,
-		"radioMap": {
+        "radioMap": {
-			"is2dot4GHz": {
+            "is2dot4GHz": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			},
+            },
-			"is5GHzU": {
+            "is5GHzU": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			},
+            },
-			"is5GHzL": {
+            "is5GHzL": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			}
+            }
-		},
+        },
-		"profileType": "equipment_ap"
+        "profileType": "equipment_ap"
-	},
+    },
-	"createdTimestamp": 1605711197140,
+    "createdTimestamp": 1606778369934,
-	"lastModifiedTimestamp": 1605711197140,
+    "lastModifiedTimestamp": 1606778443413,
-	"childProfileIds": [
+    "childProfileIds": [
-		16,
+        16,
-		21,
+        5,
-		22,
+        10,
-		15
+        11,
-	]
+        15
+    ]
 }

opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json

@@ -1,72 +1,71 @@
 [
-{
+	{
-        "model_type": "Profile",
+		"model_type": "Profile",
-        "id": 24,
+		"id": 24,
-        "customerId": 2,
+		"customerId": 2,
-        "profileType": "passpoint",
+		"profileType": "passpoint",
-        "name": "TipWlan-Hotspot20-Config",
+		"name": "TipWlan-Passpoint-Config",
-        "details": {
+		"details": {
-            "model_type": "PasspointProfile",
+			"model_type": "PasspointProfile",
-            "enableInterworkingAndHs20": true,
+			"enableInterworkingAndHs20": true,
-            "hessid": null,
+			"hessid": null,
-            "additionalStepsRequiredForAccess": 0,
+			"passpointAccessNetworkType": "free_public_network",
-            "deauthRequestTimeout": 0,
+			"passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions",
-            "operatingClass": 0,
+			"additionalStepsRequiredForAccess": 0,
-            "termsAndConditionsFile": {
+			"deauthRequestTimeout": 0,
-                "model_type": "ManagedFileInfo",
+			"operatingClass": 0,
-                "md5checksum": null,
+			"termsAndConditionsFile": {
-                "lastModifiedTimestamp": null,
+				"model_type": "ManagedFileInfo",
-                "apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
+				"md5checksum": null,
-                "fileCategory": "ExternalPolicyConfiguration",
+				"lastModifiedTimestamp": null,
-                "fileType": "TEXT",
+				"apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
-                "altSlot": false
+				"fileCategory": "ExternalPolicyConfiguration",
-            },
+				"fileType": "TEXT",
-            "whitelistDomain": null,
+				"altSlot": false
-            "emergencyServicesReachable": true,
+			},
-            "unauthenticatedEmergencyServiceAccessible": false,
+			"whitelistDomain": null,
-            "internetConnectivity": true,
+			"emergencyServicesReachable": true,
-            "connectionCapabilitySet": [
+			"unauthenticatedEmergencyServiceAccessible": false,
-                {
+			"internetConnectivity": true,
-                    "model_type": "PasspointConnectionCapability",
+			"connectionCapabilitySet": [
-                    "connectionCapabilitiesPortNumber": 8888,
+				{
-                    "connectionCapabilitiesIpProtocol": "TCP",
+					"model_type": "PasspointConnectionCapability",
-                    "connectionCapabilitiesStatus": "open"
+					"connectionCapabilitiesPortNumber": 8888,
-                }
+					"connectionCapabilitiesStatus": "open",
-            ],
+					"connectionCapabilitiesIpProtocol": "TCP"
-            "ipAddressTypeAvailability": "public_IPv4_address_available",
+				}
-            "qosMapSetConfiguration": null,
+			],
-            "apGeospatialLocation": null,
+			"ipAddressTypeAvailability": "public_IPv4_address_available",
-            "apCivicLocation": null,
+			"qosMapSetConfiguration": null,
-            "apPublicLocationIdUri": null,
+			"apGeospatialLocation": null,
-            "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
+			"apCivicLocation": null,
-            "anqpDomainId": 1234,
+			"apPublicLocationIdUri": null,
-            "disableDownstreamGroupAddressedForwarding": false,
+			"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
-            "enable2pt4GHz": true,
+			"anqpDomainId": 1234,
-            "enable5GHz": true,
+			"disableDownstreamGroupAddressedForwarding": false,
-            "associatedAccessSsidNames": [
+			"enable2pt4GHz": true,
-                "TipWlan-cloud-hotspot-access"
+			"enable5GHz": true,
-            ],
+			"associatedAccessSsidProfileIds": [
-            "osuSsidName": "TipWlan-cloud-hotspot-osu",
+				15
-            "operatorProfileName": "TipWlan-Hotspot20-Operator",
+			],
-            "venueProfileName": "TipWlan-Hotspot20-Venue",
+			"osuSsidProfileId": 16,
-            "idProviderProfileNames": [
+			"passpointOperatorProfileId": 17,
-                "TipWlan-Hotspot20-OSU-Provider-2",
+			"passpointVenueProfileId": 18,
-                "TipWlan-Hotspot20-OSU-Provider"
+			"passpointOsuProviderProfileIds": [
-            ],
+				19,
-            "accessNetworkType": "free_public_network",
+				20
-            "networkAuthenticationType": "acceptance_of_terms_and_conditions",
+			],
-            "associatedSsids": [
+			"accessNetworkType": "free_public_network",
-                "TipWlan-cloud-hotspot-access"
+			"networkAuthenticationType": "acceptance_of_terms_and_conditions",
-            ],
+			"profileType": "passpoint"
-            "profileType": "passpoint"
+		},
-        },
+		"createdTimestamp": 1606778370807,
-        "createdTimestamp": 1605711223339,
+		"lastModifiedTimestamp": 1606778370807,
-        "lastModifiedTimestamp": 1605711223339,
+		"childProfileIds": [
-        "childProfileIds": [
+			17,
-            17,
+			18,
-            18,
+			19,
-            19,
+			20
-            20
+		]
-        ]
+	}
-    }
 ]

opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json

@@ -4,7 +4,7 @@
 		"id": 19,
 		"customerId": 2,
 		"profileType": "passpoint_osu_id_provider",
-		"name": "TipWlan-Hotspot20-OSU-Provider",
+		"name": "TipWlan-Passpoint-OSU-Provider",
 		"details": {
 			"model_type": "PasspointOsuProviderProfile",
 			"domainName": "rogers.com",
@@ -128,8 +128,8 @@
 			],
 			"profileType": "passpoint_osu_id_provider"
 		},
-		"createdTimestamp": 1605711165325,
+		"createdTimestamp": 1606778370345,
-		"lastModifiedTimestamp": 1605711165325,
+		"lastModifiedTimestamp": 1606778370345,
 		"childProfileIds": [
 		]
 	},
@@ -138,7 +138,7 @@
 		"id": 20,
 		"customerId": 2,
 		"profileType": "passpoint_osu_id_provider",
-		"name": "TipWlan-Hotspot20-OSU-Provider-2",
+		"name": "TipWlan-Passpoint-OSU-Provider-2",
 		"details": {
 			"model_type": "PasspointOsuProviderProfile",
 			"domainName": "telus.com",
@@ -262,8 +262,8 @@
 			],
 			"profileType": "passpoint_osu_id_provider"
 		},
-		"createdTimestamp": 1605711165330,
+		"createdTimestamp": 1606778370351,
-		"lastModifiedTimestamp": 1605711165330,
+		"lastModifiedTimestamp": 1606778370351,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json

@@ -1,10 +1,10 @@
 [
 	{
 		"model_type": "Profile",
-		"id": 22,
+		"id": 10,
 		"customerId": 2,
 		"profileType": "service_metrics_collection_config",
-		"name": "Metrics-Profile-Passpoint",
+		"name": "Metrics-Profile-3-Radios",
 		"details": {
 			"model_type": "ServiceMetricsCollectionConfigProfile",
 			"radioTypes": [
@@ -21,30 +21,6 @@
 			],
 			"metricConfigParameterMap": {
 				"ApNode": [
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -69,18 +45,6 @@
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -92,9 +56,52 @@
 						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzU",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzL",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
 					}
 				],
 				"ApSsid": [
+					{
+						"model_type": "ServiceMetricRadioConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"radioType": "is5GHzU",
+						"serviceMetricDataType": "ApSsid"
+					},
 					{
 						"model_type": "ServiceMetricRadioConfigParameters",
 						"samplingInterval": 30,
@@ -108,13 +115,6 @@
 						"reportingIntervalSeconds": 60,
 						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "ApSsid"
-					},
-					{
-						"model_type": "ServiceMetricRadioConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApSsid"
 					}
 				],
 				"Client": [
@@ -144,12 +144,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
+						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "ON_CHANNEL",
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -168,12 +168,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
+						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "ON_CHANNEL",
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -192,41 +192,29 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
+						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "OFF_CHANNEL",
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
+						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "OFF_CHANNEL",
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					}
 				],
 				"Neighbour": [
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
-						"serviceMetricDataType": "Neighbour",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -251,18 +239,6 @@
 						"serviceMetricDataType": "Neighbour",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "Neighbour",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -286,13 +262,37 @@
 						"radioType": "is5GHzU",
 						"serviceMetricDataType": "Neighbour",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzL",
+						"serviceMetricDataType": "Neighbour",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "Neighbour",
+						"statsReportFormat": "RAW"
 					}
 				]
 			},
 			"profileType": "service_metrics_collection_config"
 		},
-		"createdTimestamp": 1605711195528,
+		"createdTimestamp": 1606778369931,
-		"lastModifiedTimestamp": 1605711195528,
+		"lastModifiedTimestamp": 1606778369931,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json

@@ -4,7 +4,7 @@
 		"id": 17,
 		"customerId": 2,
 		"profileType": "passpoint_operator",
-		"name": "TipWlan-Hotspot20-Operator",
+		"name": "TipWlan-Passpoint-Operator",
 		"details": {
 			"model_type": "PasspointOperatorProfile",
 			"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -29,8 +29,8 @@
 			],
 			"profileType": "passpoint_operator"
 		},
-		"createdTimestamp": 1605711164952,
+		"createdTimestamp": 1606778369945,
-		"lastModifiedTimestamp": 1605711164952,
+		"lastModifiedTimestamp": 1606778369945,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json

@@ -1,205 +1,204 @@
 {
-	"model_type": "Profile",
+    "model_type": "Profile",
-	"id": 21,
+    "id": 11,
-	"customerId": 2,
+    "customerId": 2,
-	"profileType": "rf",
+    "profileType": "rf",
-	"name": "TipWlan-rf-passpoint",
+    "name": "TipWlan-rf",
-	"details": {
+    "details": {
-		"model_type": "RfConfiguration",
+        "model_type": "RfConfiguration",
-		"rfConfigMap": {
+        "rfConfigMap": {
-			"is5GHz": {
+            "is5GHz": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHz",
+                "radioType": "is5GHz",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			},
+            },
-			"is2dot4GHz": {
+            "is2dot4GHz": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is2dot4GHz",
+                "radioType": "is2dot4GHz",
-				"radioMode": "modeN",
+                "radioMode": "modeN",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is20MHz",
+                "channelBandwidth": "is20MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 20,
+                    "dropInSnrPercentage": 20,
-					"minLoadFactor": 50
+                    "minLoadFactor": 50
-				}
+                }
-			},
+            },
-			"is5GHzU": {
+            "is5GHzU": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHzU",
+                "radioType": "is5GHzU",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			},
+            },
-			"is5GHzL": {
+            "is5GHzL": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHzL",
+                "radioType": "is5GHzL",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			}
+            }
-		},
+        },
-		"profileType": "rf"
+        "profileType": "rf"
-	},
+    },
-	"createdTimestamp": 1605711191976,
+    "createdTimestamp": 1606778369933,
-	"lastModifiedTimestamp": 1605711191976,
+    "lastModifiedTimestamp": 1606778369933,
-	"childProfileIds": [
+    "childProfileIds": []
-	]
 }

opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json

@@ -1,13 +1,80 @@
 [
+	{
+		"model_type": "Profile",
+		"id": 5,
+		"customerId": 2,
+		"profileType": "ssid",
+		"name": "TipWlan-cloud-3-radios",
+		"details": {
+			"model_type": "SsidConfiguration",
+			"ssid": "TipWlan-cloud-3-radios",
+			"appliedRadios": [
+				"is5GHzL",
+				"is2dot4GHz",
+				"is5GHzU"
+			],
+			"ssidAdminState": "enabled",
+			"secureMode": "wpa2OnlyPSK",
+			"vlanId": 1,
+			"keyStr": "openwifi",
+			"broadcastSsid": "enabled",
+			"keyRefresh": 0,
+			"noLocalSubnets": false,
+			"radiusServiceName": null,
+			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
+			"captivePortalId": null,
+			"bandwidthLimitDown": 0,
+			"bandwidthLimitUp": 0,
+			"clientBandwidthLimitDown": 0,
+			"clientBandwidthLimitUp": 0,
+			"videoTrafficOnly": false,
+			"radioBasedConfigs": {
+				"is5GHzL": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is2dot4GHz": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is5GHz": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is5GHzU": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				}
+			},
+			"bonjourGatewayProfileId": null,
+			"enable80211w": null,
+			"wepConfig": null,
+			"forwardMode": "BRIDGE",
+			"profileType": "ssid"
+		},
+		"createdTimestamp": 1606778369598,
+		"lastModifiedTimestamp": 1606778369598,
+		"childProfileIds": [
+		]
+	},
 	{
 		"model_type": "Profile",
 		"id": 15,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-hotspot-access",
+		"name": "TipWlan-cloud-passpoint-access",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-hotspot-access",
+			"ssid": "TipWlan-cloud-passpoint-access",
 			"appliedRadios": [
 				"is5GHzL",
 				"is5GHzU"
@@ -21,6 +88,7 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -28,7 +96,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHz": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -40,13 +108,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzL": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -59,8 +127,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1605711164949,
+		"createdTimestamp": 1606778369943,
-		"lastModifiedTimestamp": 1605711223372,
+		"lastModifiedTimestamp": 1606778370811,
 		"childProfileIds": [
 			24
 		]
@@ -70,10 +138,10 @@
 		"id": 16,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-hotspot-osu",
+		"name": "TipWlan-cloud-passpoint-osu",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-hotspot-osu",
+			"ssid": "TipWlan-cloud-passpoint-osu",
 			"appliedRadios": [
 				"is2dot4GHz"
 			],
@@ -86,6 +154,7 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -93,7 +162,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHz": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -105,13 +174,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzL": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -124,8 +193,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1605711164950,
+		"createdTimestamp": 1606778369944,
-		"lastModifiedTimestamp": 1605711171732,
+		"lastModifiedTimestamp": 1606778370352,
 		"childProfileIds": [
 			19,
 			20

opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json

@@ -4,7 +4,7 @@
 		"id": 18,
 		"customerId": 2,
 		"profileType": "passpoint_venue",
-		"name": "TipWlan-Hotspot20-Venue",
+		"name": "TipWlan-Passpoint-Venue",
 		"details": {
 			"model_type": "PasspointVenueProfile",
 			"venueNameSet": [
@@ -28,15 +28,15 @@
 				}
 			],
 			"venueTypeAssignment": {
-				"model_type": "ProfileVenueTypeAssignment",
+				"model_type": "PasspointVenueTypeAssignment",
 				"venueDescription": "Research and Development Facility",
 				"venueGroupId": 2,
 				"venueTypeId": 8
 			},
 			"profileType": "passpoint_venue"
 		},
-		"createdTimestamp": 1605711164956,
+		"createdTimestamp": 1606778369950,
-		"lastModifiedTimestamp": 1605711164956,
+		"lastModifiedTimestamp": 1606778369950,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json

@@ -2,7 +2,7 @@
   "model_type": "Equipment",
   "id": 51,
   "customerId": 2,
-  "profileId": 5,
+  "profileId": 12,
   "locationId": 8,
   "equipmentType": "AP",
   "inventoryId": "Test_Client_21P10C68818122",

opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json

@@ -1,55 +1,56 @@
 {
-	"model_type": "Profile",
+    "model_type": "Profile",
-	"id": 23,
+    "id": 12,
-	"customerId": 2,
+    "customerId": 2,
-	"profileType": "equipment_ap",
+    "profileType": "equipment_ap",
-	"name": "ApProfile-3-radios-passpoint",
+    "name": "ApProfile-3-radios",
-	"details": {
+    "details": {
-		"model_type": "ApNetworkConfiguration",
+        "model_type": "ApNetworkConfiguration",
-		"networkConfigVersion": "AP-1",
+        "networkConfigVersion": "AP-1",
-		"equipmentType": "AP",
+        "equipmentType": "AP",
-		"vlanNative": true,
+        "vlanNative": true,
-		"vlan": 0,
+        "vlan": 0,
-		"ntpServer": {
+        "ntpServer": {
-			"model_type": "AutoOrManualString",
+            "model_type": "AutoOrManualString",
-			"auto": true,
+            "auto": true,
-			"value": "pool.ntp.org"
+            "value": "pool.ntp.org"
-		},
+        },
-		"syslogRelay": null,
+        "syslogRelay": null,
-		"rtlsSettings": null,
+        "rtlsSettings": null,
-		"syntheticClientEnabled": true,
+        "syntheticClientEnabled": true,
-		"ledControlEnabled": true,
+        "ledControlEnabled": true,
-		"equipmentDiscovery": false,
+        "equipmentDiscovery": false,
-		"greTunnelName": null,
+        "greTunnelName": null,
-		"greParentIfName": null,
+        "greParentIfName": null,
-		"greLocalInetAddr": null,
+        "greLocalInetAddr": null,
-		"greRemoteInetAddr": null,
+        "greRemoteInetAddr": null,
-		"greRemoteMacAddr": null,
+        "greRemoteMacAddr": null,
-		"radioMap": {
+        "radioMap": {
-			"is2dot4GHz": {
+            "is2dot4GHz": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			},
+            },
-			"is5GHzU": {
+            "is5GHzU": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			},
+            },
-			"is5GHzL": {
+            "is5GHzL": {
-				"model_type": "RadioProfileConfiguration",
+                "model_type": "RadioProfileConfiguration",
-				"bestApEnabled": true,
+                "bestApEnabled": true,
-				"bestAPSteerType": "both"
+                "bestAPSteerType": "both"
-			}
+            }
-		},
+        },
-		"profileType": "equipment_ap"
+        "profileType": "equipment_ap"
-	},
+    },
-	"createdTimestamp": 1605711197140,
+    "createdTimestamp": 1606778369934,
-	"lastModifiedTimestamp": 1605711197140,
+    "lastModifiedTimestamp": 1606778443413,
-	"childProfileIds": [
+    "childProfileIds": [
-		16,
+        16,
-		21,
+        5,
-		22,
+        10,
-		15
+        11,
-	]
+        15
+    ]
 }

opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json

@@ -1,72 +1,71 @@
 [
-{
+	{
-        "model_type": "Profile",
+		"model_type": "Profile",
-        "id": 24,
+		"id": 24,
-        "customerId": 2,
+		"customerId": 2,
-        "profileType": "passpoint",
+		"profileType": "passpoint",
-        "name": "TipWlan-Hotspot20-Config",
+		"name": "TipWlan-Passpoint-Config",
-        "details": {
+		"details": {
-            "model_type": "PasspointProfile",
+			"model_type": "PasspointProfile",
-            "enableInterworkingAndHs20": true,
+			"enableInterworkingAndHs20": true,
-            "hessid": null,
+			"hessid": null,
-            "additionalStepsRequiredForAccess": 0,
+			"passpointAccessNetworkType": "free_public_network",
-            "deauthRequestTimeout": 0,
+			"passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions",
-            "operatingClass": 0,
+			"additionalStepsRequiredForAccess": 0,
-            "termsAndConditionsFile": {
+			"deauthRequestTimeout": 0,
-                "model_type": "ManagedFileInfo",
+			"operatingClass": 0,
-                "md5checksum": null,
+			"termsAndConditionsFile": {
-                "lastModifiedTimestamp": null,
+				"model_type": "ManagedFileInfo",
-                "apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
+				"md5checksum": null,
-                "fileCategory": "ExternalPolicyConfiguration",
+				"lastModifiedTimestamp": null,
-                "fileType": "TEXT",
+				"apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
-                "altSlot": false
+				"fileCategory": "ExternalPolicyConfiguration",
-            },
+				"fileType": "TEXT",
-            "whitelistDomain": null,
+				"altSlot": false
-            "emergencyServicesReachable": true,
+			},
-            "unauthenticatedEmergencyServiceAccessible": false,
+			"whitelistDomain": null,
-            "internetConnectivity": true,
+			"emergencyServicesReachable": true,
-            "connectionCapabilitySet": [
+			"unauthenticatedEmergencyServiceAccessible": false,
-                {
+			"internetConnectivity": true,
-                    "model_type": "PasspointConnectionCapability",
+			"connectionCapabilitySet": [
-                    "connectionCapabilitiesPortNumber": 8888,
+				{
-                    "connectionCapabilitiesIpProtocol": "TCP",
+					"model_type": "PasspointConnectionCapability",
-                    "connectionCapabilitiesStatus": "open"
+					"connectionCapabilitiesPortNumber": 8888,
-                }
+					"connectionCapabilitiesStatus": "open",
-            ],
+					"connectionCapabilitiesIpProtocol": "TCP"
-            "ipAddressTypeAvailability": "public_IPv4_address_available",
+				}
-            "qosMapSetConfiguration": null,
+			],
-            "apGeospatialLocation": null,
+			"ipAddressTypeAvailability": "public_IPv4_address_available",
-            "apCivicLocation": null,
+			"qosMapSetConfiguration": null,
-            "apPublicLocationIdUri": null,
+			"apGeospatialLocation": null,
-            "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
+			"apCivicLocation": null,
-            "anqpDomainId": 1234,
+			"apPublicLocationIdUri": null,
-            "disableDownstreamGroupAddressedForwarding": false,
+			"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
-            "enable2pt4GHz": true,
+			"anqpDomainId": 1234,
-            "enable5GHz": true,
+			"disableDownstreamGroupAddressedForwarding": false,
-            "associatedAccessSsidNames": [
+			"enable2pt4GHz": true,
-                "TipWlan-cloud-hotspot-access"
+			"enable5GHz": true,
-            ],
+			"associatedAccessSsidProfileIds": [
-            "osuSsidName": "TipWlan-cloud-hotspot-osu",
+				15
-            "operatorProfileName": "TipWlan-Hotspot20-Operator",
+			],
-            "venueProfileName": "TipWlan-Hotspot20-Venue",
+			"osuSsidProfileId": 16,
-            "idProviderProfileNames": [
+			"passpointOperatorProfileId": 17,
-                "TipWlan-Hotspot20-OSU-Provider-2",
+			"passpointVenueProfileId": 18,
-                "TipWlan-Hotspot20-OSU-Provider"
+			"passpointOsuProviderProfileIds": [
-            ],
+				19,
-            "accessNetworkType": "free_public_network",
+				20
-            "networkAuthenticationType": "acceptance_of_terms_and_conditions",
+			],
-            "associatedSsids": [
+			"accessNetworkType": "free_public_network",
-                "TipWlan-cloud-hotspot-access"
+			"networkAuthenticationType": "acceptance_of_terms_and_conditions",
-            ],
+			"profileType": "passpoint"
-            "profileType": "passpoint"
+		},
-        },
+		"createdTimestamp": 1606778370807,
-        "createdTimestamp": 1605711223339,
+		"lastModifiedTimestamp": 1606778370807,
-        "lastModifiedTimestamp": 1605711223339,
+		"childProfileIds": [
-        "childProfileIds": [
+			17,
-            17,
+			18,
-            18,
+			19,
-            19,
+			20
-            20
+		]
-        ]
+	}
-    }
 ]

opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json

@@ -4,7 +4,7 @@
 		"id": 19,
 		"customerId": 2,
 		"profileType": "passpoint_osu_id_provider",
-		"name": "TipWlan-Hotspot20-OSU-Provider",
+		"name": "TipWlan-Passpoint-OSU-Provider",
 		"details": {
 			"model_type": "PasspointOsuProviderProfile",
 			"domainName": "rogers.com",
@@ -128,8 +128,8 @@
 			],
 			"profileType": "passpoint_osu_id_provider"
 		},
-		"createdTimestamp": 1605711165325,
+		"createdTimestamp": 1606778370345,
-		"lastModifiedTimestamp": 1605711165325,
+		"lastModifiedTimestamp": 1606778370345,
 		"childProfileIds": [
 		]
 	},
@@ -138,7 +138,7 @@
 		"id": 20,
 		"customerId": 2,
 		"profileType": "passpoint_osu_id_provider",
-		"name": "TipWlan-Hotspot20-OSU-Provider-2",
+		"name": "TipWlan-Passpoint-OSU-Provider-2",
 		"details": {
 			"model_type": "PasspointOsuProviderProfile",
 			"domainName": "telus.com",
@@ -262,8 +262,8 @@
 			],
 			"profileType": "passpoint_osu_id_provider"
 		},
-		"createdTimestamp": 1605711165330,
+		"createdTimestamp": 1606778370351,
-		"lastModifiedTimestamp": 1605711165330,
+		"lastModifiedTimestamp": 1606778370351,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json

@@ -1,10 +1,10 @@
 [
 	{
 		"model_type": "Profile",
-		"id": 22,
+		"id": 10,
 		"customerId": 2,
 		"profileType": "service_metrics_collection_config",
-		"name": "Metrics-Profile-Passpoint",
+		"name": "Metrics-Profile-3-Radios",
 		"details": {
 			"model_type": "ServiceMetricsCollectionConfigProfile",
 			"radioTypes": [
@@ -21,30 +21,6 @@
 			],
 			"metricConfigParameterMap": {
 				"ApNode": [
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -69,18 +45,6 @@
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -92,9 +56,52 @@
 						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzU",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzL",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
 					}
 				],
 				"ApSsid": [
+					{
+						"model_type": "ServiceMetricRadioConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"radioType": "is5GHzU",
+						"serviceMetricDataType": "ApSsid"
+					},
 					{
 						"model_type": "ServiceMetricRadioConfigParameters",
 						"samplingInterval": 30,
@@ -108,13 +115,6 @@
 						"reportingIntervalSeconds": 60,
 						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "ApSsid"
-					},
-					{
-						"model_type": "ServiceMetricRadioConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApSsid"
 					}
 				],
 				"Client": [
@@ -144,12 +144,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
+						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "ON_CHANNEL",
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -168,12 +168,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
+						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "ON_CHANNEL",
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -192,41 +192,29 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
+						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "OFF_CHANNEL",
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
+						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "OFF_CHANNEL",
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					}
 				],
 				"Neighbour": [
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
-						"serviceMetricDataType": "Neighbour",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -251,18 +239,6 @@
 						"serviceMetricDataType": "Neighbour",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "Neighbour",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -286,13 +262,37 @@
 						"radioType": "is5GHzU",
 						"serviceMetricDataType": "Neighbour",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is5GHzL",
+						"serviceMetricDataType": "Neighbour",
+						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "Neighbour",
+						"statsReportFormat": "RAW"
 					}
 				]
 			},
 			"profileType": "service_metrics_collection_config"
 		},
-		"createdTimestamp": 1605711195528,
+		"createdTimestamp": 1606778369931,
-		"lastModifiedTimestamp": 1605711195528,
+		"lastModifiedTimestamp": 1606778369931,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json

@@ -4,7 +4,7 @@
 		"id": 17,
 		"customerId": 2,
 		"profileType": "passpoint_operator",
-		"name": "TipWlan-Hotspot20-Operator",
+		"name": "TipWlan-Passpoint-Operator",
 		"details": {
 			"model_type": "PasspointOperatorProfile",
 			"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -29,8 +29,8 @@
 			],
 			"profileType": "passpoint_operator"
 		},
-		"createdTimestamp": 1605711164952,
+		"createdTimestamp": 1606778369945,
-		"lastModifiedTimestamp": 1605711164952,
+		"lastModifiedTimestamp": 1606778369945,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json

@@ -1,205 +1,204 @@
 {
-	"model_type": "Profile",
+    "model_type": "Profile",
-	"id": 21,
+    "id": 11,
-	"customerId": 2,
+    "customerId": 2,
-	"profileType": "rf",
+    "profileType": "rf",
-	"name": "TipWlan-rf-passpoint",
+    "name": "TipWlan-rf",
-	"details": {
+    "details": {
-		"model_type": "RfConfiguration",
+        "model_type": "RfConfiguration",
-		"rfConfigMap": {
+        "rfConfigMap": {
-			"is5GHz": {
+            "is5GHz": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHz",
+                "radioType": "is5GHz",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			},
+            },
-			"is2dot4GHz": {
+            "is2dot4GHz": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is2dot4GHz",
+                "radioType": "is2dot4GHz",
-				"radioMode": "modeN",
+                "radioMode": "modeN",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is20MHz",
+                "channelBandwidth": "is20MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 20,
+                    "dropInSnrPercentage": 20,
-					"minLoadFactor": 50
+                    "minLoadFactor": 50
-				}
+                }
-			},
+            },
-			"is5GHzU": {
+            "is5GHzU": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHzU",
+                "radioType": "is5GHzU",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			},
+            },
-			"is5GHzL": {
+            "is5GHzL": {
-				"model_type": "RfElementConfiguration",
+                "model_type": "RfElementConfiguration",
-				"radioType": "is5GHzL",
+                "radioType": "is5GHzL",
-				"radioMode": "modeAC",
+                "radioMode": "modeAC",
-				"rf": "TipWlan-rf-passpoint",
+                "rf": "TipWlan-rf",
-				"beaconInterval": 100,
+                "beaconInterval": 100,
-				"forceScanDuringVoice": "disabled",
+                "forceScanDuringVoice": "disabled",
-				"rtsCtsThreshold": 65535,
+                "rtsCtsThreshold": 65535,
-				"channelBandwidth": "is80MHz",
+                "channelBandwidth": "is80MHz",
-				"mimoMode": "twoByTwo",
+                "mimoMode": "twoByTwo",
-				"maxNumClients": 100,
+                "maxNumClients": 100,
-				"autoChannelSelection": false,
+                "autoChannelSelection": false,
-				"activeScanSettings": {
+                "activeScanSettings": {
-					"model_type": "ActiveScanSettings",
+                    "model_type": "ActiveScanSettings",
-					"enabled": true,
+                    "enabled": true,
-					"scanFrequencySeconds": 10,
+                    "scanFrequencySeconds": 10,
-					"scanDurationMillis": 65
+                    "scanDurationMillis": 65
-				},
+                },
-				"neighbouringListApConfig": {
+                "neighbouringListApConfig": {
-					"model_type": "NeighbouringAPListConfiguration",
+                    "model_type": "NeighbouringAPListConfiguration",
-					"minSignal": -85,
+                    "minSignal": -85,
-					"maxAps": 25
+                    "maxAps": 25
-				},
+                },
-				"minAutoCellSize": -65,
+                "minAutoCellSize": -65,
-				"perimeterDetectionEnabled": true,
+                "perimeterDetectionEnabled": true,
-				"channelHopSettings": {
+                "channelHopSettings": {
-					"model_type": "ChannelHopSettings",
+                    "model_type": "ChannelHopSettings",
-					"noiseFloorThresholdInDB": -75,
+                    "noiseFloorThresholdInDB": -75,
-					"noiseFloorThresholdTimeInSeconds": 180,
+                    "noiseFloorThresholdTimeInSeconds": 180,
-					"nonWifiThresholdInPercentage": 50,
+                    "nonWifiThresholdInPercentage": 50,
-					"nonWifiThresholdTimeInSeconds": 180,
+                    "nonWifiThresholdTimeInSeconds": 180,
-					"obssHopMode": "NON_WIFI"
+                    "obssHopMode": "NON_WIFI"
-				},
+                },
-				"bestApEnabled": null,
+                "bestApEnabled": null,
-				"multicastRate": "auto",
+                "multicastRate": "auto",
-				"managementRate": "auto",
+                "managementRate": "auto",
-				"rxCellSizeDb": -90,
+                "rxCellSizeDb": -90,
-				"probeResponseThresholdDb": -90,
+                "probeResponseThresholdDb": -90,
-				"clientDisconnectThresholdDb": -90,
+                "clientDisconnectThresholdDb": -90,
-				"eirpTxPower": 18,
+                "eirpTxPower": 18,
-				"bestApSettings": {
+                "bestApSettings": {
-					"model_type": "RadioBestApSettings",
+                    "model_type": "RadioBestApSettings",
-					"mlComputed": true,
+                    "mlComputed": true,
-					"dropInSnrPercentage": 30,
+                    "dropInSnrPercentage": 30,
-					"minLoadFactor": 40
+                    "minLoadFactor": 40
-				}
+                }
-			}
+            }
-		},
+        },
-		"profileType": "rf"
+        "profileType": "rf"
-	},
+    },
-	"createdTimestamp": 1605711191976,
+    "createdTimestamp": 1606778369933,
-	"lastModifiedTimestamp": 1605711191976,
+    "lastModifiedTimestamp": 1606778369933,
-	"childProfileIds": [
+    "childProfileIds": []
-	]
 }

opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json

@@ -1,13 +1,80 @@
 [
+	{
+		"model_type": "Profile",
+		"id": 5,
+		"customerId": 2,
+		"profileType": "ssid",
+		"name": "TipWlan-cloud-3-radios",
+		"details": {
+			"model_type": "SsidConfiguration",
+			"ssid": "TipWlan-cloud-3-radios",
+			"appliedRadios": [
+				"is5GHzL",
+				"is2dot4GHz",
+				"is5GHzU"
+			],
+			"ssidAdminState": "enabled",
+			"secureMode": "wpa2OnlyPSK",
+			"vlanId": 1,
+			"keyStr": "openwifi",
+			"broadcastSsid": "enabled",
+			"keyRefresh": 0,
+			"noLocalSubnets": false,
+			"radiusServiceName": null,
+			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
+			"captivePortalId": null,
+			"bandwidthLimitDown": 0,
+			"bandwidthLimitUp": 0,
+			"clientBandwidthLimitDown": 0,
+			"clientBandwidthLimitUp": 0,
+			"videoTrafficOnly": false,
+			"radioBasedConfigs": {
+				"is5GHzL": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is2dot4GHz": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is5GHz": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				},
+				"is5GHzU": {
+					"model_type": "RadioBasedSsidConfiguration",
+					"enable80211r": null,
+					"enable80211k": null,
+					"enable80211v": null
+				}
+			},
+			"bonjourGatewayProfileId": null,
+			"enable80211w": null,
+			"wepConfig": null,
+			"forwardMode": "BRIDGE",
+			"profileType": "ssid"
+		},
+		"createdTimestamp": 1606778369598,
+		"lastModifiedTimestamp": 1606778369598,
+		"childProfileIds": [
+		]
+	},
 	{
 		"model_type": "Profile",
 		"id": 15,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-hotspot-access",
+		"name": "TipWlan-cloud-passpoint-access",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-hotspot-access",
+			"ssid": "TipWlan-cloud-passpoint-access",
 			"appliedRadios": [
 				"is5GHzL",
 				"is5GHzU"
@@ -21,6 +88,7 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -28,7 +96,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHz": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -40,13 +108,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzL": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -59,8 +127,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1605711164949,
+		"createdTimestamp": 1606778369943,
-		"lastModifiedTimestamp": 1605711223372,
+		"lastModifiedTimestamp": 1606778370811,
 		"childProfileIds": [
 			24
 		]
@@ -70,10 +138,10 @@
 		"id": 16,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-hotspot-osu",
+		"name": "TipWlan-cloud-passpoint-osu",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-hotspot-osu",
+			"ssid": "TipWlan-cloud-passpoint-osu",
 			"appliedRadios": [
 				"is2dot4GHz"
 			],
@@ -86,6 +154,7 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
+			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -93,7 +162,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHz": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -105,13 +174,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzL": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -124,8 +193,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1605711164950,
+		"createdTimestamp": 1606778369944,
-		"lastModifiedTimestamp": 1605711171732,
+		"lastModifiedTimestamp": 1606778370352,
 		"childProfileIds": [
 			19,
 			20

opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json

@@ -4,7 +4,7 @@
 		"id": 18,
 		"customerId": 2,
 		"profileType": "passpoint_venue",
-		"name": "TipWlan-Hotspot20-Venue",
+		"name": "TipWlan-Passpoint-Venue",
 		"details": {
 			"model_type": "PasspointVenueProfile",
 			"venueNameSet": [
@@ -28,15 +28,15 @@
 				}
 			],
 			"venueTypeAssignment": {
-				"model_type": "ProfileVenueTypeAssignment",
+				"model_type": "PasspointVenueTypeAssignment",
 				"venueDescription": "Research and Development Facility",
 				"venueGroupId": 2,
 				"venueTypeId": 8
 			},
 			"profileType": "passpoint_venue"
 		},
-		"createdTimestamp": 1605711164956,
+		"createdTimestamp": 1606778369950,
-		"lastModifiedTimestamp": 1605711164956,
+		"lastModifiedTimestamp": 1606778369950,
 		"childProfileIds": [
 		]
 	}

opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch

@@ -7,6 +7,7 @@
         <listEntry value="1"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

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

@@ -30,7 +30,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.OpensyncWifiAssociatedClients;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbDao;
-import com.telecominfraproject.wlan.opensync.ovsdb.dao.utilities.OvsdbStringConstants;
+import com.telecominfraproject.wlan.opensync.util.OvsdbStringConstants;
 import com.telecominfraproject.wlan.opensync.util.SslUtil;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
 import com.vmware.ovsdb.callback.ConnectionCallback;
@@ -193,41 +193,37 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
         LOG.debug("Client {} connect for AP {}", clientCn, apId);
         
+        ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
+        ovsdbDao.removeAllSsids(ovsdbClient); // always    
+        ovsdbDao.removeAllInetConfigs(ovsdbClient);       
+        ovsdbDao.removeWifiRrm(ovsdbClient);
+        ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
+        
         OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
 
         if (opensyncAPConfig != null) {
-            // cleanup existing
+            
-            ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
-            ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
-            ovsdbDao.removeWifiRrm(ovsdbClient);
-            ovsdbDao.removeAllSsids(ovsdbClient, opensyncAPConfig); // always
-            ovsdbDao.removeAllGreTunnels(ovsdbClient, opensyncAPConfig);
-            // reconfigure
             ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
-            ovsdbDao.configureInterfaces(ovsdbClient);
-            ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
-            ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
+            ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);       
+            ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
+            
+            ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
             if (opensyncAPConfig.getHotspotConfig() != null) {
                 ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig);
             }
+            
+            ovsdbDao.configureInterfaces(ovsdbClient);
+
             ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig);
-            if (((ApNetworkConfiguration) opensyncAPConfig.getApProfile().getDetails()).getSyntheticClientEnabled()) {
+            if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
-                ovsdbDao.enableNetworkProbeForSyntheticClient(ovsdbClient);
+                ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
             }
+            
         } else {
-            ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
+            LOG.info("No Configuration available for {}", apId);
-            ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
-            ovsdbDao.removeWifiRrm(ovsdbClient);
-            ovsdbDao.removeAllSsids(ovsdbClient); // always
-            ovsdbDao.removeAllGreTunnels(ovsdbClient, null);
         }
 
-        if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
-            ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
-        }
-
-        
         LOG.debug("Client connect Done");
         return connectNodeInfo;
     }
@@ -270,20 +266,25 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             LOG.warn("AP with id " + apId + " does not have a config to apply.");
             return;
         }
-        ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
+        
         ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
+        ovsdbDao.removeAllSsids(ovsdbClient); // always    
+        ovsdbDao.removeAllInetConfigs(ovsdbClient);       
         ovsdbDao.removeWifiRrm(ovsdbClient);
-        ovsdbDao.removeAllSsids(ovsdbClient, opensyncAPConfig); // always
+        ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
-        ovsdbDao.removeAllGreTunnels(ovsdbClient, opensyncAPConfig);
 
         ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureInterfaces(ovsdbClient);
-        ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
         ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
+        ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);       
+        ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
+        
+        ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
         if (opensyncAPConfig.getHotspotConfig() != null) {
             ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig);
         }
+        
+        ovsdbDao.configureInterfaces(ovsdbClient);
+
         ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig);
         if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
             ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
@@ -373,62 +374,66 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        LOG.info(OvsdbDao.dhcpLeasedIpDbTable + "_" + key + " monitor callback received {}",
+                        try {
-                                tableUpdates);
+                            LOG.info(OvsdbDao.dhcpLeasedIpDbTable + "_" + key + " monitor callback received {}",
+                                    tableUpdates);
 
-                        List<Map<String, String>> insert = new ArrayList<>();
+                            List<Map<String, String>> insert = new ArrayList<>();
-                        List<Map<String, String>> delete = new ArrayList<>();
+                            List<Map<String, String>> delete = new ArrayList<>();
-                        List<Map<String, String>> update = new ArrayList<>();
+                            List<Map<String, String>> update = new ArrayList<>();
 
-                        for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
+                            for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
-                            for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+                                for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
 
-                                if (rowUpdate.getNew() == null) {
+                                    if (rowUpdate.getNew() == null) {
-                                    Map<String, String> rowMap = new HashMap<>();
+                                        Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns().entrySet().stream().forEach(c -> {
+                                        rowUpdate.getOld().getColumns().entrySet().stream().forEach(c -> {
-                                        OvsdbDao.translateDhcpFpValueToString(c, rowMap);
+                                            OvsdbDao.translateDhcpFpValueToString(c, rowMap);
-                                    });
+                                        });
 
-                                    delete.add(rowMap);
+                                        delete.add(rowMap);
-                                    // delete
+                                        // delete
-                                } else if (rowUpdate.getOld() == null) {
+                                    } else if (rowUpdate.getOld() == null) {
-                                    // insert
+                                        // insert
-                                    Map<String, String> rowMap = new HashMap<>();
+                                        Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getNew().getColumns().entrySet().stream().forEach(c -> {
+                                        rowUpdate.getNew().getColumns().entrySet().stream().forEach(c -> {
-                                        OvsdbDao.translateDhcpFpValueToString(c, rowMap);
+                                            OvsdbDao.translateDhcpFpValueToString(c, rowMap);
-                                    });
+                                        });
 
-                                    insert.add(rowMap);
+                                        insert.add(rowMap);
-                                } else {
+                                    } else {
 
-                                    // insert
+                                        // insert
-                                    Map<String, String> rowMap = new HashMap<>();
+                                        Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
+                                        rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
-                                    rowUpdate.getOld().getColumns().entrySet().stream().forEach(c -> {
+                                        rowUpdate.getOld().getColumns().entrySet().stream().forEach(c -> {
-                                        OvsdbDao.translateDhcpFpValueToString(c, rowMap);
+                                            OvsdbDao.translateDhcpFpValueToString(c, rowMap);
-                                    });
+                                        });
 
-                                    update.add(rowMap);
+                                        update.add(rowMap);
 
+                                    }
                                 }
                             }
-                        }
 
-                        if (!insert.isEmpty()) {
+                            if (!insert.isEmpty()) {
-                            extIntegrationInterface.dhcpLeasedIpDbTableUpdate(insert, key, RowUpdateOperation.INSERT);
+                                extIntegrationInterface.dhcpLeasedIpDbTableUpdate(insert, key, RowUpdateOperation.INSERT);
-                        }
+                            }
 
-                        if (!delete.isEmpty()) {
+                            if (!delete.isEmpty()) {
-                            extIntegrationInterface.dhcpLeasedIpDbTableUpdate(delete, key, RowUpdateOperation.DELETE);
+                                extIntegrationInterface.dhcpLeasedIpDbTableUpdate(delete, key, RowUpdateOperation.DELETE);
 
-                        }
+                            }
 
-                        if (!update.isEmpty()) {
+                            if (!update.isEmpty()) {
-                            extIntegrationInterface.dhcpLeasedIpDbTableUpdate(update, key, RowUpdateOperation.MODIFY);
+                                extIntegrationInterface.dhcpLeasedIpDbTableUpdate(update, key, RowUpdateOperation.MODIFY);
 
+                            }
+                        } catch (Exception e) {
+                            LOG.error("dhcpLeasedIpDbTableUpdate failed", e);
                         }
 
                     }
@@ -448,62 +453,66 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        LOG.info(OvsdbDao.commandStateDbTable + "_" + key + " monitor callback received {}",
+                        try {
-                                tableUpdates);
+                            LOG.info(OvsdbDao.commandStateDbTable + "_" + key + " monitor callback received {}",
+                                    tableUpdates);
 
-                        List<Map<String, String>> insert = new ArrayList<>();
+                            List<Map<String, String>> insert = new ArrayList<>();
-                        List<Map<String, String>> delete = new ArrayList<>();
+                            List<Map<String, String>> delete = new ArrayList<>();
-                        List<Map<String, String>> update = new ArrayList<>();
+                            List<Map<String, String>> update = new ArrayList<>();
 
-                        for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
+                            for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
-                            for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+                                for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
 
-                                if (rowUpdate.getNew() == null) {
+                                    if (rowUpdate.getNew() == null) {
-                                    Map<String, String> rowMap = new HashMap<>();
+                                        Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns().entrySet().stream().forEach(c -> {
+                                        rowUpdate.getOld().getColumns().entrySet().stream().forEach(c -> {
-                                        rowMap.put(c.getKey(), c.getValue().toString());
+                                            rowMap.put(c.getKey(), c.getValue().toString());
-                                    });
+                                        });
 
-                                    delete.add(rowMap);
+                                        delete.add(rowMap);
-                                    // delete
+                                        // delete
-                                } else if (rowUpdate.getOld() == null) {
+                                    } else if (rowUpdate.getOld() == null) {
-                                    // insert
+                                        // insert
-                                    Map<String, String> rowMap = new HashMap<>();
+                                        Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getNew().getColumns().entrySet().stream().forEach(c -> {
+                                        rowUpdate.getNew().getColumns().entrySet().stream().forEach(c -> {
-                                        rowMap.put(c.getKey(), c.getValue().toString());
+                                            rowMap.put(c.getKey(), c.getValue().toString());
-                                    });
+                                        });
 
-                                    insert.add(rowMap);
+                                        insert.add(rowMap);
-                                } else {
+                                    } else {
 
-                                    // insert
+                                        // insert
-                                    Map<String, String> rowMap = new HashMap<>();
+                                        Map<String, String> rowMap = new HashMap<>();
 
-                                    rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
+                                        rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
-                                    rowUpdate.getOld().getColumns().entrySet().stream().forEach(c -> {
+                                        rowUpdate.getOld().getColumns().entrySet().stream().forEach(c -> {
-                                        rowMap.put(c.getKey(), c.getValue().toString());
+                                            rowMap.put(c.getKey(), c.getValue().toString());
-                                    });
+                                        });
 
-                                    update.add(rowMap);
+                                        update.add(rowMap);
 
+                                    }
                                 }
                             }
-                        }
 
-                        if (!insert.isEmpty()) {
+                            if (!insert.isEmpty()) {
-                            extIntegrationInterface.commandStateDbTableUpdate(insert, key, RowUpdateOperation.INSERT);
+                                extIntegrationInterface.commandStateDbTableUpdate(insert, key, RowUpdateOperation.INSERT);
-                        }
+                            }
 
-                        if (!delete.isEmpty()) {
+                            if (!delete.isEmpty()) {
-                            extIntegrationInterface.commandStateDbTableUpdate(delete, key, RowUpdateOperation.DELETE);
+                                extIntegrationInterface.commandStateDbTableUpdate(delete, key, RowUpdateOperation.DELETE);
 
-                        }
+                            }
 
-                        if (!update.isEmpty()) {
+                            if (!update.isEmpty()) {
-                            extIntegrationInterface.commandStateDbTableUpdate(update, key, RowUpdateOperation.MODIFY);
+                                extIntegrationInterface.commandStateDbTableUpdate(update, key, RowUpdateOperation.MODIFY);
 
+                            }
+                        } catch (Exception e) {
+                            LOG.error("commandStateDbTableUpdate failed", e);
                         }
 
                     }
@@ -522,10 +531,14 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        LOG.info(OvsdbDao.awlanNodeDbTable + "_" + key + " monitor callback received {}", 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);
+                        }
                     }
 
                 });
@@ -543,32 +556,36 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     @Override
                     public void update(TableUpdates tableUpdates) {
 
-                        LOG.info(OvsdbDao.wifiAssociatedClientsDbTable + "_" + key + " monitor callback received {}",
+                        try {
-                                tableUpdates);
+                            LOG.info(OvsdbDao.wifiAssociatedClientsDbTable + "_" + key + " monitor callback received {}",
+                                    tableUpdates);
 
-                        List<OpensyncWifiAssociatedClients> associatedClients = new ArrayList<>();
+                            List<OpensyncWifiAssociatedClients> associatedClients = new ArrayList<>();
 
-                        for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
+                            for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
 
-                            for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+                                for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
-                                if ((rowUpdate.getOld() != null) && (rowUpdate.getNew() == null)) {
+                                    if ((rowUpdate.getOld() != null) && (rowUpdate.getNew() == null)) {
-                                    Row row = rowUpdate.getOld();
+                                        Row row = rowUpdate.getOld();
-                                    String deletedClientMac = row.getStringColumn("mac");
+                                        String deletedClientMac = row.getStringColumn("mac");
-                                    // take care of the deletes as we go through
+                                        // take care of the deletes as we go through
-                                    // the updates, as we want to delete before
+                                        // the updates, as we want to delete before
-                                    // adding anyway.
+                                        // adding anyway.
-                                    extIntegrationInterface.wifiAssociatedClientsDbTableDelete(deletedClientMac, key);
+                                        extIntegrationInterface.wifiAssociatedClientsDbTableDelete(deletedClientMac, key);
-                                } else {
+                                    } else {
-                                    associatedClients.addAll(
+                                        associatedClients.addAll(
-                                            ovsdbDao.getOpensyncWifiAssociatedClients(rowUpdate, key, ovsdbClient));
+                                                ovsdbDao.getOpensyncWifiAssociatedClients(rowUpdate, key, ovsdbClient));
+                                    }
                                 }
+
                             }
 
+                            // now address the update/add
+                            extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(associatedClients, key);
+                        } catch (Exception e) {
+                           LOG.error("wifiAssociatedClientsDbTableUpdate failed", e);
                         }
 
-                        // now address the update/add
-                        extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(associatedClients, key);
-
                     }
 
                 });
@@ -586,34 +603,38 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        LOG.info(OvsdbDao.ovsdbName,
+                        try {
-                                OvsdbDao.wifiInetStateDbTable + "_" + key + " monitor callback received {}",
+                            LOG.info(OvsdbDao.ovsdbName,
-                                tableUpdates);
+                                    OvsdbDao.wifiInetStateDbTable + "_" + key + " monitor callback received {}",
+                                    tableUpdates);
 
-                        List<OpensyncAPInetState> inetStateInsertOrUpdate = new ArrayList<>();
+                            List<OpensyncAPInetState> inetStateInsertOrUpdate = new ArrayList<>();
-                        List<OpensyncAPInetState> inetStateDelete = new ArrayList<>();
+                            List<OpensyncAPInetState> inetStateDelete = new ArrayList<>();
 
-                        for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
+                            for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
 
-                            for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+                                for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+
+                                    if (rowUpdate.getNew() == null) {
+                                        inetStateDelete.addAll(
+                                                ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                    } else {
+                                        inetStateInsertOrUpdate.addAll(
+                                                ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                    }
 
-                                if (rowUpdate.getNew() == null) {
-                                    inetStateDelete.addAll(
-                                            ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
-                                } else {
-                                    inetStateInsertOrUpdate.addAll(
-                                            ovsdbDao.getOpensyncApInetStateForRowUpdate(rowUpdate, key, ovsdbClient));
                                 }
-
                             }
+
+                            // delete first
+                            extIntegrationInterface.wifiInetStateDbTableUpdate(inetStateDelete, key);
+
+                            // now process updates and mutations
+                            extIntegrationInterface.wifiInetStateDbTableUpdate(inetStateInsertOrUpdate, key);
+                        } catch (Exception e) {
+                            LOG.error("wifiInetStateDbTableUpdate failed",e);
                         }
 
-                        // delete first
-                        extIntegrationInterface.wifiInetStateDbTableUpdate(inetStateDelete, key);
-
-                        // now process updates and mutations
-                        extIntegrationInterface.wifiInetStateDbTableUpdate(inetStateInsertOrUpdate, key);
-
                     }
 
                 });
@@ -630,11 +651,15 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        LOG.info(OvsdbDao.wifiRadioStateDbTable + "_" + key + " monitor callback received {}",
+                        try {
-                                tableUpdates);
+                            LOG.info(OvsdbDao.wifiRadioStateDbTable + "_" + key + " monitor callback received {}",
+                                    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);
+                        }
                     }
 
                 });
@@ -651,38 +676,42 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}",
+                        try {
-                                tableUpdates);
+                            LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}",
+                                    tableUpdates);
 
-                        List<OpensyncAPVIFState> vifsToDelete = new ArrayList<>();
+                            List<OpensyncAPVIFState> vifsToDelete = new ArrayList<>();
-                        List<OpensyncAPVIFState> vifsToInsertOrUpdate = new ArrayList<>();
+                            List<OpensyncAPVIFState> vifsToInsertOrUpdate = new ArrayList<>();
-                        for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
+                            for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
 
-                            for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+                                for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
 
-                                if (rowUpdate.getNew() == null) {
+                                    if (rowUpdate.getNew() == null) {
-                                    // this is a deletion
+                                        // this is a deletion
-                                    vifsToDelete.addAll(
+                                        vifsToDelete.addAll(
-                                            ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                                ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
 
-                                } else {
+                                    } else {
-                                    // either an insert or
+                                        // either an insert or
-                                    // mutuate/update
+                                        // mutuate/update
-                                    vifsToInsertOrUpdate.addAll(
+                                        vifsToInsertOrUpdate.addAll(
-                                            ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                                                ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+
+                                    }
 
                                 }
 
-                            }
+                                // delete first, if required
+                                if (!vifsToDelete.isEmpty()) {
+                                    extIntegrationInterface.wifiVIFStateDbTableDelete(vifsToDelete, key);
+                                }
+                                if (!vifsToInsertOrUpdate.isEmpty()) {
+                                    extIntegrationInterface.wifiVIFStateDbTableUpdate(vifsToInsertOrUpdate, key);
+                                }
 
-                            // delete first, if required
-                            if (!vifsToDelete.isEmpty()) {
-                                extIntegrationInterface.wifiVIFStateDbTableDelete(vifsToDelete, key);
                             }
-                            if (!vifsToInsertOrUpdate.isEmpty()) {
+                        } catch (Exception e) {
-                                extIntegrationInterface.wifiVIFStateDbTableUpdate(vifsToInsertOrUpdate, key);
+                            LOG.error("wifiVIFStateDbTableUpdate failed", e);
-                            }
-
                         }
 
                     }

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

@@ -8,7 +8,10 @@ import java.util.Set;
 
 import com.vmware.ovsdb.protocol.operation.notation.Uuid;
 
-public class WifiVifConfigInfo implements Cloneable{
+public class WifiVifConfigInfo implements Cloneable {
+
+    // multi_ap
+    // {"key":{"enum":["set",["backhaul_bss","backhaul_sta","fronthaul_backhaul_bss","fronthaul_bss","none"]],"type":"string"},"min":0}
 
     public String bridge;
     public int btm;
@@ -22,65 +25,109 @@ public class WifiVifConfigInfo implements Cloneable{
     public String ssidBroadcast;
     public boolean uapsdEnable;
     public int vifRadioIdx;
-    public Map<String,String> security;
+    public Map<String, String> security;
+    public Map<String, String> captivePortal;
+    public Set<String> captiveAllowlist;
+    public Map<String, String> customOptions;
+    public Map<String, String> meshOptions;
 
     public Uuid uuid;
     public int vlanId;
-	public Boolean apBridge;
+    public Boolean apBridge;
-	public String minHwMode;
+    public String minHwMode;
-	public Set<String> macList;
+    public Set<String> macList;
-	public String macListType;
+    public String macListType;
     public int ftMobilityDomain;
+    public boolean wpsPbc;
+    public boolean wps;
+    public boolean wds;
+    public String wpsPbcKeyId;
+    public boolean mcast2ucast;
+    public boolean dynamicBeacon;
+    public int vifDbgLvl;
+    public Set<Uuid> credentialConfigs;
+    public String parent;
+    public String multiAp;
 
     @Override
     public WifiVifConfigInfo clone() {
         try {
-            WifiVifConfigInfo ret = (WifiVifConfigInfo)super.clone();
+            WifiVifConfigInfo ret = (WifiVifConfigInfo) super.clone();
 
-            if(security!=null) {
+            if (security != null) {
                 ret.security = new HashMap<>(this.security);
             }
-            if (macList!=null) {
+            if (macList != null) {
                 ret.macList = new HashSet<>(this.macList);
             }
+            if (captivePortal != null) {
+                ret.captivePortal = new HashMap<>(this.captivePortal);
+            }
+            if (captiveAllowlist != null) {
+                ret.captiveAllowlist = new HashSet<>(this.captiveAllowlist);
+            }
+            if (customOptions != null) {
+                ret.customOptions = new HashMap<>(this.customOptions);
+            }
+            if (meshOptions != null) {
+                ret.meshOptions = new HashMap<>(this.meshOptions);
+            }
+            if (credentialConfigs != null) {
+                ret.credentialConfigs = new HashSet<>(this.credentialConfigs);
+            }
             return ret;
-        }catch(CloneNotSupportedException e) {                
+        } catch (CloneNotSupportedException e) {
             throw new IllegalStateException("Cannot clone ", e);
         }
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(apBridge, bridge, btm, enabled, ftMobilityDomain, ftPsk, groupRekey, ifName, macList,
+        return Objects.hash(apBridge, bridge, btm, captiveAllowlist, captivePortal, credentialConfigs, customOptions,
-                macListType, minHwMode, mode, rrm, security, ssid, ssidBroadcast, uapsdEnable, uuid, vifRadioIdx,
+                dynamicBeacon, enabled, ftMobilityDomain, ftPsk, groupRekey, ifName, macList, macListType, mcast2ucast,
-                vlanId);
+                meshOptions, minHwMode, mode, multiAp, parent, rrm, security, ssid, ssidBroadcast, uapsdEnable, uuid,
+                vifDbgLvl, vifRadioIdx, vlanId, wds, wps, wpsPbc, wpsPbcKeyId);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
+        if (this == obj)
             return true;
-        }
+        if (obj == null)
-        if (!(obj instanceof WifiVifConfigInfo)) {
+            return false;
+        if (getClass() != obj.getClass())
             return false;
-        }
         WifiVifConfigInfo other = (WifiVifConfigInfo) obj;
         return Objects.equals(apBridge, other.apBridge) && Objects.equals(bridge, other.bridge) && btm == other.btm
+                && Objects.equals(captiveAllowlist, other.captiveAllowlist)
+                && Objects.equals(captivePortal, other.captivePortal)
+                && Objects.equals(credentialConfigs, other.credentialConfigs)
+                && Objects.equals(customOptions, other.customOptions) && dynamicBeacon == other.dynamicBeacon
                 && enabled == other.enabled && ftMobilityDomain == other.ftMobilityDomain && ftPsk == other.ftPsk
                 && groupRekey == other.groupRekey && Objects.equals(ifName, other.ifName)
                 && Objects.equals(macList, other.macList) && Objects.equals(macListType, other.macListType)
-                && Objects.equals(minHwMode, other.minHwMode) && Objects.equals(mode, other.mode) && rrm == other.rrm
+                && mcast2ucast == other.mcast2ucast && Objects.equals(meshOptions, other.meshOptions)
+                && Objects.equals(minHwMode, other.minHwMode) && Objects.equals(mode, other.mode)
+                && Objects.equals(multiAp, other.multiAp) && Objects.equals(parent, other.parent) && rrm == other.rrm
                 && Objects.equals(security, other.security) && Objects.equals(ssid, other.ssid)
                 && Objects.equals(ssidBroadcast, other.ssidBroadcast) && uapsdEnable == other.uapsdEnable
-                && Objects.equals(uuid, other.uuid) && vifRadioIdx == other.vifRadioIdx && vlanId == other.vlanId;
+                && Objects.equals(uuid, other.uuid) && vifDbgLvl == other.vifDbgLvl && vifRadioIdx == other.vifRadioIdx
+                && vlanId == other.vlanId && wds == other.wds && wps == other.wps && wpsPbc == other.wpsPbc
+                && Objects.equals(wpsPbcKeyId, other.wpsPbcKeyId);
     }
 
     @Override
     public String toString() {
-        return String.format(
+        return "WifiVifConfigInfo [bridge=" + bridge + ", btm=" + btm + ", enabled=" + enabled + ", ftPsk=" + ftPsk
-                "WifiVifConfigInfo [bridge=%s, ap_bridge=%s, btm=%s, enabled=%s, ftPsk=%s, ftMobilityDomain=%s, groupRekey=%s, ifName=%s, minHwMode=%s, mode=%s, rrm=%s, ssid=%s, ssidBroadcast=%s, uapsdEnable=%s, vifRadioIdx=%s, security=%s, uuid=%s, vlanId=%s, macList=%s, macListType=%s]",
+                + ", groupRekey=" + groupRekey + ", ifName=" + ifName + ", mode=" + mode + ", rrm=" + rrm + ", ssid="
-                bridge, apBridge, btm, enabled, ftPsk, ftMobilityDomain, groupRekey, ifName, minHwMode, mode, rrm, ssid, ssidBroadcast, uapsdEnable,
+                + ssid + ", ssidBroadcast=" + ssidBroadcast + ", uapsdEnable=" + uapsdEnable + ", vifRadioIdx="
-                vifRadioIdx, security, uuid, vlanId, macList, macListType);
+                + vifRadioIdx + ", security=" + security + ", captivePortal=" + captivePortal + ", captiveAllowlist="
+                + captiveAllowlist + ", customOptions=" + customOptions + ", meshOptions=" + meshOptions + ", uuid="
+                + uuid + ", vlanId=" + vlanId + ", apBridge=" + apBridge + ", minHwMode=" + minHwMode + ", macList="
+                + macList + ", macListType=" + macListType + ", ftMobilityDomain=" + ftMobilityDomain + ", wpsPbc="
+                + wpsPbc + ", wps=" + wps + ", wds=" + wds + ", wpsPbcKeyId=" + wpsPbcKeyId + ", mcast2ucast="
+                + mcast2ucast + ", dynamicBeacon=" + dynamicBeacon + ", vifDbgLvl=" + vifDbgLvl + ", credentialConfigs="
+                + credentialConfigs + ", parent=" + parent + ", multiAp=" + multiAp + "]";
     }
 
 }

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

@@ -1,4 +1,4 @@
-package com.telecominfraproject.wlan.opensync.ovsdb.dao.utilities;
+package com.telecominfraproject.wlan.opensync.util;
 
 
 public class OvsdbStringConstants {

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

@@ -1,4 +1,4 @@
-package com.telecominfraproject.wlan.opensync.ovsdb.dao.utilities;
+package com.telecominfraproject.wlan.opensync.util;
 
 import com.telecominfraproject.wlan.client.models.ClientType;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;

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

@@ -126,7 +126,7 @@ public class OpensyncGatewayTipWlanOvsdbClientTest {
         Mockito.verify(ovsdbSessionMapInterface).getSession("Test_Client_21P10C68818122");
         Mockito.verify(ovsdbSession).getOvsdbClient();
         Mockito.verify(opensyncExternalIntegrationInterface).getApConfig("Test_Client_21P10C68818122");
-        Mockito.verify(ovsdbDao).removeAllSsids(ovsdbClient, apConfig);
+        Mockito.verify(ovsdbDao).removeAllSsids(ovsdbClient);
         Mockito.verify(ovsdbDao).removeAllStatsConfigs(ovsdbClient);
         Mockito.verify(ovsdbDao).configureWifiRadios(ovsdbClient, apConfig);
         Mockito.verify(ovsdbDao).configureSsids(ovsdbClient, apConfig);

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

@@ -142,48 +142,6 @@ public class OvsdbDaoTest {
         mockito.finishMocking();
     }
 
-    @Test
-    public void testRemoveAllGreTunnels() throws Exception {
-        List<Row> rows = new ArrayList<>();
-        OperationResult[] operationResult = new OperationResult[] { new SelectResult(rows) };
-        Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList()))
-                .thenReturn(selectionFutureResult);
-        Mockito.when(selectionFutureResult.get(30, TimeUnit.SECONDS)).thenReturn(operationResult);
-        Profile apProfile = new Profile();
-        apProfile.setCustomerId(2);
-        apProfile.setId(1L);
-        apProfile.setName("ApProfile");
-        apProfile.setProfileType(ProfileType.equipment_ap);
-        ApNetworkConfiguration tunnelProfileDetails = ApNetworkConfiguration.createWithDefaults();
-
-        tunnelProfileDetails.setGreLocalInetAddr(InetAddress.getByName("10.0.10.10"));
-        tunnelProfileDetails.setGreRemoteInetAddr(InetAddress.getByName("192.168.0.10"));
-        tunnelProfileDetails.setGreTunnelName("gre1");
-        tunnelProfileDetails.setGreParentIfName("wan");
-        apProfile.setDetails(tunnelProfileDetails);
-        OpensyncAPConfig apConfig = Mockito.mock(OpensyncAPConfig.class);
-        Mockito.when(apConfig.getApProfile()).thenReturn(apProfile);
-        ovsdbDao.removeAllGreTunnels(ovsdbClient, apConfig);
-
-        Mockito.verify(apConfig, Mockito.times(2)).getApProfile();
-        Mockito.verify(ovsdbClient, Mockito.times(1)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
-
-    }
-
-    @Test
-    public void testRemoveAllGreTunnelsNoProfile() throws Exception {
-        List<Row> rows = new ArrayList<>();
-        OperationResult[] operationResult = new OperationResult[] { new SelectResult(rows) };
-        Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList()))
-                .thenReturn(selectionFutureResult);
-        Mockito.when(selectionFutureResult.get(30, TimeUnit.SECONDS)).thenReturn(operationResult);
-
-        ovsdbDao.removeAllGreTunnels(ovsdbClient, null);
-
-        Mockito.verify(ovsdbClient, Mockito.times(1)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
-
-    }
-
     @Test
     public void testConfigureGreTunnels() throws Exception {
         List<Row> rows = new ArrayList<>();
@@ -339,7 +297,7 @@ public class OvsdbDaoTest {
 
         ovsdbDao.configureHotspots(ovsdbClient, apConfig);
 
-        Mockito.verify(futureResult, Mockito.times(11)).get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS));
+        Mockito.verify(futureResult, Mockito.times(13)).get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS));
 
     }
 

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

@@ -12,7 +12,6 @@ import java.util.Set;
 import java.util.UUID;
 
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
-import com.telecominfraproject.wlan.customer.models.Customer;
 import com.telecominfraproject.wlan.profile.models.Profile;
 import com.telecominfraproject.wlan.profile.models.ProfileType;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
@@ -41,35 +40,37 @@ import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
 
 public class OvsdbDaoTestUtilities {
 
-
+    // Static creation of Profiles and Results to use with the OvsdbDao JUnit
-    // Static creation of Profiles and Results to use with the OvsdbDao JUnit tests.
+    // tests.
-    static void createPasspointHotspot(int customerId, Profile passpointHotspotConfig,
+    static void createPasspointHotspot(int customerId, Profile passpointHotspotConfig, Profile passpointOperatorProfile,
-            Profile passpointOperatorProfile, Profile passpointVenueProfile, Profile hotspot20IdProviderProfile,
+            Profile passpointVenueProfile, Profile hotspot20IdProviderProfile, Profile hotspot20IdProviderProfile2,
-            Profile hotspot20IdProviderProfile2, Profile profileSsidPsk, Profile profileSsidOsu,
+            Profile profileSsidPsk, Profile profileSsidOsu, Profile hotspotProfileAp) {
-            Profile hotspotProfileAp) {
 
         profileSsidPsk = createPasspointAccessSsid(customerId);
+        profileSsidPsk.setId(1L);
         profileSsidOsu = createPasspointOsuSsid(customerId);
+        profileSsidOsu.setId(2L);
 
         passpointOperatorProfile = createPasspointOperatorProfile(customerId);
-
+        passpointOperatorProfile.setId(3L);
         passpointVenueProfile = createPasspointVenueProfile(customerId);
-
+        passpointVenueProfile.setId(4L);
         hotspot20IdProviderProfile = createPasspointIdProviderProfile(customerId, hotspot20IdProviderProfile,
                 "TipWlan-Hotspot20-OSU-Provider", "Rogers AT&T Wireless", "Canada", "ca", 302, 720, "rogers.com", 1);
-
+        hotspot20IdProviderProfile.setId(5L);
         hotspot20IdProviderProfile2 = createPasspointIdProviderProfile(customerId, hotspot20IdProviderProfile2,
                 "TipWlan-Hotspot20-OSU-Provider-2", "Telus Mobility", "Canada", "ca", 302, 220, "telus.com", 1);
-
+        hotspot20IdProviderProfile2.setId(6L);
-
         profileSsidOsu.getChildProfileIds().add(hotspot20IdProviderProfile.getId());
         profileSsidOsu.getChildProfileIds().add(hotspot20IdProviderProfile2.getId());
 
         passpointHotspotConfig = createPasspointHotspotConfig(customerId, hotspot20IdProviderProfile2,
                 hotspot20IdProviderProfile, passpointOperatorProfile, passpointVenueProfile, profileSsidPsk,
                 profileSsidOsu);
+        passpointHotspotConfig.setId(7L);
 
         hotspotProfileAp = createPasspointApProfile(customerId, profileSsidPsk, profileSsidOsu);
+        hotspotProfileAp.setId(8L);
     }
 
     static Profile createPasspointHotspotConfig(int customerId, Profile hotspot20IdProviderProfile2,
@@ -87,15 +88,18 @@ public class OvsdbDaoTestUtilities {
         passpointHotspotConfigChildIds.add(hotspot20IdProviderProfile2.getId());
         passpointHotspotConfig.setChildProfileIds(passpointHotspotConfigChildIds);
         passpointHotspotConfig.setDetails(PasspointProfile.createWithDefaults());
-        Set<String> providerNames = new HashSet<>();
+        Set<Long> providerIds = new HashSet<>();
-        providerNames.add(hotspot20IdProviderProfile.getName());
+        providerIds.add(hotspot20IdProviderProfile.getId());
-        providerNames.add(hotspot20IdProviderProfile2.getName());
+        providerIds.add(hotspot20IdProviderProfile2.getId());
-        ((PasspointProfile) passpointHotspotConfig.getDetails()).setIdProviderProfileNames(providerNames);
+        ((PasspointProfile) passpointHotspotConfig.getDetails()).setPasspointOsuProviderProfileIds(providerIds);
         ((PasspointProfile) passpointHotspotConfig.getDetails())
-                .setOperatorProfileName(passpointOperatorProfile.getName());
+                .setPasspointOperatorProfileId(passpointOperatorProfile.getId());
-        ((PasspointProfile) passpointHotspotConfig.getDetails()).setVenueProfileName(passpointVenueProfile.getName());
+        ((PasspointProfile) passpointHotspotConfig.getDetails())
-        ((PasspointProfile) passpointHotspotConfig.getDetails()).setOsuSsidName(profileSsidOpen.getName());
+                .setPasspointVenueProfileId(passpointVenueProfile.getId());
+        ((PasspointProfile) passpointHotspotConfig.getDetails()).setOsuSsidProfileId(profileSsidOpen.getId());
         profileSsidPsk.getChildProfileIds().add(passpointHotspotConfig.getId());
+        ((PasspointProfile) passpointHotspotConfig.getDetails())
+                .setAssociatedAccessSsidProfileIds(List.of(profileSsidPsk.getId()));
         return passpointHotspotConfig;
     }
 
@@ -117,14 +121,13 @@ public class OvsdbDaoTestUtilities {
         mccMncList.add(passpointMccMnc);
         Set<String> naiRealms = new HashSet<>();
         naiRealms.add(naiRealm);
-        naiRealm.split(".");
         List<Byte> roamingOi = new ArrayList<>();
         roamingOi.add(Byte.valueOf("1"));
         roamingOi.add(Byte.valueOf("2"));
         roamingOi.add(Byte.valueOf("3"));
         roamingOi.add(Byte.valueOf("4"));
         hotspot20IdProviderProfile = createOsuProviderProfile(customerId, hotspot20IdProviderProfile, mccMncList,
-                naiRealms, "https://example.com/osu/" + naiRealm.split(".com")[0], naiRealm.split(".com")[0], naiRealm,
+                naiRealms, "https://example.com/osu/" + naiRealm.split("/.com")[0], naiRealm.split(".com")[0], naiRealm,
                 roamingOi);
         return hotspot20IdProviderProfile;
     }
@@ -305,7 +308,8 @@ public class OvsdbDaoTestUtilities {
         columns.put("network_auth_type", new Atom<>("00"));
         columns.put("operating_class", new Atom<>(0));
         columns.put("operator_friendly_name",
-                com.vmware.ovsdb.protocol.operation.notation.Set.of(new Atom<>("eng:Default friendly passpoint_operator name"),
+                com.vmware.ovsdb.protocol.operation.notation.Set.of(
+                        new Atom<>("eng:Default friendly passpoint_operator name"),
                         new Atom<>("fra:Nom de l'opérateur convivial par défaut")));
         columns.put("operator_icons",
                 com.vmware.ovsdb.protocol.operation.notation.Set.of(
@@ -322,8 +326,8 @@ public class OvsdbDaoTestUtilities {
                 com.vmware.ovsdb.protocol.operation.notation.Set.of(new Atom<>("11223344"), new Atom<>("234433")));
         columns.put("tos", new Atom<>("https://localhost:9091/filestore/termsAndConditions"));
         columns.put("venue_group_type", new Atom<>("2:8"));
-        columns.put("venue_name", com.vmware.ovsdb.protocol.operation.notation.Set.of(new Atom<>("eng:Example passpoint_venue"),
+        columns.put("venue_name", com.vmware.ovsdb.protocol.operation.notation.Set
-                new Atom<>("fra:Exemple de lieu")));
+                .of(new Atom<>("eng:Example passpoint_venue"), new Atom<>("fra:Exemple de lieu")));
         columns.put("venue_url", com.vmware.ovsdb.protocol.operation.notation.Set
                 .of(new Atom<>("1:http://www.example.com/info-fra"), new Atom<>("2:http://www.example.com/info-eng")));
         columns.put("vif_config",
@@ -408,7 +412,6 @@ public class OvsdbDaoTestUtilities {
         return operationResult;
     }
 
-
     static OperationResult[] hs20IconRows() {
         List<Row> ret = new ArrayList<>();
 
@@ -514,7 +517,6 @@ public class OvsdbDaoTestUtilities {
 
         SelectResult selectResult = new SelectResult(ret);
 
-
         OperationResult[] operationResult = new OperationResult[1];
         operationResult[0].equals(selectResult);
         return operationResult;
@@ -543,5 +545,4 @@ public class OvsdbDaoTestUtilities {
         return profileRadius;
     }
 
-    
 }