release testing

LICENSE

@@ -1,5 +1,5 @@
 BSD 3-Clause License
-
+#Release Testing
 Copyright (c) 2020, Telecom Infra Project
 All rights reserved.
 

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

@@ -11,10 +11,14 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.annotation.PostConstruct;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Component;
 
 import com.google.common.collect.ImmutableSet;
@@ -66,8 +70,8 @@ import com.telecominfraproject.wlan.opensync.external.integration.models.Opensyn
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAWLANNode;
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncWifiAssociatedClients;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.enumerations.DhcpFpDeviceType;
-import com.telecominfraproject.wlan.opensync.util.OvsdbStringConstants;
-import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
+import com.telecominfraproject.wlan.opensync.ovsdb.dao.utilities.OvsdbStringConstants;
+import com.telecominfraproject.wlan.opensync.ovsdb.dao.utilities.OvsdbToWlanCloudTypeMappingUtility;
 import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
 import com.telecominfraproject.wlan.profile.models.Profile;
 import com.telecominfraproject.wlan.profile.models.ProfileContainer;
@@ -154,10 +158,32 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
     @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_wan_name:wan}")
     public String defaultWanInterfaceName;
 
+    @Autowired
+    private CacheManager cacheManagerShortLived;
+    private Cache cloudEquipmentRecordCache;
+
+    @PostConstruct
+    private void postCreate() {
+        LOG.info("Using Cloud integration");
+        cloudEquipmentRecordCache = cacheManagerShortLived.getCache("equipment_record_cache");
+    }
+
+    public Equipment getCustomerEquipment(String apId) {
+        Equipment ce = null;
+
+        try {
+            ce = cloudEquipmentRecordCache.get(apId, () -> equipmentServiceInterface.getByInventoryIdOrNull(apId));
+        } catch (Exception e) {
+            LOG.error("Could not get customer equipment for {}", apId, e);
+        }
+
+        return ce;
+    }
+
     @Override
     public void apConnected(String apId, ConnectNodeInfo connectNodeInfo) {
 
-		Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
+        Equipment ce = getCustomerEquipment(apId);
 
         try {
             if (ce == null) {
@@ -213,7 +239,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 ce.setDetails(ApElementConfiguration.createWithDefaults());
                 ce.setCustomerId(autoProvisionedCustomerId);
                 ce.setName(apId);
-				ce = equipmentServiceInterface.create(ce);
 
                 ApElementConfiguration apElementConfig = (ApElementConfiguration) ce.getDetails();
                 apElementConfig.setDeviceName(ce.getName());
@@ -273,7 +298,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
                 ce.setProfileId(profileId);
 
-				ce = equipmentServiceInterface.update(ce);
+                ce = equipmentServiceInterface.create(ce);
+
+                // update the cache right away, no need to wait until the
+                // entry expires
+                cloudEquipmentRecordCache.put(ce.getInventoryId(), ce);
 
             } else {
                 // equipment already exists
@@ -295,6 +324,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                         ce.setBaseMacAddress(reportedMacAddress);
                         ce = equipmentServiceInterface.update(ce);
 
+                        // update the cache right away, no need to wait
+                        // until the entry expires
+                        cloudEquipmentRecordCache.put(ce.getInventoryId(), ce);
                     }
                 }
 
@@ -556,8 +588,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             networkAdminStatusRec = statusServiceInterface.update(networkAdminStatusRec);
 
         } catch (Exception e) {
-			LOG.error("Exception in updateApStatus", e);
-			throw e;
+            LOG.debug("Exception in updateApStatus", e);
         }
 
     }
@@ -731,6 +762,14 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
 
             if (ovsdbSession != null) {
+                // if (ovsdbSession.getCustomerId() > 0 &&
+                // ovsdbSession.getEquipmentId() > 0L) {
+                // List<Status> statusForDisconnectedAp =
+                // statusServiceInterface.delete(ovsdbSession.getCustomerId(),
+                // ovsdbSession.getEquipmentId());
+                // LOG.info("Deleted status records {} for AP {}",
+                // statusForDisconnectedAp, apId);
+                // }
                 if (ovsdbSession.getRoutingId() > 0L) {
                     try {
                         routingServiceInterface.delete(ovsdbSession.getRoutingId());
@@ -742,39 +781,12 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             } else {
                 LOG.warn("Cannot find ap {} in inventory", apId);
             }
-			
-			updateApDisconnectedStatus(apId);
         } catch (Exception e) {
             LOG.error("Exception when registering ap routing {}", apId, e);
         }
 
     }
 
-	private void updateApDisconnectedStatus(String apId) {
-		try {
-			Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
-			if (ce == null) {
-				LOG.debug("updateDisconnectedApStatus::Cannot get Equipment for AP {}", apId);
-				return;
-			}
-
-			Status statusRecord = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(),
-					StatusDataType.EQUIPMENT_ADMIN);
-			if (statusRecord == null) {
-				LOG.debug("updateApDisconnectedStatus::Cannot get EQUIPMENT_ADMIN status for CustomerId {} or EquipmentId {} for AP {}", 
-						ce.getCustomerId(), ce.getId(), apId);
-				return;
-			}
-
-			((EquipmentAdminStatusData) statusRecord.getDetails()).setStatusCode(StatusCode.error);
-			// Update the equipment admin status
-			statusRecord = statusServiceInterface.update(statusRecord);
-		} catch (Exception e) {
-			LOG.error("Exception in updateApDisconnectedStatus", e);
-			throw e;
-		}
-	}
-
     @Override
     public OpensyncAPConfig getApConfig(String apId) {
         LOG.info("Retrieving config for AP {} ", apId);
@@ -791,7 +803,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             if ((customer != null) && (customer.getDetails() != null)
                     && (customer.getDetails().getAutoProvisioning() != null)
                     && customer.getDetails().getAutoProvisioning().isEnabled()) {
-				Equipment equipmentConfig = equipmentServiceInterface.getByInventoryIdOrNull(apId);
+                Equipment equipmentConfig = getCustomerEquipment(apId);
 
                 if (equipmentConfig == null) {
                     throw new IllegalStateException("Cannot retrieve configuration for " + apId);
@@ -815,8 +827,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 ret.setSsidProfile(
                         profileContainer.getChildrenOfType(equipmentConfig.getProfileId(), ProfileType.ssid));
 
-				ret.setMetricsProfiles(profileContainer.getChildrenOfType(equipmentConfig.getProfileId(),
-						ProfileType.service_metrics_collection_config));
+                ret.setMetricsProfiles(
+                        profileContainer.getChildrenOfType(equipmentConfig.getProfileId(), ProfileType.service_metrics_collection_config));
                 
                 Set<Profile> radiusSet = new HashSet<>();
                 Set<Long> captiveProfileIds = new HashSet<>();
@@ -851,12 +863,12 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
                 if (hotspot20ProfileSet.size() > 0) {
                     for (Profile hotspot20Profile : hotspot20ProfileSet) {
-						hotspot20OperatorSet.addAll(profileContainer.getChildrenOfType(hotspot20Profile.getId(),
-								ProfileType.passpoint_operator));
-						hotspot20VenueSet.addAll(profileContainer.getChildrenOfType(hotspot20Profile.getId(),
-								ProfileType.passpoint_venue));
-						hotspot20ProviderSet.addAll(profileContainer.getChildrenOfType(hotspot20Profile.getId(),
-								ProfileType.passpoint_osu_id_provider));
+                        hotspot20OperatorSet.addAll(
+                                profileContainer.getChildrenOfType(hotspot20Profile.getId(), ProfileType.passpoint_operator));
+                        hotspot20VenueSet.addAll(
+                                profileContainer.getChildrenOfType(hotspot20Profile.getId(), ProfileType.passpoint_venue));
+                        hotspot20ProviderSet.addAll(
+                                profileContainer.getChildrenOfType(hotspot20Profile.getId(), ProfileType.passpoint_osu_id_provider));
                     }
                     hotspotConfig.setHotspot20OperatorSet(hotspot20OperatorSet);
                     hotspotConfig.setHotspot20ProfileSet(hotspot20ProfileSet);
@@ -1121,9 +1133,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             if (protocolStatus != null) {
 
                 protocolStatusData = (EquipmentProtocolStatusData) protocolStatus.getDetails();
-				if (!protocolStatusData.getReportedCC().equals(CountryCode.getByName((radioState.getCountry())))) {
-					
-					LOG.debug("Protocol Status reportedCC {} radioStatus.getCountry {} radioStatus CountryCode fromName {}", protocolStatusData.getReportedCC(), radioState.getCountry(), CountryCode.getByName((radioState.getCountry())));
+                if (!protocolStatusData.getReportedCC()
+                        .equals(CountryCode.getByName((radioState.getCountry())))) {
                     protocolStatusData.setReportedCC(CountryCode.getByName((radioState.getCountry())));
                     protocolStatus.setDetails(protocolStatusData);
 
@@ -1441,7 +1452,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
 
         if (ovsdbSession == null) {
-			LOG.info("awlanNodeDbTableUpdate::Cannot get Session for AP {}", apId);
+            LOG.debug("awlanNodeDbTableUpdate::Cannot get Session for AP {}", apId);
             return;
         }
 
@@ -1449,27 +1460,22 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         long equipmentId = ovsdbSession.getEquipmentId();
 
         if ((customerId < 0) || (equipmentId < 0)) {
-			LOG.info("awlanNodeDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId,
+            LOG.debug("awlanNodeDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId,
                     equipmentId, apId);
             return;
         }
 
-		Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
-		if (ce == null) {
-			LOG.info("awlanNodeDbTableUpdate::Cannot find AP {}", apId);
-			return;
-		}
-
         int upgradeStatusFromAp = opensyncAPState.getUpgradeStatus();
         EquipmentUpgradeState fwUpgradeState = null;
         FailureReason fwUpgradeFailureReason = null;
 
         if (opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_FACTORY_RESET)
-				|| opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_REBOOT)
-				|| opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_SWITCH_SOFTWARE_BANK)
+                || opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_FACTORY_RESET)
+                || opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_FACTORY_RESET)
                 || opensyncAPState.getFirmwareUrl().equals("")) {
 
-			LOG.debug("Firmware Url {}, no fwUpgradeState", opensyncAPState.getFirmwareUrl());
+            fwUpgradeState = EquipmentUpgradeState.undefined;
+
         } else {
             fwUpgradeState = OvsdbToWlanCloudTypeMappingUtility
                     .getCloudEquipmentUpgradeStateFromOpensyncUpgradeStatus(upgradeStatusFromAp);
@@ -1480,6 +1486,19 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             }
         }
 
+        Status protocolStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.PROTOCOL);
+        if (protocolStatus == null) {
+            protocolStatus = new Status();
+            protocolStatus.setCustomerId(customerId);
+            protocolStatus.setEquipmentId(equipmentId);
+            protocolStatus.setStatusDataType(StatusDataType.PROTOCOL);
+            EquipmentProtocolStatusData protocolStatusData = new EquipmentProtocolStatusData();
+            protocolStatus.setDetails(protocolStatusData);
+
+            protocolStatus = statusServiceInterface.update(protocolStatus);
+
+        }
+
         String reportedFwImageName = null;
         String reportedAltFwImageName = null;
 
@@ -1496,86 +1515,63 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             reportedAltFwImageName = opensyncAPState.getVersionMatrix().get(OvsdbStringConstants.FW_IMAGE_NAME_KEY);
 
         }
+
+        EquipmentProtocolStatusData protocolStatusData = (EquipmentProtocolStatusData) protocolStatus.getDetails();
+        protocolStatusData.setReportedSku(opensyncAPState.getSkuNumber());
+        if (reportedFwImageName != null) {
+            protocolStatusData.setReportedSwVersion(reportedFwImageName);
+        }
+        protocolStatusData.setReportedSwAltVersion(reportedAltFwImageName);
+        protocolStatusData.setReportedHwVersion(opensyncAPState.getPlatformVersion());
+        protocolStatusData.setSystemName(opensyncAPState.getModel());
+
         List<Status> updates = new ArrayList<>();
 
-		Status protocolStatus = configureProtocolStatus(opensyncAPState, customerId, equipmentId, reportedFwImageName,
-				reportedAltFwImageName);
-		if (protocolStatus != null) {
+        // only post update if there is a change
+        if (!((EquipmentProtocolStatusData) statusServiceInterface
+                .getOrNull(customerId, equipmentId, StatusDataType.PROTOCOL).getDetails()).equals(protocolStatusData)) {
+            protocolStatus.setDetails(protocolStatusData);
             updates.add(protocolStatus);
         }
 
-		Status firmwareStatus = configureFirmwareStatus(customerId, equipmentId, fwUpgradeState, fwUpgradeFailureReason,
-				reportedFwImageName, reportedAltFwImageName);
-		if (firmwareStatus != null) {
-			updates.add(firmwareStatus);
-		}
-
-		if (!updates.isEmpty()) {// may be some updates from
-			// protocol
-			// status
-			updates = statusServiceInterface.update(updates);
-		} 
-	}
-
-	private Status configureProtocolStatus(OpensyncAWLANNode opensyncAPState, int customerId, long equipmentId,
-			String reportedSwImageName, String reportedAltSwImageName) {
-		Status protocolStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.PROTOCOL);
-		if (protocolStatus != null) {
-			EquipmentProtocolStatusData protocolStatusData = ((EquipmentProtocolStatusData) protocolStatus.getDetails());
-			if (protocolStatusData.getReportedSku() != null && protocolStatusData.getReportedSku().equals(opensyncAPState.getSkuNumber())
-					&& protocolStatusData.getReportedSwVersion() != null && protocolStatusData.getReportedSwVersion().equals(reportedSwImageName) 
-					&& protocolStatusData.getReportedSwAltVersion() != null && protocolStatusData.getReportedSwAltVersion().equals(reportedAltSwImageName)
-					&& protocolStatusData.getReportedHwVersion() != null && protocolStatusData.getReportedHwVersion().equals(opensyncAPState.getPlatformVersion())
-					&& protocolStatusData.getSystemName() != null && protocolStatusData.getSystemName().equals(opensyncAPState.getModel())) {
-				// no changes
-				return null;
-			}
-			protocolStatusData.setReportedSku(opensyncAPState.getSkuNumber());
-			if (reportedSwImageName != null) {
-				protocolStatusData.setReportedSwVersion(reportedSwImageName);
-			} else {
-				protocolStatusData.setReportedSwVersion("Unknown");
-			}
-			if (reportedAltSwImageName != null) {
-				protocolStatusData.setReportedSwAltVersion(reportedAltSwImageName);
-			} else {
-				protocolStatusData.setReportedSwAltVersion("Unknown");
-			}
-			protocolStatusData
-			.setReportedHwVersion(opensyncAPState.getPlatformVersion());
-			protocolStatusData.setSystemName(opensyncAPState.getModel());
-		}
-		return protocolStatus;
-	}
-
-	private Status configureFirmwareStatus(int customerId, long equipmentId,EquipmentUpgradeState fwUpgradeState,
-			FailureReason fwUpgradeFailureReason, String reportedFwImageName, String reportedAltFwImageName) {
-
         Status firmwareStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.FIRMWARE);
-		if (firmwareStatus != null) {
-			EquipmentUpgradeStatusData upgradeStatusData = (EquipmentUpgradeStatusData)firmwareStatus.getDetails();
-			if (upgradeStatusData.getActiveSwVersion() != null && upgradeStatusData.getActiveSwVersion().equals(reportedFwImageName) && upgradeStatusData.getAlternateSwVersion() != null &&upgradeStatusData.getAlternateSwVersion().equals(reportedAltFwImageName) && upgradeStatusData.getUpgradeState() != null && upgradeStatusData.getUpgradeState().equals(fwUpgradeState)) {
-				return null; // no changes
-			}
-			if (reportedFwImageName != null) {
-				upgradeStatusData.setActiveSwVersion(reportedFwImageName);
-			} else {
-				upgradeStatusData.setActiveSwVersion("Unknown");
+        if (firmwareStatus == null) {
+            firmwareStatus = new Status();
+            firmwareStatus.setCustomerId(customerId);
+            firmwareStatus.setEquipmentId(equipmentId);
+            firmwareStatus.setStatusDataType(StatusDataType.FIRMWARE);
+            firmwareStatus.setDetails(new EquipmentUpgradeStatusData());
+            firmwareStatus = statusServiceInterface.update(firmwareStatus);
 
         }
-			if (reportedAltFwImageName != null) {
-				upgradeStatusData.setAlternateSwVersion(reportedAltFwImageName);
-			} else {
-				((EquipmentUpgradeStatusData) firmwareStatus.getDetails())
-				.setAlternateSwVersion("Unknown");
-			}
 
-			if (fwUpgradeState == null) fwUpgradeState = EquipmentUpgradeState.undefined;
+        Equipment ce = getCustomerEquipment(apId);
+        if (ce != null) {
+            ce.getDetails();
 
             if (fwUpgradeState.equals(EquipmentUpgradeState.up_to_date)) {
                 LOG.info("Firmware load is up to date.");
-				upgradeStatusData.setUpgradeState(fwUpgradeState);
-				firmwareStatus.setDetails(upgradeStatusData);
+
+                EquipmentUpgradeStatusData firmwareStatusData = (EquipmentUpgradeStatusData) firmwareStatus
+                        .getDetails();
+                if (reportedFwImageName != null) {
+                    if (!firmwareStatusData.getActiveSwVersion().equals(reportedFwImageName)
+                            || !firmwareStatusData.getUpgradeState().equals(fwUpgradeState)
+                            || !firmwareStatusData.getAlternateSwVersion().equals(reportedAltFwImageName)) {
+                        firmwareStatusData.setActiveSwVersion(reportedFwImageName);
+                        firmwareStatusData.setAlternateSwVersion(reportedAltFwImageName);
+                        firmwareStatusData.setUpgradeState(fwUpgradeState, fwUpgradeFailureReason);
+                        firmwareStatus.setDetails(firmwareStatusData);
+                        updates.add(firmwareStatus);
+                    }
+
+                }
+
+                if (!updates.isEmpty()) { // may be some updates from protocol
+                                          // status
+                    updates = statusServiceInterface.update(updates);
+                }
+
             } else if (fwUpgradeState.equals(EquipmentUpgradeState.download_complete)
                     || fwUpgradeState.equals(EquipmentUpgradeState.apply_complete)
                     || fwUpgradeState.equals(EquipmentUpgradeState.apply_initiated)
@@ -1587,30 +1583,98 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
                 LOG.info("Firmware upgrade is in state {}", fwUpgradeState);
 
-				upgradeStatusData.setUpgradeState(fwUpgradeState);
+                EquipmentUpgradeStatusData firmwareStatusData = (EquipmentUpgradeStatusData) firmwareStatus
+                        .getDetails();
+                if (reportedFwImageName != null) {
+                    if (!firmwareStatusData.getActiveSwVersion().equals(reportedFwImageName)
+                            || !firmwareStatusData.getUpgradeState().equals(fwUpgradeState)
+                            || !firmwareStatusData.getAlternateSwVersion().equals(reportedAltFwImageName)) {
+                        firmwareStatusData.setActiveSwVersion(reportedFwImageName);
+                        firmwareStatusData.setAlternateSwVersion(reportedAltFwImageName);
+                        firmwareStatusData.setUpgradeState(fwUpgradeState, fwUpgradeFailureReason);
                         if (fwUpgradeState.equals(EquipmentUpgradeState.apply_initiated)) {
-					upgradeStatusData.setUpgradeStartTime(System.currentTimeMillis());
+                            firmwareStatusData.setUpgradeStartTime(System.currentTimeMillis());
                         } else if (fwUpgradeState.equals(EquipmentUpgradeState.reboot_initiated)
                                 || fwUpgradeState.equals(EquipmentUpgradeState.rebooting)) {
-					upgradeStatusData.setRebooted(true);
+                            firmwareStatusData.setRebooted(true);
                         }
-				firmwareStatus.setDetails(upgradeStatusData);
+                        firmwareStatus.setDetails(firmwareStatusData);
+                        updates.add(firmwareStatus);
+                    }
+                }
+
+                if (!updates.isEmpty()) {// may be some updates from protocol
+                                         // status
+                    updates = statusServiceInterface.update(updates);
+                }
+
+                // no other action here, these are just transient states
+
             } else if (fwUpgradeState.equals(EquipmentUpgradeState.apply_failed)
                     || fwUpgradeState.equals(EquipmentUpgradeState.download_failed)
                     || fwUpgradeState.equals(EquipmentUpgradeState.reboot_failed)) {
                 LOG.warn("Firmware upgrade is in a failed state {} due to {}", fwUpgradeState, fwUpgradeFailureReason);
 
-				upgradeStatusData.setUpgradeState(fwUpgradeState, fwUpgradeFailureReason);
-				firmwareStatus.setDetails(upgradeStatusData);
+                EquipmentUpgradeStatusData firmwareStatusData = (EquipmentUpgradeStatusData) firmwareStatus
+                        .getDetails();
+                if (reportedFwImageName != null) {
+                    if (!firmwareStatusData.getActiveSwVersion().equals(reportedFwImageName)
+                            || !firmwareStatusData.getAlternateSwVersion().equals(reportedAltFwImageName)
+                            || !firmwareStatusData.getUpgradeState().equals(fwUpgradeState)
+                            || !firmwareStatusData.getReason().equals(fwUpgradeFailureReason)) {
+                        firmwareStatusData.setActiveSwVersion(reportedFwImageName);
+                        firmwareStatusData.setAlternateSwVersion(reportedAltFwImageName);
+                        firmwareStatusData.setUpgradeState(fwUpgradeState, fwUpgradeFailureReason);
+                        firmwareStatus.setDetails(firmwareStatusData);
+                        updates.add(firmwareStatus);
+                        updates = statusServiceInterface.update(updates);
+                        reconcileFwVersionToTrack(ce, reportedFwImageName, opensyncAPState.getModel());
                     } else {
+                        if (!updates.isEmpty()) {
+                            updates = statusServiceInterface.update(updates);
+                        }
+                    }
 
-				((EquipmentUpgradeStatusData) firmwareStatus.getDetails())
-				.setUpgradeState(EquipmentUpgradeState.undefined);
-				((EquipmentUpgradeStatusData) firmwareStatus.getDetails())
-				.setUpgradeStartTime(null);
+                } else {
+                    if (!updates.isEmpty()) {// may be some updates from
+                                             // protocol
+                        // status
+                        updates = statusServiceInterface.update(updates);
                     }
                 }
-		return firmwareStatus;
+
+            } else {
+                LOG.info("Firmware upgrade state is {}", fwUpgradeState);
+                EquipmentUpgradeStatusData firmwareStatusData = (EquipmentUpgradeStatusData) firmwareStatus
+                        .getDetails();
+                if (reportedFwImageName != null) {
+                    if (!firmwareStatusData.getActiveSwVersion().equals(reportedFwImageName)
+                            || !firmwareStatusData.getUpgradeState().equals(fwUpgradeState)
+                            || !firmwareStatusData.getAlternateSwVersion().equals(reportedAltFwImageName)) {
+                        firmwareStatusData.setActiveSwVersion(reportedFwImageName);
+                        firmwareStatusData.setAlternateSwVersion(reportedAltFwImageName);
+                        firmwareStatusData.setUpgradeState(fwUpgradeState, fwUpgradeFailureReason);
+                        firmwareStatus.setDetails(firmwareStatusData);
+                        updates.add(firmwareStatus);
+                        updates = statusServiceInterface.update(updates);
+                    } else {
+                        if (!updates.isEmpty()) {// may be some updates from
+                                                 // protocol
+                            // status
+                            updates = statusServiceInterface.update(updates);
+                        }
+                    }
+                } else {
+                    if (!updates.isEmpty()) {// may be some updates from
+                                             // protocol
+                        // status
+                        updates = statusServiceInterface.update(updates);
+                    }
+
+                }
+            }
+        }
+
     }
 
     @Override
@@ -1633,6 +1697,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             return;
         }
 
+        if (equipmentId < 0L) {
+            LOG.debug("wifiVIFStateDbTableDelete Cannot get equipmentId {} for session {}", equipmentId);
+            return;
+        }
+
         Status activeBssidsStatus = statusServiceInterface.getOrNull(customerId, equipmentId,
                 StatusDataType.ACTIVE_BSSIDS);
 
@@ -1667,7 +1736,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
         }
 
-		if (bssidList != null) bssidList.removeAll(toBeDeleted);
+        bssidList.removeAll(toBeDeleted);
 
         statusDetails.setActiveBSSIDs(bssidList);
 
@@ -1704,14 +1773,13 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 new MacAddress(deletedClientMac));
 
         if (client != null) {
-		    if (clientSession != null && clientSession.getDetails() != null && clientSession.getDetails().getAssociationState() != null) {
+            if (clientSession != null) {
                 if (!clientSession.getDetails().getAssociationState().equals(AssociationState.Disconnected)) {
                     clientSession.getDetails().setAssociationState(AssociationState.Disconnected);
                     clientSession = clientServiceInterface.updateSession(clientSession);
                     LOG.info("Session {} for client {} is now disconnected.", clientSession, client.getMacAddress());
                 }
             }
-
         } else {
             if (clientSession != null) {
 
@@ -1722,6 +1790,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             }
         }
 
+
     }
 
     @Override
@@ -1746,7 +1815,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             return;
         }
 
-		Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
+        Equipment ce = getCustomerEquipment(apId);
 
         if (ce == null) {
             LOG.debug("updateDhcpIpClientFingerprints::Cannot get Equipment for AP {}", apId);
@@ -1776,6 +1845,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 } else if (clientMacAddress.equals(equipmentServiceInterface.get(equipmentId).getBaseMacAddress())) {
                     LOG.info("Not a client device {} ", dhcpLeasedIps);
 
+
                     // In case somehow this equipment has accidentally been
                     // tagged as a client, remove
 
@@ -1789,6 +1859,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
                     LOG.info("Deleting invalid client {}", clientServiceInterface.delete(customerId, clientMacAddress));
 
+
                     continue;
                 } else {
                     LOG.info("Client {} already exists on the cloud, update client values", dhcpLeasedIps);
@@ -1868,6 +1939,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
                     LOG.info("Not a client device {} ", dhcpLeasedIps);
 
+
                     // In case somehow this equipment has accidentally been
                     // tagged as a client, remove
 
@@ -1881,10 +1953,12 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
                     LOG.info("Deleting invalid client {}", clientServiceInterface.delete(customerId, clientMacAddress));
 
+
                     continue;
 
                 } else {
 
+
                     ClientInfoDetails clientDetails = (ClientInfoDetails) client.getDetails();
                     if (dhcpLeasedIps.containsKey("hostname")) {
 

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

@@ -30,7 +30,6 @@ 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;
@@ -40,9 +39,8 @@ 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.util.OvsdbToWlanCloudTypeMappingUtility;
+import com.telecominfraproject.wlan.opensync.ovsdb.dao.utilities.OvsdbToWlanCloudTypeMappingUtility;
 import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
 import com.telecominfraproject.wlan.profile.models.Profile;
 import com.telecominfraproject.wlan.profile.models.ProfileContainer;
@@ -78,7 +76,6 @@ 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;
@@ -95,7 +92,6 @@ 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;
@@ -154,7 +150,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
     void processMqttMessage(String topic, WCStatsReport wcStatsReport) {
         LOG.info("Received WCStatsReport {}", wcStatsReport.toString());
 
-        LOG.debug("Received report on topic {}", topic);
+        LOG.info("Received report on topic {}", topic);
         int customerId = extractCustomerIdFromTopic(topic);
 
         long equipmentId = extractEquipmentIdFromTopic(topic);
@@ -249,7 +245,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
         }
 
         if (!metricRecordList.isEmpty()) {
-            LOG.debug("Publishing Metrics {}", metricRecordList);
+            LOG.info("Publishing Metrics {}", metricRecordList);
             equipmentMetricsCollectorInterface.publishMetrics(metricRecordList);
         }
 
@@ -300,7 +296,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             for (sts.OpensyncStats.EventReport.ClientSession apEventClientSession : e.getClientSessionList()) {
 
-                LOG.debug("Processing EventReport::ClientSession {}", apEventClientSession);
+                LOG.info("Processing EventReport::ClientSession {}", apEventClientSession);
 
                 processClientConnectEvent(customerId, equipmentId, locationId, e, apEventClientSession);
 
@@ -322,74 +318,10 @@ 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()) {
@@ -601,7 +533,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.warn("Cannot update client or client session when no client mac address is present");
+                LOG.info("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -661,7 +593,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.warn("Cannot update client or client session when no client mac address is present");
+                LOG.info("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -734,7 +666,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.warn("Cannot update client or client session when no client mac address is present");
+                LOG.info("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -796,7 +728,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.warn("Cannot update client or client session when no client mac address is present");
+                LOG.info("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -855,7 +787,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.warn("Cannot update client or client session when no client mac address is present");
+                LOG.info("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -904,7 +836,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.warn("Cannot update client or client session when no client mac address is present");
+                LOG.info("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -961,7 +893,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.warn("Cannot update client or client session when no clientmac address is present");
+                LOG.info("Cannot update client or client session when no clientmac address is present");
             }
         }
     }
@@ -1028,7 +960,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 clientSession = clientServiceInterface.updateSession(clientSession);
 
             } else {
-                LOG.warn("Cannot update client or client session when no client mac address is present");
+                LOG.info("Cannot update client or client session when no client mac address is present");
             }
         }
     }
@@ -1046,9 +978,9 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 eventTimestamp = videoVoiceReport.getTimestampMs();
             }
 
-            LOG.debug("Received VideoVoiceReport {} for SIP call", videoVoiceReport);
+            LOG.info("Received VideoVoiceReport {} for SIP call", videoVoiceReport);
 
-            processRealTimeSipCallReportEvent(customerId, equipmentId, eventTimestamp, eventsList, videoVoiceReport);
+            processRealTImeSipCallReportEvent(customerId, equipmentId, eventTimestamp, eventsList, videoVoiceReport);
 
             processRealTimeSipCallStartEvent(customerId, equipmentId, eventTimestamp, eventsList, videoVoiceReport);
 
@@ -1068,229 +1000,13 @@ 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) {
         if (videoVoiceReport.hasCallReport()) {
 
             CallReport callReport = videoVoiceReport.getCallReport();
-
-            RealTimeSipCallReportEvent cloudSipCallReportEvent = new RealTimeSipCallReportEvent(customerId, equipmentId,
-                    eventTimestamp);
-
-            if (callReport.hasClientMac() && callReport.getClientMac().isValidUtf8()) {
-                cloudSipCallReportEvent.setClientMacAddress(MacAddress.valueOf(callReport.getClientMac().toStringUtf8()));
-            }
-            cloudSipCallReportEvent.setStatuses(processRtpFlowStats(callReport.getStatsList()));
-            cloudSipCallReportEvent.setEventType(RealTimeEventType.SipCallReport);
-
-            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()) {
-
-            CallStart apCallStart = videoVoiceReport.getCallStart();
-
-            RealTimeSipCallStartEvent cloudSipCallStartEvent = new RealTimeSipCallStartEvent(customerId, equipmentId,
-                    eventTimestamp);
-
-            if (apCallStart.hasClientMac() && apCallStart.getClientMac().isValidUtf8()) {
-                cloudSipCallStartEvent.setClientMacAddress(MacAddress.valueOf(apCallStart.getClientMac().toStringUtf8()));
-            }
-
-            if (apCallStart.hasDeviceInfo()) {
-                cloudSipCallStartEvent.setDeviceInfo(apCallStart.getDeviceInfo());
-            }
-
-            if (apCallStart.hasProviderDomain()) {
-                cloudSipCallStartEvent.setProviderDomain(apCallStart.getProviderDomain());
-            }
-
-            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);
-
-        }
-    }
-
-    protected void processRealTimeSipCallStopEvent(int customerId, long equipmentId, long eventTimestamp,
-            List<SystemEvent> eventsList, VideoVoiceReport videoVoiceReport) {
-        if (videoVoiceReport.hasCallStop()) {
-
-            CallStop apCallStop = videoVoiceReport.getCallStop();
-
-            RealTimeSipCallStopEvent cloudSipCallStopEvent = new RealTimeSipCallStopEvent(customerId, equipmentId,
-                    eventTimestamp);
-
-            if (apCallStop.hasCallDuration()) {
-
-                cloudSipCallStopEvent.setCallDuration(apCallStop.getCallDuration());
-
-            }
-
-            if (apCallStop.hasClientMac() && apCallStop.getClientMac().isValidUtf8()) {
-
-                cloudSipCallStopEvent.setClientMacAddress(MacAddress.valueOf(apCallStop.getClientMac().toStringUtf8()));
-
-            }
-
-            if (apCallStop.hasReason()) {
-
-                switch (apCallStop.getReason()) {
-                case BYE_OK:
-                    cloudSipCallStopEvent.setReason(SipCallStopReason.BYE_OK);
-                    break;
-                case CALL_DROPPED:
-                    cloudSipCallStopEvent.setReason(SipCallStopReason.DROPPED);
-                    break;
-
-                default:
-                    cloudSipCallStopEvent.setReason(SipCallStopReason.UNSUPPORTED);
-                }
-
-            }
-
-            if (apCallStop.hasSessionId()) {
-
-                cloudSipCallStopEvent.setAssociationId(apCallStop.getSessionId());
-
-            }
-
-            if (apCallStop.hasWifiSessionId()) {
-                cloudSipCallStopEvent.setSipCallId(apCallStop.getWifiSessionId());
-
-            }
-
-            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);
-
-        }
-    }
-
-    protected void processRtsStartEvent(int customerId, long equipmentId, long eventTimestamp,
-            List<SystemEvent> eventsList, VideoVoiceReport videoVoiceReport) {
-        if (videoVoiceReport.hasStreamVideoServer()) {
-            StreamingVideoServerDetected apStreamVideoServer = videoVoiceReport.getStreamVideoServer();
-            RealTimeStreamingStartEvent rtsStartEvent = new RealTimeStreamingStartEvent(customerId, equipmentId,
-                    eventTimestamp);
-            if (apStreamVideoServer.hasServerIp()) {
-                try {
-                    rtsStartEvent
-                            .setServerIp(InetAddress.getByAddress(apStreamVideoServer.getServerIp().toByteArray()));
-                } catch (UnknownHostException e) {
-                    LOG.error("Cannot get IP Address from {}", apStreamVideoServer.getServerIp(), e);
-                }
-            }
-            if (apStreamVideoServer.hasStreamingVideoType()) {
-                rtsStartEvent.setType(OvsdbToWlanCloudTypeMappingUtility
-                        .getCloudStreamingVideoTypeFromApReport(apStreamVideoServer.getStreamingVideoType()));
-            }
-
-            if (apStreamVideoServer.hasServerDnsName()) {
-                rtsStartEvent.setServerDnsName(apStreamVideoServer.getServerDnsName());
-            }
-
-            if (apStreamVideoServer.hasClientMac()) {
-                rtsStartEvent.setClientMacAddress(MacAddress.valueOf(apStreamVideoServer.getClientMac().toByteArray()));
-            }
-
-            if (apStreamVideoServer.hasSessionId()) {
-                rtsStartEvent.setSessionId(apStreamVideoServer.getSessionId());
-            }
-
-            if (apStreamVideoServer.hasVideoSessionId()) {
-                rtsStartEvent.setVideoSessionId(apStreamVideoServer.getVideoSessionId());
-            }
-
-            eventsList.add(rtsStartEvent);
-
-        }
-    }
-
-    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) {
+            for (RtpFlowStats apRtpFlowStats : callReport.getStatsList()) {
 
                 com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowStats cloudRtpStats = new com.telecominfraproject.wlan.systemevent.equipment.realtime.RtpFlowStats();
 
@@ -1374,7 +1090,147 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 cloudRtpFlowStatsList.add(cloudRtpStats);
 
             }
-        return cloudRtpFlowStatsList;
+
+            RealTimeSipCallReportEvent cloudSipCallReportEvent = new RealTimeSipCallReportEvent(customerId, equipmentId,
+                    eventTimestamp);
+            cloudSipCallReportEvent.setClientMacAddress(MacAddress.valueOf(callReport.getClientMac()));
+            cloudSipCallReportEvent.setStatuses(cloudRtpFlowStatsList);
+            cloudSipCallReportEvent.setEventType(RealTimeEventType.SipCallReport);
+            cloudSipCallReportEvent.setReportReason(SIPCallReportReason.GOT_PUBLISH);
+            cloudSipCallReportEvent.setSipCallId(callReport.getWifiSessionId());
+            cloudSipCallReportEvent.setAssociationId(callReport.getSessionId());
+
+            eventsList.add(cloudSipCallReportEvent);
+
+        }
+    }
+
+    protected void processRealTimeSipCallStartEvent(int customerId, long equipmentId, long eventTimestamp,
+            List<SystemEvent> eventsList, VideoVoiceReport videoVoiceReport) {
+        if (videoVoiceReport.hasCallStart()) {
+
+            CallStart apCallStart = videoVoiceReport.getCallStart();
+
+            RealTimeSipCallStartEvent cloudSipCallStartEvent = new RealTimeSipCallStartEvent(customerId, equipmentId,
+                    eventTimestamp);
+
+            if (apCallStart.hasClientMac()) {
+                cloudSipCallStartEvent.setClientMacAddress(MacAddress.valueOf(apCallStart.getClientMac()));
+            }
+
+            if (apCallStart.hasDeviceInfo()) {
+                cloudSipCallStartEvent.setDeviceInfo(apCallStart.getDeviceInfo());
+            }
+
+            if (apCallStart.hasProviderDomain()) {
+                cloudSipCallStartEvent.setProviderDomain(apCallStart.getProviderDomain());
+            }
+
+            if (apCallStart.hasSessionId()) {
+                cloudSipCallStartEvent.setAssociationId(apCallStart.getSessionId());
+
+            }
+
+            if (apCallStart.hasWifiSessionId()) {
+                cloudSipCallStartEvent.setAssociationId(apCallStart.getWifiSessionId());
+            }
+
+            eventsList.add(cloudSipCallStartEvent);
+
+        }
+    }
+
+    protected void processRealTimeSipCallStopEvent(int customerId, long equipmentId, long eventTimestamp,
+            List<SystemEvent> eventsList, VideoVoiceReport videoVoiceReport) {
+        if (videoVoiceReport.hasCallStop()) {
+
+            CallStop apCallStop = videoVoiceReport.getCallStop();
+
+            RealTimeSipCallStopEvent cloudSipCallStopEvent = new RealTimeSipCallStopEvent(customerId, equipmentId,
+                    eventTimestamp);
+
+            if (apCallStop.hasCallDuration()) {
+
+                cloudSipCallStopEvent.setCallDuration(apCallStop.getCallDuration());
+
+            }
+
+            if (apCallStop.hasClientMac()) {
+
+                cloudSipCallStopEvent.setClientMacAddress(MacAddress.valueOf(apCallStop.getClientMac()));
+
+            }
+
+            if (apCallStop.hasReason()) {
+
+                switch (apCallStop.getReason()) {
+                case BYE_OK:
+                    cloudSipCallStopEvent.setReason(SipCallStopReason.BYE_OK);
+                    break;
+                case CALL_DROPPED:
+                    cloudSipCallStopEvent.setReason(SipCallStopReason.DROPPED);
+                    break;
+
+                default:
+                    cloudSipCallStopEvent.setReason(SipCallStopReason.UNSUPPORTED);
+                }
+
+            }
+
+            if (apCallStop.hasSessionId()) {
+
+                cloudSipCallStopEvent.setAssociationId(apCallStop.getSessionId());
+
+            }
+
+            if (apCallStop.hasWifiSessionId()) {
+                cloudSipCallStopEvent.setSipCallId(apCallStop.getWifiSessionId());
+
+            }
+
+            eventsList.add(cloudSipCallStopEvent);
+
+        }
+    }
+
+    protected void processRtsStartEvent(int customerId, long equipmentId, long eventTimestamp,
+            List<SystemEvent> eventsList, VideoVoiceReport videoVoiceReport) {
+        if (videoVoiceReport.hasStreamVideoServer()) {
+            StreamingVideoServerDetected apStreamVideoServer = videoVoiceReport.getStreamVideoServer();
+            RealTimeStreamingStartEvent rtsStartEvent = new RealTimeStreamingStartEvent(customerId, equipmentId,
+                    eventTimestamp);
+            if (apStreamVideoServer.hasServerIp()) {
+                try {
+                    rtsStartEvent
+                            .setServerIp(InetAddress.getByAddress(apStreamVideoServer.getServerIp().toByteArray()));
+                } catch (UnknownHostException e) {
+                    LOG.error("Cannot get IP Address from {}", apStreamVideoServer.getServerIp(), e);
+                }
+            }
+            if (apStreamVideoServer.hasStreamingVideoType()) {
+                rtsStartEvent.setType(OvsdbToWlanCloudTypeMappingUtility
+                        .getCloudStreamingVideoTypeFromApReport(apStreamVideoServer.getStreamingVideoType()));
+            }
+
+            if (apStreamVideoServer.hasServerDnsName()) {
+                rtsStartEvent.setServerDnsName(apStreamVideoServer.getServerDnsName());
+            }
+
+            if (apStreamVideoServer.hasClientMac()) {
+                rtsStartEvent.setClientMacAddress(MacAddress.valueOf(apStreamVideoServer.getClientMac().toByteArray()));
+            }
+
+            if (apStreamVideoServer.hasSessionId()) {
+                rtsStartEvent.setSessionId(apStreamVideoServer.getSessionId());
+            }
+
+            if (apStreamVideoServer.hasVideoSessionId()) {
+                rtsStartEvent.setVideoSessionId(apStreamVideoServer.getVideoSessionId());
+            }
+
+            eventsList.add(rtsStartEvent);
+
+        }
     }
 
     protected void processRtsStartSessionEvent(int customerId, long equipmentId, long eventTimestamp,
@@ -1745,7 +1601,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             NetworkAdminStatusData statusData = (NetworkAdminStatusData) networkAdminStatus.getDetails();
             
             if (n.getDnsState() == null) {
-                LOG.debug("No DnsState present in networkProbeMetrics, DnsState and CloudLinkStatus set to 'normal");
+                LOG.info("No DnsState present in networkProbeMetrics, DnsState and CloudLinkStatus set to 'normal");
                 statusData.setDnsStatus(StatusCode.normal);
                 statusData.setCloudLinkStatus(StatusCode.normal);
             } else {
@@ -1753,13 +1609,13 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 statusData.setCloudLinkStatus(stateUpDownErrorToStatusCode(n.getDnsState()));
             }
             if (n.getDhcpState() == null) {
-                LOG.debug("No DhcpState present in networkProbeMetrics, set to 'normal");
+                LOG.info("No DhcpState present in networkProbeMetrics, set to 'normal");
                 statusData.setDhcpStatus(StatusCode.normal);
             } else {
                 statusData.setDhcpStatus(stateUpDownErrorToStatusCode(n.getDhcpState()));
             }
             if (n.getRadiusState() == null) {
-                LOG.debug("No RadiusState present in networkProbeMetrics, set to 'normal");
+                LOG.info("No RadiusState present in networkProbeMetrics, set to 'normal");
                 statusData.setRadiusStatus(StatusCode.normal);
             } else {
                 statusData.setRadiusStatus(stateUpDownErrorToStatusCode(n.getRadiusState()));
@@ -1769,7 +1625,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             networkAdminStatus = statusServiceInterface.update(networkAdminStatus);
 
-            LOG.debug("Updated NetworkAdminStatus {}", networkAdminStatus);
+            LOG.info("Updated NetworkAdminStatus {}", networkAdminStatus);
 
         });
 
@@ -1802,7 +1658,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 StatusDataType.RADIO_UTILIZATION);
 
         if (radioUtilizationStatus == null) {
-            LOG.debug("Create new radioUtilizationStatus");
+            LOG.info("Create new radioUtilizationStatus");
             radioUtilizationStatus = new Status();
             radioUtilizationStatus.setCustomerId(customerId);
             radioUtilizationStatus.setEquipmentId(equipmentId);
@@ -1863,6 +1719,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 if (radiusMetrics.hasLatency()) {
                     networkProbeMetrics.setRadiusLatencyInMs(radiusMetrics.getLatency());
                 }
+                if (radiusMetrics.hasRadiusState()) {
 
                     if (radiusMetrics.hasRadiusState()) {
                         StateUpDownError radiusState = OvsdbToWlanCloudTypeMappingUtility
@@ -1872,7 +1729,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
                     }
 
-
+                }
             }
 
             if (networkProbe.hasVlanProbe()) {
@@ -1912,7 +1769,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
         eqOsPerformance.setTotalAvailableMemoryKb(deviceReport.getMemUtil().getMemTotal());
         status.setDetails(eqOsPerformance);
         status = statusServiceInterface.update(status);
-        LOG.debug("updated status {}", status);
+        LOG.info("updated status {}", status);
     }
 
     void populateApClientMetrics(List<ServiceMetric> metricRecordList, Report report, int customerId, long equipmentId,
@@ -1923,12 +1780,12 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             for (Client cl : clReport.getClientListList()) {
 
                 if (cl.getMacAddress() == null) {
-                    LOG.debug("No mac address for Client {}, cannot set device mac address for client in ClientMetrics.",
+                    LOG.info("No mac address for Client {}, cannot set device mac address for client in ClientMetrics.",
                             cl);
                     continue;
                 }
 
-                LOG.debug("Processing ClientReport from AP {}", cl.getMacAddress());
+                LOG.info("Processing ClientReport from AP {}", cl.getMacAddress());
 
                 ServiceMetric smr = new ServiceMetric(customerId, equipmentId, new MacAddress(cl.getMacAddress()));
                 smr.setLocationId(locationId);
@@ -1952,7 +1809,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                 long sessionId = WiFiSessionUtility.encodeWiFiAssociationId(clReport.getTimestampMs() / 1000L,
                         MacAddress.convertMacStringToLongValue(cl.getMacAddress()));
 
-                LOG.debug("populateApClientMetrics Session Id {}", sessionId);
+                LOG.info("populateApClientMetrics Session Id {}", sessionId);
                 cMetrics.setSessionId(sessionId);
 
                 if (cl.hasStats()) {
@@ -2010,7 +1867,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                     }
                 }
 
-                LOG.debug("ApClientMetrics Report {}", cMetrics);
+                LOG.info("ApClientMetrics Report {}", cMetrics);
 
             }
 
@@ -2094,18 +1951,18 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             boolean isReassociation = true;
             if (clientInstance == null) {
 
-                LOG.debug("Cannot get client instance for {}", client.getMacAddress());
+                LOG.info("Cannot get client instance for {}", client.getMacAddress());
                 return null;
 
             }
 
-            LOG.debug("Client {}", clientInstance);
+            LOG.info("Client {}", clientInstance);
 
             ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId,
                     clientInstance.getMacAddress());
 
             if (clientSession == null) {
-                LOG.warn("Cannot get client session for {}", clientInstance.getMacAddress());
+                LOG.info("Cannot get client session for {}", clientInstance.getMacAddress());
                 return null;
             }
 
@@ -2145,9 +2002,6 @@ 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)) {
@@ -2155,9 +2009,7 @@ 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.wpa3OnlyEAP)
-                        || ssidConfig.getSecureMode().equals(SecureMode.wpa3MixedEAP)) {
+                        || ssidConfig.getSecureMode().equals(SecureMode.wpa2OnlyEAP)) {
                     latestClientSessionDetails.setSecurityType(SecurityType.RADIUS);
                     latestClientSessionDetails.setEapDetails(new ClientEapDetails());
                 } else {
@@ -2185,7 +2037,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
             clientSession = clientServiceInterface.updateSession(clientSession);
 
-            LOG.debug("Updated client session {}", clientSession);
+            LOG.info("Updated client session {}", clientSession);
 
             return clientSession;
         } catch (Exception e) {
@@ -2202,7 +2054,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
         ClientSessionMetricDetails metricDetails = new ClientSessionMetricDetails();
 
         if (LOG.isDebugEnabled())
-            LOG.debug("Stats: {} DurationMs {}", client.getStats(), client.getDurationMs());
+            LOG.info("Stats: {} DurationMs {}", client.getStats(), client.getDurationMs());
         int rssi = client.getStats().getRssi();
         metricDetails.setRssi(rssi);
         metricDetails.setRxBytes(client.getStats().getRxBytes());
@@ -2220,7 +2072,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
         metricDetails.setRxRateKbps((long) client.getStats().getRxRate());
         metricDetails.setTxRateKbps((long) client.getStats().getTxRate());
         if (LOG.isDebugEnabled())
-            LOG.debug("RxRateKbps {} TxRateKbps {}", metricDetails.getRxRateKbps(), metricDetails.getTxRateKbps());
+            LOG.info("RxRateKbps {} TxRateKbps {}", metricDetails.getRxRateKbps(), metricDetails.getTxRateKbps());
 
         // Throughput, do rate / duration
         if (client.getDurationMs() > 1000) {
@@ -2233,15 +2085,15 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             float txBytesToMb = txBytesFv / 125000F;
 
             if (LOG.isDebugEnabled())
-                LOG.debug("rxBytesToMb {} txBytesToMb {} ", rxBytesToMb, txBytesToMb);
+                LOG.info("rxBytesToMb {} txBytesToMb {} ", rxBytesToMb, txBytesToMb);
 
             metricDetails.setRxMbps(rxBytesToMb / durationSec);
             metricDetails.setTxMbps(txBytesToMb / durationSec);
             if (LOG.isDebugEnabled())
-                LOG.debug("RxMbps {} TxMbps {} ", metricDetails.getRxMbps(), metricDetails.getTxMbps());
+                LOG.info("RxMbps {} TxMbps {} ", metricDetails.getRxMbps(), metricDetails.getTxMbps());
 
         } else {
-            LOG.warn("Cannot calculate tx/rx throughput for Client {} based on duration of {} Ms",
+            LOG.info("Cannot calculate tx/rx throughput for Client {} based on duration of {} Ms",
                     client.getMacAddress(), client.getDurationMs());
         }
         metricDetails.setLastMetricTimestamp(timestamp);
@@ -2262,7 +2114,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
         for (ClientReport clientReport : report.getClientsList()) {
 
-            LOG.debug("ClientReport for channel {} RadioBand {}", clientReport.getChannel(), clientReport.getBand());
+            LOG.info("ClientReport for channel {} RadioBand {}", clientReport.getChannel(), clientReport.getBand());
 
             if (smr.getCreatedTimestamp() < clientReport.getTimestampMs()) {
                 smr.setCreatedTimestamp(clientReport.getTimestampMs());
@@ -2305,7 +2157,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                     }
                 }
             }
-            LOG.debug("Client Report Date is {}", new Date(clientReport.getTimestampMs()));
+            LOG.info("Client Report Date is {}", new Date(clientReport.getTimestampMs()));
             int numConnectedClients = 0;
             for (Client client : clientReport.getClientListList()) {
                 if (client.hasStats()) {
@@ -2385,7 +2237,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
                         }
 
                     } catch (Exception e) {
-                        LOG.error("Unabled to update client {}", client, e);
+                        LOG.info("Unabled to update client {} session {}", client, e);
                     }
 
                 }
@@ -2415,7 +2267,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
         }
 
-        LOG.debug("ApSsidMetrics {}", apSsidMetrics);
+        LOG.info("ApSsidMetrics {}", apSsidMetrics);
 
     }
 
@@ -2461,18 +2313,8 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
 
         ProfileContainer profileContainer = new ProfileContainer(
                 profileServiceInterface.getProfileWithChildren(profileId));
-        
-        Profile rfProfile = profileContainer.getChildOfTypeOrNull(profileId, ProfileType.rf);
-        RfConfiguration rfConfig = null;
-        if (rfProfile != null) {
-         rfConfig = (RfConfiguration) profileContainer.getChildOfTypeOrNull(profileId, ProfileType.rf)
+        RfConfiguration 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()) {
 
@@ -2532,7 +2374,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
             smr.setCreatedTimestamp(survey.getTimestampMs());
             metricRecordList.add(smr);
 
-            LOG.debug("ChannelInfoReports {}", channelInfoReports);
+            LOG.info("ChannelInfoReports {}", channelInfoReports);
 
         }
 

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

@@ -88,6 +88,7 @@ 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;
 
@@ -161,6 +162,20 @@ 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,7 +7,6 @@ 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;
@@ -40,8 +39,6 @@ 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;
@@ -55,21 +52,18 @@ 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", })
@@ -170,20 +164,6 @@ 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())
@@ -259,55 +239,6 @@ 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 {
 
@@ -366,74 +297,6 @@ 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() {
 
@@ -479,14 +342,7 @@ 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": 12,
+  "profileId": 5,
   "locationId": 8,
   "equipmentType": "AP",
   "inventoryId": "Test_Client_21P10C68818122",

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

@@ -1,9 +1,9 @@
 {
 	"model_type": "Profile",
-    "id": 12,
+	"id": 23,
 	"customerId": 2,
 	"profileType": "equipment_ap",
-    "name": "ApProfile-3-radios",
+	"name": "ApProfile-3-radios-passpoint",
 	"details": {
 		"model_type": "ApNetworkConfiguration",
 		"networkConfigVersion": "AP-1",
@@ -44,13 +44,12 @@
 		},
 		"profileType": "equipment_ap"
 	},
-    "createdTimestamp": 1606778369934,
-    "lastModifiedTimestamp": 1606778443413,
+	"createdTimestamp": 1605711197140,
+	"lastModifiedTimestamp": 1605711197140,
 	"childProfileIds": [
 		16,
-        5,
-        10,
-        11,
+		21,
+		22,
 		15
 	]
 }

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

@@ -4,13 +4,11 @@
         "id": 24,
         "customerId": 2,
         "profileType": "passpoint",
-		"name": "TipWlan-Passpoint-Config",
+        "name": "TipWlan-Hotspot20-Config",
         "details": {
             "model_type": "PasspointProfile",
             "enableInterworkingAndHs20": true,
             "hessid": null,
-			"passpointAccessNetworkType": "free_public_network",
-			"passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions",
             "additionalStepsRequiredForAccess": 0,
             "deauthRequestTimeout": 0,
             "operatingClass": 0,
@@ -31,8 +29,8 @@
                 {
                     "model_type": "PasspointConnectionCapability",
                     "connectionCapabilitiesPortNumber": 8888,
-					"connectionCapabilitiesStatus": "open",
-					"connectionCapabilitiesIpProtocol": "TCP"
+                    "connectionCapabilitiesIpProtocol": "TCP",
+                    "connectionCapabilitiesStatus": "open"
                 }
             ],
             "ipAddressTypeAvailability": "public_IPv4_address_available",
@@ -45,22 +43,25 @@
             "disableDownstreamGroupAddressedForwarding": false,
             "enable2pt4GHz": true,
             "enable5GHz": true,
-			"associatedAccessSsidProfileIds": [
-				15
+            "associatedAccessSsidNames": [
+                "TipWlan-cloud-hotspot-access"
             ],
-			"osuSsidProfileId": 16,
-			"passpointOperatorProfileId": 17,
-			"passpointVenueProfileId": 18,
-			"passpointOsuProviderProfileIds": [
-				19,
-				20
+            "osuSsidName": "TipWlan-cloud-hotspot-osu",
+            "operatorProfileName": "TipWlan-Hotspot20-Operator",
+            "venueProfileName": "TipWlan-Hotspot20-Venue",
+            "idProviderProfileNames": [
+                "TipWlan-Hotspot20-OSU-Provider-2",
+                "TipWlan-Hotspot20-OSU-Provider"
             ],
             "accessNetworkType": "free_public_network",
             "networkAuthenticationType": "acceptance_of_terms_and_conditions",
+            "associatedSsids": [
+                "TipWlan-cloud-hotspot-access"
+            ],
             "profileType": "passpoint"
         },
-		"createdTimestamp": 1606778370807,
-		"lastModifiedTimestamp": 1606778370807,
+        "createdTimestamp": 1605711223339,
+        "lastModifiedTimestamp": 1605711223339,
         "childProfileIds": [
             17,
             18,

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 {
 	"model_type": "Profile",
-    "id": 11,
+	"id": 21,
 	"customerId": 2,
 	"profileType": "rf",
-    "name": "TipWlan-rf",
+	"name": "TipWlan-rf-passpoint",
 	"details": {
 		"model_type": "RfConfiguration",
 		"rfConfigMap": {
@@ -11,7 +11,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHz",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -58,7 +58,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is2dot4GHz",
 				"radioMode": "modeN",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -105,7 +105,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHzU",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -152,7 +152,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHzL",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -198,7 +198,8 @@
 		},
 		"profileType": "rf"
 	},
-    "createdTimestamp": 1606778369933,
-    "lastModifiedTimestamp": 1606778369933,
-    "childProfileIds": []
+	"createdTimestamp": 1605711191976,
+	"lastModifiedTimestamp": 1605711191976,
+	"childProfileIds": [
+	]
 }

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

@@ -1,80 +1,13 @@
 [
-	{
-		"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-passpoint-access",
+		"name": "TipWlan-cloud-hotspot-access",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-passpoint-access",
+			"ssid": "TipWlan-cloud-hotspot-access",
 			"appliedRadios": [
 				"is5GHzL",
 				"is5GHzU"
@@ -88,7 +21,6 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
-			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -96,7 +28,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHzL": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -108,13 +40,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHz": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -127,8 +59,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1606778369943,
-		"lastModifiedTimestamp": 1606778370811,
+		"createdTimestamp": 1605711164949,
+		"lastModifiedTimestamp": 1605711223372,
 		"childProfileIds": [
 			24
 		]
@@ -138,10 +70,10 @@
 		"id": 16,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-passpoint-osu",
+		"name": "TipWlan-cloud-hotspot-osu",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-passpoint-osu",
+			"ssid": "TipWlan-cloud-hotspot-osu",
 			"appliedRadios": [
 				"is2dot4GHz"
 			],
@@ -154,7 +86,6 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
-			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -162,7 +93,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHzL": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -174,13 +105,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHz": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -193,8 +124,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1606778369944,
-		"lastModifiedTimestamp": 1606778370352,
+		"createdTimestamp": 1605711164950,
+		"lastModifiedTimestamp": 1605711171732,
 		"childProfileIds": [
 			19,
 			20

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

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

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

@@ -7,7 +7,6 @@
         <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": 12,
+  "profileId": 5,
   "locationId": 8,
   "equipmentType": "AP",
   "inventoryId": "Test_Client_21P10C68818122",

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

@@ -1,9 +1,9 @@
 {
 	"model_type": "Profile",
-    "id": 12,
+	"id": 23,
 	"customerId": 2,
 	"profileType": "equipment_ap",
-    "name": "ApProfile-3-radios",
+	"name": "ApProfile-3-radios-passpoint",
 	"details": {
 		"model_type": "ApNetworkConfiguration",
 		"networkConfigVersion": "AP-1",
@@ -44,13 +44,12 @@
 		},
 		"profileType": "equipment_ap"
 	},
-    "createdTimestamp": 1606778369934,
-    "lastModifiedTimestamp": 1606778443413,
+	"createdTimestamp": 1605711197140,
+	"lastModifiedTimestamp": 1605711197140,
 	"childProfileIds": [
 		16,
-        5,
-        10,
-        11,
+		21,
+		22,
 		15
 	]
 }

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

@@ -4,13 +4,11 @@
         "id": 24,
         "customerId": 2,
         "profileType": "passpoint",
-		"name": "TipWlan-Passpoint-Config",
+        "name": "TipWlan-Hotspot20-Config",
         "details": {
             "model_type": "PasspointProfile",
             "enableInterworkingAndHs20": true,
             "hessid": null,
-			"passpointAccessNetworkType": "free_public_network",
-			"passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions",
             "additionalStepsRequiredForAccess": 0,
             "deauthRequestTimeout": 0,
             "operatingClass": 0,
@@ -31,8 +29,8 @@
                 {
                     "model_type": "PasspointConnectionCapability",
                     "connectionCapabilitiesPortNumber": 8888,
-					"connectionCapabilitiesStatus": "open",
-					"connectionCapabilitiesIpProtocol": "TCP"
+                    "connectionCapabilitiesIpProtocol": "TCP",
+                    "connectionCapabilitiesStatus": "open"
                 }
             ],
             "ipAddressTypeAvailability": "public_IPv4_address_available",
@@ -45,22 +43,25 @@
             "disableDownstreamGroupAddressedForwarding": false,
             "enable2pt4GHz": true,
             "enable5GHz": true,
-			"associatedAccessSsidProfileIds": [
-				15
+            "associatedAccessSsidNames": [
+                "TipWlan-cloud-hotspot-access"
             ],
-			"osuSsidProfileId": 16,
-			"passpointOperatorProfileId": 17,
-			"passpointVenueProfileId": 18,
-			"passpointOsuProviderProfileIds": [
-				19,
-				20
+            "osuSsidName": "TipWlan-cloud-hotspot-osu",
+            "operatorProfileName": "TipWlan-Hotspot20-Operator",
+            "venueProfileName": "TipWlan-Hotspot20-Venue",
+            "idProviderProfileNames": [
+                "TipWlan-Hotspot20-OSU-Provider-2",
+                "TipWlan-Hotspot20-OSU-Provider"
             ],
             "accessNetworkType": "free_public_network",
             "networkAuthenticationType": "acceptance_of_terms_and_conditions",
+            "associatedSsids": [
+                "TipWlan-cloud-hotspot-access"
+            ],
             "profileType": "passpoint"
         },
-		"createdTimestamp": 1606778370807,
-		"lastModifiedTimestamp": 1606778370807,
+        "createdTimestamp": 1605711223339,
+        "lastModifiedTimestamp": 1605711223339,
         "childProfileIds": [
             17,
             18,

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

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

@@ -1,10 +1,10 @@
 [
 	{
 		"model_type": "Profile",
-		"id": 10,
+		"id": 22,
 		"customerId": 2,
 		"profileType": "service_metrics_collection_config",
-		"name": "Metrics-Profile-3-Radios",
+		"name": "Metrics-Profile-Passpoint",
 		"details": {
 			"model_type": "ServiceMetricsCollectionConfigProfile",
 			"radioTypes": [
@@ -21,6 +21,30 @@
 			],
 			"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,
@@ -45,42 +69,6 @@
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_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,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -92,16 +80,21 @@
 						"radioType": "is5GHzL",
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
 					}
 				],
 				"ApSsid": [
-					{
-						"model_type": "ServiceMetricRadioConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApSsid"
-					},
 					{
 						"model_type": "ServiceMetricRadioConfigParameters",
 						"samplingInterval": 30,
@@ -115,6 +108,13 @@
 						"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": 120,
-						"channelSurveyType": "OFF_CHANNEL",
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -168,12 +168,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_CHANNEL",
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -192,29 +192,41 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"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,
@@ -239,6 +251,18 @@
 						"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,
@@ -262,37 +286,13 @@
 						"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": 1606778369931,
-		"lastModifiedTimestamp": 1606778369931,
+		"createdTimestamp": 1605711195528,
+		"lastModifiedTimestamp": 1605711195528,
 		"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-Passpoint-Operator",
+		"name": "TipWlan-Hotspot20-Operator",
 		"details": {
 			"model_type": "PasspointOperatorProfile",
 			"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -29,8 +29,8 @@
 			],
 			"profileType": "passpoint_operator"
 		},
-		"createdTimestamp": 1606778369945,
-		"lastModifiedTimestamp": 1606778369945,
+		"createdTimestamp": 1605711164952,
+		"lastModifiedTimestamp": 1605711164952,
 		"childProfileIds": [
 		]
 	}

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

@@ -1,9 +1,9 @@
 {
 	"model_type": "Profile",
-    "id": 11,
+	"id": 21,
 	"customerId": 2,
 	"profileType": "rf",
-    "name": "TipWlan-rf",
+	"name": "TipWlan-rf-passpoint",
 	"details": {
 		"model_type": "RfConfiguration",
 		"rfConfigMap": {
@@ -11,7 +11,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHz",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -58,7 +58,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is2dot4GHz",
 				"radioMode": "modeN",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -105,7 +105,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHzU",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -152,7 +152,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHzL",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -198,7 +198,8 @@
 		},
 		"profileType": "rf"
 	},
-    "createdTimestamp": 1606778369933,
-    "lastModifiedTimestamp": 1606778369933,
-    "childProfileIds": []
+	"createdTimestamp": 1605711191976,
+	"lastModifiedTimestamp": 1605711191976,
+	"childProfileIds": [
+	]
 }

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

@@ -1,80 +1,13 @@
 [
-	{
-		"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-passpoint-access",
+		"name": "TipWlan-cloud-hotspot-access",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-passpoint-access",
+			"ssid": "TipWlan-cloud-hotspot-access",
 			"appliedRadios": [
 				"is5GHzL",
 				"is5GHzU"
@@ -88,7 +21,6 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
-			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -96,7 +28,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHzL": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -108,13 +40,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHz": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -127,8 +59,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1606778369943,
-		"lastModifiedTimestamp": 1606778370811,
+		"createdTimestamp": 1605711164949,
+		"lastModifiedTimestamp": 1605711223372,
 		"childProfileIds": [
 			24
 		]
@@ -138,10 +70,10 @@
 		"id": 16,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-passpoint-osu",
+		"name": "TipWlan-cloud-hotspot-osu",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-passpoint-osu",
+			"ssid": "TipWlan-cloud-hotspot-osu",
 			"appliedRadios": [
 				"is2dot4GHz"
 			],
@@ -154,7 +86,6 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
-			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -162,7 +93,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHzL": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -174,13 +105,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHz": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -193,8 +124,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1606778369944,
-		"lastModifiedTimestamp": 1606778370352,
+		"createdTimestamp": 1605711164950,
+		"lastModifiedTimestamp": 1605711171732,
 		"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-Passpoint-Venue",
+		"name": "TipWlan-Hotspot20-Venue",
 		"details": {
 			"model_type": "PasspointVenueProfile",
 			"venueNameSet": [
@@ -28,15 +28,15 @@
 				}
 			],
 			"venueTypeAssignment": {
-				"model_type": "PasspointVenueTypeAssignment",
+				"model_type": "ProfileVenueTypeAssignment",
 				"venueDescription": "Research and Development Facility",
 				"venueGroupId": 2,
 				"venueTypeId": 8
 			},
 			"profileType": "passpoint_venue"
 		},
-		"createdTimestamp": 1606778369950,
-		"lastModifiedTimestamp": 1606778369950,
+		"createdTimestamp": 1605711164956,
+		"lastModifiedTimestamp": 1605711164956,
 		"childProfileIds": [
 		]
 	}

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

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

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

@@ -1,9 +1,9 @@
 {
 	"model_type": "Profile",
-    "id": 12,
+	"id": 23,
 	"customerId": 2,
 	"profileType": "equipment_ap",
-    "name": "ApProfile-3-radios",
+	"name": "ApProfile-3-radios-passpoint",
 	"details": {
 		"model_type": "ApNetworkConfiguration",
 		"networkConfigVersion": "AP-1",
@@ -44,13 +44,12 @@
 		},
 		"profileType": "equipment_ap"
 	},
-    "createdTimestamp": 1606778369934,
-    "lastModifiedTimestamp": 1606778443413,
+	"createdTimestamp": 1605711197140,
+	"lastModifiedTimestamp": 1605711197140,
 	"childProfileIds": [
 		16,
-        5,
-        10,
-        11,
+		21,
+		22,
 		15
 	]
 }

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

@@ -4,13 +4,11 @@
         "id": 24,
         "customerId": 2,
         "profileType": "passpoint",
-		"name": "TipWlan-Passpoint-Config",
+        "name": "TipWlan-Hotspot20-Config",
         "details": {
             "model_type": "PasspointProfile",
             "enableInterworkingAndHs20": true,
             "hessid": null,
-			"passpointAccessNetworkType": "free_public_network",
-			"passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions",
             "additionalStepsRequiredForAccess": 0,
             "deauthRequestTimeout": 0,
             "operatingClass": 0,
@@ -31,8 +29,8 @@
                 {
                     "model_type": "PasspointConnectionCapability",
                     "connectionCapabilitiesPortNumber": 8888,
-					"connectionCapabilitiesStatus": "open",
-					"connectionCapabilitiesIpProtocol": "TCP"
+                    "connectionCapabilitiesIpProtocol": "TCP",
+                    "connectionCapabilitiesStatus": "open"
                 }
             ],
             "ipAddressTypeAvailability": "public_IPv4_address_available",
@@ -45,22 +43,25 @@
             "disableDownstreamGroupAddressedForwarding": false,
             "enable2pt4GHz": true,
             "enable5GHz": true,
-			"associatedAccessSsidProfileIds": [
-				15
+            "associatedAccessSsidNames": [
+                "TipWlan-cloud-hotspot-access"
             ],
-			"osuSsidProfileId": 16,
-			"passpointOperatorProfileId": 17,
-			"passpointVenueProfileId": 18,
-			"passpointOsuProviderProfileIds": [
-				19,
-				20
+            "osuSsidName": "TipWlan-cloud-hotspot-osu",
+            "operatorProfileName": "TipWlan-Hotspot20-Operator",
+            "venueProfileName": "TipWlan-Hotspot20-Venue",
+            "idProviderProfileNames": [
+                "TipWlan-Hotspot20-OSU-Provider-2",
+                "TipWlan-Hotspot20-OSU-Provider"
             ],
             "accessNetworkType": "free_public_network",
             "networkAuthenticationType": "acceptance_of_terms_and_conditions",
+            "associatedSsids": [
+                "TipWlan-cloud-hotspot-access"
+            ],
             "profileType": "passpoint"
         },
-		"createdTimestamp": 1606778370807,
-		"lastModifiedTimestamp": 1606778370807,
+        "createdTimestamp": 1605711223339,
+        "lastModifiedTimestamp": 1605711223339,
         "childProfileIds": [
             17,
             18,

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

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

@@ -1,10 +1,10 @@
 [
 	{
 		"model_type": "Profile",
-		"id": 10,
+		"id": 22,
 		"customerId": 2,
 		"profileType": "service_metrics_collection_config",
-		"name": "Metrics-Profile-3-Radios",
+		"name": "Metrics-Profile-Passpoint",
 		"details": {
 			"model_type": "ServiceMetricsCollectionConfigProfile",
 			"radioTypes": [
@@ -21,6 +21,30 @@
 			],
 			"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,
@@ -45,42 +69,6 @@
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_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,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -92,16 +80,21 @@
 						"radioType": "is5GHzL",
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
 					}
 				],
 				"ApSsid": [
-					{
-						"model_type": "ServiceMetricRadioConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApSsid"
-					},
 					{
 						"model_type": "ServiceMetricRadioConfigParameters",
 						"samplingInterval": 30,
@@ -115,6 +108,13 @@
 						"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": 120,
-						"channelSurveyType": "OFF_CHANNEL",
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -168,12 +168,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_CHANNEL",
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -192,29 +192,41 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"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,
@@ -239,6 +251,18 @@
 						"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,
@@ -262,37 +286,13 @@
 						"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": 1606778369931,
-		"lastModifiedTimestamp": 1606778369931,
+		"createdTimestamp": 1605711195528,
+		"lastModifiedTimestamp": 1605711195528,
 		"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-Passpoint-Operator",
+		"name": "TipWlan-Hotspot20-Operator",
 		"details": {
 			"model_type": "PasspointOperatorProfile",
 			"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -29,8 +29,8 @@
 			],
 			"profileType": "passpoint_operator"
 		},
-		"createdTimestamp": 1606778369945,
-		"lastModifiedTimestamp": 1606778369945,
+		"createdTimestamp": 1605711164952,
+		"lastModifiedTimestamp": 1605711164952,
 		"childProfileIds": [
 		]
 	}

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

@@ -1,9 +1,9 @@
 {
 	"model_type": "Profile",
-    "id": 11,
+	"id": 21,
 	"customerId": 2,
 	"profileType": "rf",
-    "name": "TipWlan-rf",
+	"name": "TipWlan-rf-passpoint",
 	"details": {
 		"model_type": "RfConfiguration",
 		"rfConfigMap": {
@@ -11,7 +11,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHz",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -58,7 +58,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is2dot4GHz",
 				"radioMode": "modeN",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -105,7 +105,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHzU",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -152,7 +152,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHzL",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -198,7 +198,8 @@
 		},
 		"profileType": "rf"
 	},
-    "createdTimestamp": 1606778369933,
-    "lastModifiedTimestamp": 1606778369933,
-    "childProfileIds": []
+	"createdTimestamp": 1605711191976,
+	"lastModifiedTimestamp": 1605711191976,
+	"childProfileIds": [
+	]
 }

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

@@ -1,80 +1,13 @@
 [
-	{
-		"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-passpoint-access",
+		"name": "TipWlan-cloud-hotspot-access",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-passpoint-access",
+			"ssid": "TipWlan-cloud-hotspot-access",
 			"appliedRadios": [
 				"is5GHzL",
 				"is5GHzU"
@@ -88,7 +21,6 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
-			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -96,7 +28,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHzL": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -108,13 +40,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHz": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -127,8 +59,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1606778369943,
-		"lastModifiedTimestamp": 1606778370811,
+		"createdTimestamp": 1605711164949,
+		"lastModifiedTimestamp": 1605711223372,
 		"childProfileIds": [
 			24
 		]
@@ -138,10 +70,10 @@
 		"id": 16,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-passpoint-osu",
+		"name": "TipWlan-cloud-hotspot-osu",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-passpoint-osu",
+			"ssid": "TipWlan-cloud-hotspot-osu",
 			"appliedRadios": [
 				"is2dot4GHz"
 			],
@@ -154,7 +86,6 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
-			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -162,7 +93,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHzL": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -174,13 +105,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHz": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -193,8 +124,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1606778369944,
-		"lastModifiedTimestamp": 1606778370352,
+		"createdTimestamp": 1605711164950,
+		"lastModifiedTimestamp": 1605711171732,
 		"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-Passpoint-Venue",
+		"name": "TipWlan-Hotspot20-Venue",
 		"details": {
 			"model_type": "PasspointVenueProfile",
 			"venueNameSet": [
@@ -28,15 +28,15 @@
 				}
 			],
 			"venueTypeAssignment": {
-				"model_type": "PasspointVenueTypeAssignment",
+				"model_type": "ProfileVenueTypeAssignment",
 				"venueDescription": "Research and Development Facility",
 				"venueGroupId": 2,
 				"venueTypeId": 8
 			},
 			"profileType": "passpoint_venue"
 		},
-		"createdTimestamp": 1606778369950,
-		"lastModifiedTimestamp": 1606778369950,
+		"createdTimestamp": 1605711164956,
+		"lastModifiedTimestamp": 1605711164956,
 		"childProfileIds": [
 		]
 	}

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

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

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

@@ -1,9 +1,9 @@
 {
 	"model_type": "Profile",
-    "id": 12,
+	"id": 23,
 	"customerId": 2,
 	"profileType": "equipment_ap",
-    "name": "ApProfile-3-radios",
+	"name": "ApProfile-3-radios-passpoint",
 	"details": {
 		"model_type": "ApNetworkConfiguration",
 		"networkConfigVersion": "AP-1",
@@ -44,13 +44,12 @@
 		},
 		"profileType": "equipment_ap"
 	},
-    "createdTimestamp": 1606778369934,
-    "lastModifiedTimestamp": 1606778443413,
+	"createdTimestamp": 1605711197140,
+	"lastModifiedTimestamp": 1605711197140,
 	"childProfileIds": [
 		16,
-        5,
-        10,
-        11,
+		21,
+		22,
 		15
 	]
 }

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

@@ -4,13 +4,11 @@
         "id": 24,
         "customerId": 2,
         "profileType": "passpoint",
-		"name": "TipWlan-Passpoint-Config",
+        "name": "TipWlan-Hotspot20-Config",
         "details": {
             "model_type": "PasspointProfile",
             "enableInterworkingAndHs20": true,
             "hessid": null,
-			"passpointAccessNetworkType": "free_public_network",
-			"passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions",
             "additionalStepsRequiredForAccess": 0,
             "deauthRequestTimeout": 0,
             "operatingClass": 0,
@@ -31,8 +29,8 @@
                 {
                     "model_type": "PasspointConnectionCapability",
                     "connectionCapabilitiesPortNumber": 8888,
-					"connectionCapabilitiesStatus": "open",
-					"connectionCapabilitiesIpProtocol": "TCP"
+                    "connectionCapabilitiesIpProtocol": "TCP",
+                    "connectionCapabilitiesStatus": "open"
                 }
             ],
             "ipAddressTypeAvailability": "public_IPv4_address_available",
@@ -45,22 +43,25 @@
             "disableDownstreamGroupAddressedForwarding": false,
             "enable2pt4GHz": true,
             "enable5GHz": true,
-			"associatedAccessSsidProfileIds": [
-				15
+            "associatedAccessSsidNames": [
+                "TipWlan-cloud-hotspot-access"
             ],
-			"osuSsidProfileId": 16,
-			"passpointOperatorProfileId": 17,
-			"passpointVenueProfileId": 18,
-			"passpointOsuProviderProfileIds": [
-				19,
-				20
+            "osuSsidName": "TipWlan-cloud-hotspot-osu",
+            "operatorProfileName": "TipWlan-Hotspot20-Operator",
+            "venueProfileName": "TipWlan-Hotspot20-Venue",
+            "idProviderProfileNames": [
+                "TipWlan-Hotspot20-OSU-Provider-2",
+                "TipWlan-Hotspot20-OSU-Provider"
             ],
             "accessNetworkType": "free_public_network",
             "networkAuthenticationType": "acceptance_of_terms_and_conditions",
+            "associatedSsids": [
+                "TipWlan-cloud-hotspot-access"
+            ],
             "profileType": "passpoint"
         },
-		"createdTimestamp": 1606778370807,
-		"lastModifiedTimestamp": 1606778370807,
+        "createdTimestamp": 1605711223339,
+        "lastModifiedTimestamp": 1605711223339,
         "childProfileIds": [
             17,
             18,

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

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

@@ -1,10 +1,10 @@
 [
 	{
 		"model_type": "Profile",
-		"id": 10,
+		"id": 22,
 		"customerId": 2,
 		"profileType": "service_metrics_collection_config",
-		"name": "Metrics-Profile-3-Radios",
+		"name": "Metrics-Profile-Passpoint",
 		"details": {
 			"model_type": "ServiceMetricsCollectionConfigProfile",
 			"radioTypes": [
@@ -21,6 +21,30 @@
 			],
 			"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,
@@ -45,42 +69,6 @@
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
 					},
-					{
-						"model_type": "ServiceMetricSurveyConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_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,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
-						"scanIntervalMillis": 0,
-						"percentUtilizationThreshold": 10,
-						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
-						"serviceMetricDataType": "ApNode",
-						"statsReportFormat": "RAW"
-					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
@@ -92,16 +80,21 @@
 						"radioType": "is5GHzL",
 						"serviceMetricDataType": "ApNode",
 						"statsReportFormat": "RAW"
+					},
+					{
+						"model_type": "ServiceMetricSurveyConfigParameters",
+						"samplingInterval": 30,
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
+						"scanIntervalMillis": 0,
+						"percentUtilizationThreshold": 10,
+						"delayMillisecondsThreshold": 600,
+						"radioType": "is2dot4GHz",
+						"serviceMetricDataType": "ApNode",
+						"statsReportFormat": "RAW"
 					}
 				],
 				"ApSsid": [
-					{
-						"model_type": "ServiceMetricRadioConfigParameters",
-						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"radioType": "is5GHzU",
-						"serviceMetricDataType": "ApSsid"
-					},
 					{
 						"model_type": "ServiceMetricRadioConfigParameters",
 						"samplingInterval": 30,
@@ -115,6 +108,13 @@
 						"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": 120,
-						"channelSurveyType": "OFF_CHANNEL",
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -168,12 +168,12 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 120,
-						"channelSurveyType": "OFF_CHANNEL",
+						"reportingIntervalSeconds": 60,
+						"channelSurveyType": "ON_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
@@ -192,29 +192,41 @@
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is2dot4GHz",
+						"radioType": "is5GHzL",
 						"serviceMetricDataType": "Channel",
 						"statsReportFormat": "RAW"
 					},
 					{
 						"model_type": "ServiceMetricSurveyConfigParameters",
 						"samplingInterval": 30,
-						"reportingIntervalSeconds": 60,
-						"channelSurveyType": "ON_CHANNEL",
+						"reportingIntervalSeconds": 120,
+						"channelSurveyType": "OFF_CHANNEL",
 						"scanIntervalMillis": 0,
 						"percentUtilizationThreshold": 10,
 						"delayMillisecondsThreshold": 600,
-						"radioType": "is5GHzL",
+						"radioType": "is2dot4GHz",
 						"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,
@@ -239,6 +251,18 @@
 						"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,
@@ -262,37 +286,13 @@
 						"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": 1606778369931,
-		"lastModifiedTimestamp": 1606778369931,
+		"createdTimestamp": 1605711195528,
+		"lastModifiedTimestamp": 1605711195528,
 		"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-Passpoint-Operator",
+		"name": "TipWlan-Hotspot20-Operator",
 		"details": {
 			"model_type": "PasspointOperatorProfile",
 			"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -29,8 +29,8 @@
 			],
 			"profileType": "passpoint_operator"
 		},
-		"createdTimestamp": 1606778369945,
-		"lastModifiedTimestamp": 1606778369945,
+		"createdTimestamp": 1605711164952,
+		"lastModifiedTimestamp": 1605711164952,
 		"childProfileIds": [
 		]
 	}

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

@@ -1,9 +1,9 @@
 {
 	"model_type": "Profile",
-    "id": 11,
+	"id": 21,
 	"customerId": 2,
 	"profileType": "rf",
-    "name": "TipWlan-rf",
+	"name": "TipWlan-rf-passpoint",
 	"details": {
 		"model_type": "RfConfiguration",
 		"rfConfigMap": {
@@ -11,7 +11,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHz",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -58,7 +58,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is2dot4GHz",
 				"radioMode": "modeN",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -105,7 +105,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHzU",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -152,7 +152,7 @@
 				"model_type": "RfElementConfiguration",
 				"radioType": "is5GHzL",
 				"radioMode": "modeAC",
-                "rf": "TipWlan-rf",
+				"rf": "TipWlan-rf-passpoint",
 				"beaconInterval": 100,
 				"forceScanDuringVoice": "disabled",
 				"rtsCtsThreshold": 65535,
@@ -198,7 +198,8 @@
 		},
 		"profileType": "rf"
 	},
-    "createdTimestamp": 1606778369933,
-    "lastModifiedTimestamp": 1606778369933,
-    "childProfileIds": []
+	"createdTimestamp": 1605711191976,
+	"lastModifiedTimestamp": 1605711191976,
+	"childProfileIds": [
+	]
 }

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

@@ -1,80 +1,13 @@
 [
-	{
-		"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-passpoint-access",
+		"name": "TipWlan-cloud-hotspot-access",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-passpoint-access",
+			"ssid": "TipWlan-cloud-hotspot-access",
 			"appliedRadios": [
 				"is5GHzL",
 				"is5GHzU"
@@ -88,7 +21,6 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
-			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -96,7 +28,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHzL": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -108,13 +40,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHz": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -127,8 +59,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1606778369943,
-		"lastModifiedTimestamp": 1606778370811,
+		"createdTimestamp": 1605711164949,
+		"lastModifiedTimestamp": 1605711223372,
 		"childProfileIds": [
 			24
 		]
@@ -138,10 +70,10 @@
 		"id": 16,
 		"customerId": 2,
 		"profileType": "ssid",
-		"name": "TipWlan-cloud-passpoint-osu",
+		"name": "TipWlan-cloud-hotspot-osu",
 		"details": {
 			"model_type": "SsidConfiguration",
-			"ssid": "TipWlan-cloud-passpoint-osu",
+			"ssid": "TipWlan-cloud-hotspot-osu",
 			"appliedRadios": [
 				"is2dot4GHz"
 			],
@@ -154,7 +86,6 @@
 			"noLocalSubnets": false,
 			"radiusServiceName": null,
 			"radiusAccountingServiceName": null,
-			"radiusAcountingServiceInterval": null,
 			"captivePortalId": null,
 			"bandwidthLimitDown": 0,
 			"bandwidthLimitUp": 0,
@@ -162,7 +93,7 @@
 			"clientBandwidthLimitUp": 0,
 			"videoTrafficOnly": false,
 			"radioBasedConfigs": {
-				"is5GHzL": {
+				"is5GHz": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -174,13 +105,13 @@
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHz": {
+				"is5GHzU": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
 					"enable80211v": null
 				},
-				"is5GHzU": {
+				"is5GHzL": {
 					"model_type": "RadioBasedSsidConfiguration",
 					"enable80211r": null,
 					"enable80211k": null,
@@ -193,8 +124,8 @@
 			"forwardMode": null,
 			"profileType": "ssid"
 		},
-		"createdTimestamp": 1606778369944,
-		"lastModifiedTimestamp": 1606778370352,
+		"createdTimestamp": 1605711164950,
+		"lastModifiedTimestamp": 1605711171732,
 		"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-Passpoint-Venue",
+		"name": "TipWlan-Hotspot20-Venue",
 		"details": {
 			"model_type": "PasspointVenueProfile",
 			"venueNameSet": [
@@ -28,15 +28,15 @@
 				}
 			],
 			"venueTypeAssignment": {
-				"model_type": "PasspointVenueTypeAssignment",
+				"model_type": "ProfileVenueTypeAssignment",
 				"venueDescription": "Research and Development Facility",
 				"venueGroupId": 2,
 				"venueTypeId": 8
 			},
 			"profileType": "passpoint_venue"
 		},
-		"createdTimestamp": 1606778369950,
-		"lastModifiedTimestamp": 1606778369950,
+		"createdTimestamp": 1605711164956,
+		"lastModifiedTimestamp": 1605711164956,
 		"childProfileIds": [
 		]
 	}

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

@@ -7,7 +7,6 @@
         <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.util.OvsdbStringConstants;
+import com.telecominfraproject.wlan.opensync.ovsdb.dao.utilities.OvsdbStringConstants;
 import com.telecominfraproject.wlan.opensync.util.SslUtil;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
 import com.vmware.ovsdb.callback.ConnectionCallback;
@@ -193,36 +193,40 @@ 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.configureWifiRrm(ovsdbClient, opensyncAPConfig);
+            ovsdbDao.configureInterfaces(ovsdbClient);
             ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
-            ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
-            
             ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
+            ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
             if (opensyncAPConfig.getHotspotConfig() != null) {
                 ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig);
             }
-            
-            ovsdbDao.configureInterfaces(ovsdbClient);
-
             ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig);
+            if (((ApNetworkConfiguration) opensyncAPConfig.getApProfile().getDetails()).getSyntheticClientEnabled()) {
+                ovsdbDao.enableNetworkProbeForSyntheticClient(ovsdbClient);
+            }
+        } else {
+            ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
+            ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
+            ovsdbDao.removeWifiRrm(ovsdbClient);
+            ovsdbDao.removeAllSsids(ovsdbClient); // always
+            ovsdbDao.removeAllGreTunnels(ovsdbClient, null);
+        }
+
         if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
             ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
         }
 
-        } else {
-            LOG.info("No Configuration available for {}", apId);
-        }
         
         LOG.debug("Client connect Done");
         return connectNodeInfo;
@@ -266,25 +270,20 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             LOG.warn("AP with id " + apId + " does not have a config to apply.");
             return;
         }
-        
-        ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
-        ovsdbDao.removeAllSsids(ovsdbClient); // always    
-        ovsdbDao.removeAllInetConfigs(ovsdbClient);       
-        ovsdbDao.removeWifiRrm(ovsdbClient);
         ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
+        ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
+        ovsdbDao.removeWifiRrm(ovsdbClient);
+        ovsdbDao.removeAllSsids(ovsdbClient, opensyncAPConfig); // always
+        ovsdbDao.removeAllGreTunnels(ovsdbClient, opensyncAPConfig);
 
         ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
+        ovsdbDao.configureInterfaces(ovsdbClient);
         ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
-        
         ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
+        ovsdbDao.configureWifiRrm(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);
@@ -374,7 +373,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        try {
                         LOG.info(OvsdbDao.dhcpLeasedIpDbTable + "_" + key + " monitor callback received {}",
                                 tableUpdates);
 
@@ -432,9 +430,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                             extIntegrationInterface.dhcpLeasedIpDbTableUpdate(update, key, RowUpdateOperation.MODIFY);
 
                         }
-                        } catch (Exception e) {
-                            LOG.error("dhcpLeasedIpDbTableUpdate failed", e);
-                        }
 
                     }
 
@@ -453,7 +448,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        try {
                         LOG.info(OvsdbDao.commandStateDbTable + "_" + key + " monitor callback received {}",
                                 tableUpdates);
 
@@ -511,9 +505,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                             extIntegrationInterface.commandStateDbTableUpdate(update, key, RowUpdateOperation.MODIFY);
 
                         }
-                        } catch (Exception e) {
-                            LOG.error("commandStateDbTableUpdate failed", e);
-                        }
 
                     }
 
@@ -531,14 +522,10 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        try {
                         LOG.info(OvsdbDao.awlanNodeDbTable + "_" + key + " monitor callback received {}", tableUpdates);
 
                         extIntegrationInterface.awlanNodeDbTableUpdate(
                                 ovsdbDao.getOpensyncAWLANNode(tableUpdates, key, ovsdbClient), key);
-                        } catch (Exception e) {
-                            LOG.error("awlanNodeDbTableUpdate failed",e);
-                        }
                     }
 
                 });
@@ -556,7 +543,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     @Override
                     public void update(TableUpdates tableUpdates) {
 
-                        try {
                         LOG.info(OvsdbDao.wifiAssociatedClientsDbTable + "_" + key + " monitor callback received {}",
                                 tableUpdates);
 
@@ -582,9 +568,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                         // now address the update/add
                         extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(associatedClients, key);
-                        } catch (Exception e) {
-                           LOG.error("wifiAssociatedClientsDbTableUpdate failed", e);
-                        }
 
                     }
 
@@ -603,7 +586,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        try {
                         LOG.info(OvsdbDao.ovsdbName,
                                 OvsdbDao.wifiInetStateDbTable + "_" + key + " monitor callback received {}",
                                 tableUpdates);
@@ -631,9 +613,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                         // now process updates and mutations
                         extIntegrationInterface.wifiInetStateDbTableUpdate(inetStateInsertOrUpdate, key);
-                        } catch (Exception e) {
-                            LOG.error("wifiInetStateDbTableUpdate failed",e);
-                        }
 
                     }
 
@@ -651,15 +630,11 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        try {
                         LOG.info(OvsdbDao.wifiRadioStateDbTable + "_" + key + " monitor callback received {}",
                                 tableUpdates);
 
                         extIntegrationInterface.wifiRadioStatusDbTableUpdate(
                                 ovsdbDao.getOpensyncAPRadioState(tableUpdates, key, ovsdbClient), key);
-                        } catch (Exception e) {
-                            LOG.error("wifiRadioStatusDbTableUpdate failed",e);
-                        }
                     }
 
                 });
@@ -676,7 +651,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                     @Override
                     public void update(TableUpdates tableUpdates) {
-                        try {
                         LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}",
                                 tableUpdates);
 
@@ -710,9 +684,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                             }
 
                         }
-                        } catch (Exception e) {
-                            LOG.error("wifiVIFStateDbTableUpdate failed", e);
-                        }
 
                     }
 

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

@@ -10,9 +10,6 @@ import com.vmware.ovsdb.protocol.operation.notation.Uuid;
 
 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;
     public boolean enabled;
@@ -26,10 +23,6 @@ public class WifiVifConfigInfo implements Cloneable {
     public boolean uapsdEnable;
     public int vifRadioIdx;
     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;
@@ -38,16 +31,6 @@ public class WifiVifConfigInfo implements Cloneable {
 	public Set<String> macList;
 	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() {
@@ -60,21 +43,6 @@ public class WifiVifConfigInfo implements Cloneable {
             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) {                
             throw new IllegalStateException("Cannot clone ", e);
@@ -83,51 +51,36 @@ public class WifiVifConfigInfo implements Cloneable {
 
     @Override
     public int hashCode() {
-        return Objects.hash(apBridge, bridge, btm, captiveAllowlist, captivePortal, credentialConfigs, customOptions,
-                dynamicBeacon, enabled, ftMobilityDomain, ftPsk, groupRekey, ifName, macList, macListType, mcast2ucast,
-                meshOptions, minHwMode, mode, multiAp, parent, rrm, security, ssid, ssidBroadcast, uapsdEnable, uuid,
-                vifDbgLvl, vifRadioIdx, vlanId, wds, wps, wpsPbc, wpsPbcKeyId);
+        return Objects.hash(apBridge, bridge, btm, enabled, ftMobilityDomain, ftPsk, groupRekey, ifName, macList,
+                macListType, minHwMode, mode, rrm, security, ssid, ssidBroadcast, uapsdEnable, uuid, vifRadioIdx,
+                vlanId);
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
+        }
+        if (!(obj instanceof WifiVifConfigInfo)) {
             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)
-                && 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(minHwMode, other.minHwMode) && Objects.equals(mode, other.mode) && 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) && vifDbgLvl == other.vifDbgLvl && vifRadioIdx == other.vifRadioIdx
-                && vlanId == other.vlanId && wds == other.wds && wps == other.wps && wpsPbc == other.wpsPbc
-                && Objects.equals(wpsPbcKeyId, other.wpsPbcKeyId);
+                && Objects.equals(uuid, other.uuid) && vifRadioIdx == other.vifRadioIdx && vlanId == other.vlanId;
     }
 
     @Override
     public String toString() {
-        return "WifiVifConfigInfo [bridge=" + bridge + ", btm=" + btm + ", enabled=" + enabled + ", ftPsk=" + ftPsk
-                + ", groupRekey=" + groupRekey + ", ifName=" + ifName + ", mode=" + mode + ", rrm=" + rrm + ", ssid="
-                + ssid + ", ssidBroadcast=" + ssidBroadcast + ", uapsdEnable=" + uapsdEnable + ", vifRadioIdx="
-                + 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 + "]";
+        return String.format(
+                "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]",
+                bridge, apBridge, btm, enabled, ftPsk, ftMobilityDomain, groupRekey, ifName, minHwMode, mode, rrm, ssid, ssidBroadcast, uapsdEnable,
+                vifRadioIdx, security, uuid, vlanId, macList, macListType);
     }
     
 }

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

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

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

@@ -1,4 +1,4 @@
-package com.telecominfraproject.wlan.opensync.util;
+package com.telecominfraproject.wlan.opensync.ovsdb.dao.utilities;
 
 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);
+        Mockito.verify(ovsdbDao).removeAllSsids(ovsdbClient, apConfig);
         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,6 +142,48 @@ 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<>();
@@ -297,7 +339,7 @@ public class OvsdbDaoTest {
 
         ovsdbDao.configureHotspots(ovsdbClient, apConfig);
 
-        Mockito.verify(futureResult, Mockito.times(13)).get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS));
+        Mockito.verify(futureResult, Mockito.times(11)).get(Mockito.anyLong(), Mockito.eq(TimeUnit.SECONDS));
 
     }
 

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

@@ -12,6 +12,7 @@ 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;
@@ -40,37 +41,35 @@ import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
 
 public class OvsdbDaoTestUtilities {
 
-    // Static creation of Profiles and Results to use with the OvsdbDao JUnit
-    // tests.
-    static void createPasspointHotspot(int customerId, Profile passpointHotspotConfig, Profile passpointOperatorProfile,
-            Profile passpointVenueProfile, Profile hotspot20IdProviderProfile, Profile hotspot20IdProviderProfile2,
-            Profile profileSsidPsk, Profile profileSsidOsu, Profile hotspotProfileAp) {
+
+    // Static creation of Profiles and Results to use with the OvsdbDao JUnit tests.
+    static void createPasspointHotspot(int customerId, Profile passpointHotspotConfig,
+            Profile passpointOperatorProfile, Profile passpointVenueProfile, Profile hotspot20IdProviderProfile,
+            Profile hotspot20IdProviderProfile2, Profile profileSsidPsk, Profile profileSsidOsu,
+            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,
@@ -88,18 +87,15 @@ public class OvsdbDaoTestUtilities {
         passpointHotspotConfigChildIds.add(hotspot20IdProviderProfile2.getId());
         passpointHotspotConfig.setChildProfileIds(passpointHotspotConfigChildIds);
         passpointHotspotConfig.setDetails(PasspointProfile.createWithDefaults());
-        Set<Long> providerIds = new HashSet<>();
-        providerIds.add(hotspot20IdProviderProfile.getId());
-        providerIds.add(hotspot20IdProviderProfile2.getId());
-        ((PasspointProfile) passpointHotspotConfig.getDetails()).setPasspointOsuProviderProfileIds(providerIds);
+        Set<String> providerNames = new HashSet<>();
+        providerNames.add(hotspot20IdProviderProfile.getName());
+        providerNames.add(hotspot20IdProviderProfile2.getName());
+        ((PasspointProfile) passpointHotspotConfig.getDetails()).setIdProviderProfileNames(providerNames);
         ((PasspointProfile) passpointHotspotConfig.getDetails())
-                .setPasspointOperatorProfileId(passpointOperatorProfile.getId());
-        ((PasspointProfile) passpointHotspotConfig.getDetails())
-                .setPasspointVenueProfileId(passpointVenueProfile.getId());
-        ((PasspointProfile) passpointHotspotConfig.getDetails()).setOsuSsidProfileId(profileSsidOpen.getId());
+                .setOperatorProfileName(passpointOperatorProfile.getName());
+        ((PasspointProfile) passpointHotspotConfig.getDetails()).setVenueProfileName(passpointVenueProfile.getName());
+        ((PasspointProfile) passpointHotspotConfig.getDetails()).setOsuSsidName(profileSsidOpen.getName());
         profileSsidPsk.getChildProfileIds().add(passpointHotspotConfig.getId());
-        ((PasspointProfile) passpointHotspotConfig.getDetails())
-                .setAssociatedAccessSsidProfileIds(List.of(profileSsidPsk.getId()));
         return passpointHotspotConfig;
     }
 
@@ -121,13 +117,14 @@ 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;
     }
@@ -308,8 +305,7 @@ 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(
@@ -326,8 +322,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"), new Atom<>("fra:Exemple de lieu")));
+        columns.put("venue_name", com.vmware.ovsdb.protocol.operation.notation.Set.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",
@@ -412,6 +408,7 @@ public class OvsdbDaoTestUtilities {
         return operationResult;
     }
 
+
     static OperationResult[] hs20IconRows() {
         List<Row> ret = new ArrayList<>();
 
@@ -517,6 +514,7 @@ public class OvsdbDaoTestUtilities {
 
         SelectResult selectResult = new SelectResult(ret);
 
+
         OperationResult[] operationResult = new OperationResult[1];
         operationResult[0].equals(selectResult);
         return operationResult;
@@ -545,4 +543,5 @@ public class OvsdbDaoTestUtilities {
         return profileRadius;
     }
     
+    
 }