Integrate RF survey reportwith cloud backend, OSGW: Support RADIUS and WPA Enterprise pre-work

opensync-ext-cloud/src/main/resources/config_2_ssids.json

@@ -1,27 +0,0 @@
-{
-  "model_type" : "OpensyncAPConfig",
-  "radioConfig" : {
-    "model_type" : "OpensyncAPRadioConfig",
-    "country" : "CA",
-    "radioChannel24G" : 1,
-    "radioChannel5LG" : 44,
-    "radioChannel5HG" : 108
-  },
-  "ssidConfigs" : [ {
-    "model_type" : "OpensyncAPSsidConfig",
-    "radioType" : "is2dot4GHz",
-    "ssid" : "Connectus-cloud",
-    "encryption" : "WPA-PSK",
-    "key" : "12345678",
-    "mode" : "2",
-    "broadcast" : true
-  }, {
-    "model_type" : "OpensyncAPSsidConfig",
-    "radioType" : "is5GHzL",
-    "ssid" : "Connectus-cloud",
-    "encryption" : "WPA-PSK",
-    "key" : "12345678",
-    "mode" : "2",
-    "broadcast" : true    
-  } ]
-}

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

@@ -24,177 +24,186 @@ import com.telecominfraproject.wlan.routing.models.EquipmentRoutingRecord;
 
 public class OpensyncAPConfig extends BaseJsonModel {
 
-    private static final long serialVersionUID = 3917975477206236668L;
+	private static final long serialVersionUID = 3917975477206236668L;
 
-    private Equipment customerEquipment;
+	private Equipment customerEquipment;
-    private Profile apProfile;
+	private Profile apProfile;
-    private List<Profile> ssidProfile;
+	private List<Profile> ssidProfile;
-    private Location equipmentLocation;
+	private List<Profile> radiusProfiles;
-    private EquipmentRoutingRecord equipmentRouting;
+	private Location equipmentLocation;
-    private EquipmentGatewayRecord equipmentGateway;
+	private EquipmentRoutingRecord equipmentRouting;
+	private EquipmentGatewayRecord equipmentGateway;
 
-    // Handle Legacy Config Support
+	// Handle Legacy Config Support
-    public void setRadioConfig(OpensyncAPRadioConfig radioConfig) {
+	public void setRadioConfig(OpensyncAPRadioConfig radioConfig) {
 
-        if (customerEquipment == null) {
+		if (customerEquipment == null) {
-            customerEquipment = new Equipment();
+			customerEquipment = new Equipment();
-            customerEquipment.setId(0);
+			customerEquipment.setId(0);
-            customerEquipment.setEquipmentType(EquipmentType.AP);
+			customerEquipment.setEquipmentType(EquipmentType.AP);
-            customerEquipment.setDetails(ApElementConfiguration.createWithDefaults());
+			customerEquipment.setDetails(ApElementConfiguration.createWithDefaults());
-            ApElementConfiguration apConfig = (ApElementConfiguration) customerEquipment.getDetails();
+			ApElementConfiguration apConfig = (ApElementConfiguration) customerEquipment.getDetails();
-            apConfig.getRadioMap().get(RadioType.is2dot4GHz).setChannelNumber(radioConfig.getRadioChannel24G());
+			apConfig.getRadioMap().get(RadioType.is2dot4GHz).setChannelNumber(radioConfig.getRadioChannel24G());
-            apConfig.getRadioMap().get(RadioType.is5GHzL).setChannelNumber(radioConfig.getRadioChannel5LG());
+			apConfig.getRadioMap().get(RadioType.is5GHzL).setChannelNumber(radioConfig.getRadioChannel5LG());
-            apConfig.getRadioMap().get(RadioType.is5GHzU).setChannelNumber(radioConfig.getRadioChannel5HG());
+			apConfig.getRadioMap().get(RadioType.is5GHzU).setChannelNumber(radioConfig.getRadioChannel5HG());
-            customerEquipment.setDetails(apConfig);
+			customerEquipment.setDetails(apConfig);
-        }
+		}
 
-        if (equipmentLocation == null) {
+		if (equipmentLocation == null) {
-            equipmentLocation = new Location();
+			equipmentLocation = new Location();
-            equipmentLocation.setId(1);
+			equipmentLocation.setId(1);
-            equipmentLocation.setDetails(LocationDetails.createWithDefaults());
+			equipmentLocation.setDetails(LocationDetails.createWithDefaults());
-            ((LocationDetails) equipmentLocation.getDetails())
+			((LocationDetails) equipmentLocation.getDetails())
-                    .setCountryCode(CountryCode.getByName(radioConfig.getCountry().toLowerCase()));
+					.setCountryCode(CountryCode.getByName(radioConfig.getCountry().toLowerCase()));
-            customerEquipment.setLocationId(equipmentLocation.getId());
+			customerEquipment.setLocationId(equipmentLocation.getId());
-        }
+		}
 
-    }
+	}
 
-    // Handle Legacy Config Support
+	// Handle Legacy Config Support
-    public void setSsidConfigs(List<OpensyncAPSsidConfig> ssidConfigs) {
+	public void setSsidConfigs(List<OpensyncAPSsidConfig> ssidConfigs) {
 
-        if (apProfile == null) {
+		if (apProfile == null) {
-            apProfile = new Profile();
+			apProfile = new Profile();
-            apProfile.setName("GeneratedApProfile");
+			apProfile.setName("GeneratedApProfile");
-            apProfile.setId(2);
+			apProfile.setId(2);
-            apProfile.setDetails(ApNetworkConfiguration.createWithDefaults());
+			apProfile.setDetails(ApNetworkConfiguration.createWithDefaults());
-        }
+		}
 
-        long ssidProfileId = 3;
+		long ssidProfileId = 3;
-        for (OpensyncAPSsidConfig ssidConfig : ssidConfigs) {
+		for (OpensyncAPSsidConfig ssidConfig : ssidConfigs) {
 
-            Profile profile = new Profile();
+			Profile profile = new Profile();
-            profile.setProfileType(ProfileType.ssid);
+			profile.setProfileType(ProfileType.ssid);
-            profile.setName(ssidConfig.getSsid());
+			profile.setName(ssidConfig.getSsid());
-            SsidConfiguration cfg = SsidConfiguration.createWithDefaults();
+			SsidConfiguration cfg = SsidConfiguration.createWithDefaults();
-            Set<RadioType> appliedRadios = new HashSet<RadioType>();
+			Set<RadioType> appliedRadios = new HashSet<RadioType>();
-            appliedRadios.add(ssidConfig.getRadioType());
+			appliedRadios.add(ssidConfig.getRadioType());
-            cfg.setAppliedRadios(appliedRadios);
+			cfg.setAppliedRadios(appliedRadios);
-            cfg.setSsid(ssidConfig.getSsid());
+			cfg.setSsid(ssidConfig.getSsid());
-            if (ssidConfig.getEncryption().equals("WPA-PSK") && ssidConfig.getMode().equals("1"))
+			if (ssidConfig.getEncryption().equals("WPA-PSK") && ssidConfig.getMode().equals("1"))
-                cfg.setSecureMode(SecureMode.wpaPSK);
+				cfg.setSecureMode(SecureMode.wpaPSK);
-            else
+			else
-                cfg.setSecureMode(SecureMode.wpa2PSK);
+				cfg.setSecureMode(SecureMode.wpa2PSK);
-            cfg.setBroadcastSsid(ssidConfig.isBroadcast() ? StateSetting.enabled : StateSetting.disabled);
+			cfg.setBroadcastSsid(ssidConfig.isBroadcast() ? StateSetting.enabled : StateSetting.disabled);
 
-            profile.setDetails(cfg);
+			profile.setDetails(cfg);
-            profile.setId(ssidProfileId);
+			profile.setId(ssidProfileId);
-            if (this.ssidProfile == null)
+			if (this.ssidProfile == null)
-                this.ssidProfile = new ArrayList<Profile>();
+				this.ssidProfile = new ArrayList<Profile>();
-            this.ssidProfile.add(profile);
+			this.ssidProfile.add(profile);
-            apProfile.getChildProfileIds().add(ssidProfileId);
+			apProfile.getChildProfileIds().add(ssidProfileId);
-            ssidProfileId++;
+			ssidProfileId++;
 
-        }
+		}
 
-        if (customerEquipment != null) {
+		if (customerEquipment != null) {
-            customerEquipment.setProfileId(apProfile.getId());
+			customerEquipment.setProfileId(apProfile.getId());
-        }
+		}
 
-    }
+	}
 
-    public EquipmentGatewayRecord getEquipmentGateway() {
+	public EquipmentGatewayRecord getEquipmentGateway() {
-        return equipmentGateway;
+		return equipmentGateway;
-    }
+	}
 
-    public void setEquipmentGateway(EquipmentGatewayRecord equipmentGateway) {
+	public void setEquipmentGateway(EquipmentGatewayRecord equipmentGateway) {
-        this.equipmentGateway = equipmentGateway;
+		this.equipmentGateway = equipmentGateway;
-    }
+	}
 
-    public EquipmentRoutingRecord getEquipmentRouting() {
+	public EquipmentRoutingRecord getEquipmentRouting() {
-        return equipmentRouting;
+		return equipmentRouting;
-    }
+	}
 
-    public void setEquipmentRouting(EquipmentRoutingRecord equipmentRouting) {
+	public void setEquipmentRouting(EquipmentRoutingRecord equipmentRouting) {
-        this.equipmentRouting = equipmentRouting;
+		this.equipmentRouting = equipmentRouting;
-    }
+	}
 
-    public Equipment getCustomerEquipment() {
+	public Equipment getCustomerEquipment() {
-        return customerEquipment;
+		return customerEquipment;
-    }
+	}
 
-    public void setCustomerEquipment(Equipment customerEquipment) {
+	public void setCustomerEquipment(Equipment customerEquipment) {
-        this.customerEquipment = customerEquipment;
+		this.customerEquipment = customerEquipment;
-    }
+	}
 
-    public Profile getApProfile() {
+	public Profile getApProfile() {
-        return apProfile;
+		return apProfile;
-    }
+	}
 
-    public void setApProfile(Profile apProfile) {
+	public void setApProfile(Profile apProfile) {
-        this.apProfile = apProfile;
+		this.apProfile = apProfile;
-    }
+	}
 
-    public List<Profile> getSsidProfile() {
+	public List<Profile> getSsidProfile() {
-        return ssidProfile;
+		return ssidProfile;
-    }
+	}
 
-    public void setSsidProfile(List<Profile> ssidProfile) {
+	public void setSsidProfile(List<Profile> ssidProfile) {
-        this.ssidProfile = ssidProfile;
+		this.ssidProfile = ssidProfile;
-    }
+	}
 
-    public Location getEquipmentLocation() {
+	public Location getEquipmentLocation() {
-        return equipmentLocation;
+		return equipmentLocation;
-    }
+	}
 
-    public void setEquipmentLocation(Location equipmentLocation) {
+	public void setEquipmentLocation(Location equipmentLocation) {
-        this.equipmentLocation = equipmentLocation;
+		this.equipmentLocation = equipmentLocation;
-    }
+	}
 
-    public String getCountryCode() {
+	public String getCountryCode() {
-        return Location.getCountryCode(this.equipmentLocation).toString();
+		return Location.getCountryCode(this.equipmentLocation).toString();
-    }
+	}
 
-    public static long getSerialversionuid() {
+	public static long getSerialversionuid() {
-        return serialVersionUID;
+		return serialVersionUID;
-    }
+	}
 
-    @Override
+	@Override
-    public OpensyncAPConfig clone() {
+	public OpensyncAPConfig clone() {
-        OpensyncAPConfig ret = (OpensyncAPConfig) super.clone();
+		OpensyncAPConfig ret = (OpensyncAPConfig) super.clone();
 
-        if (customerEquipment != null)
+		if (customerEquipment != null)
-            ret.customerEquipment = customerEquipment.clone();
+			ret.customerEquipment = customerEquipment.clone();
-        if (equipmentLocation != null)
+		if (equipmentLocation != null)
-            ret.equipmentLocation = equipmentLocation.clone();
+			ret.equipmentLocation = equipmentLocation.clone();
-        if (ssidProfile != null) {
+		if (ssidProfile != null) {
-            List<Profile> ssidList = new ArrayList<Profile>();
+			List<Profile> ssidList = new ArrayList<Profile>();
-            for (Profile profile : ssidProfile) {
+			for (Profile profile : ssidProfile) {
-                ssidList.add(profile.clone());
+				ssidList.add(profile.clone());
-            }
+			}
-            ret.ssidProfile = ssidList;
+			ret.ssidProfile = ssidList;
-        }
+		}
-        if (apProfile != null)
+		if (apProfile != null)
-            ret.apProfile = apProfile.clone();
+			ret.apProfile = apProfile.clone();
-        if (equipmentRouting != null)
+		if (equipmentRouting != null)
-            ret.equipmentRouting = equipmentRouting.clone();
+			ret.equipmentRouting = equipmentRouting.clone();
-        if (equipmentGateway != null)
+		if (equipmentGateway != null)
-            ret.equipmentGateway = equipmentGateway.clone();
+			ret.equipmentGateway = equipmentGateway.clone();
 
-        return ret;
+		return ret;
-    }
+	}
 
-    @Override
+	@Override
-    public String toString() {
+	public String toString() {
-        StringBuffer sb = new StringBuffer();
+		StringBuffer sb = new StringBuffer();
-        sb.append(customerEquipment.toString());
+		sb.append(customerEquipment.toString());
-        sb.append(apProfile.toString());
+		sb.append(apProfile.toString());
-        for (Profile ssid : ssidProfile) {
+		for (Profile ssid : ssidProfile) {
-            sb.append(ssid.toString());
+			sb.append(ssid.toString());
-        }
+		}
-        sb.append(equipmentLocation.toString());
+		sb.append(equipmentLocation.toString());
 
-        return sb.toString();
+		return sb.toString();
 
-    }
+	}
+
+	public List<Profile> getRadiusProfiles() {
+		return radiusProfiles;
+	}
+
+	public void setRadiusProfiles(List<Profile> radiusProfiles) {
+		this.radiusProfiles = radiusProfiles;
+	}
 
 }

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

@@ -41,6 +41,9 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 	@Value("${connectus.ovsdb.ssidProfileFileName:/Users/mikehansen/git/wlan-cloud-workspace/wlan-cloud-opensync-controller/opensync-ext-static/src/main/resources/ProfileSsid.json}")
 	private String ssidProfileFileName;
 
+	@Value("${connectus.ovsdb.radiusProfileFileName:/Users/mikehansen/git/wlan-cloud-workspace/wlan-cloud-opensync-controller/opensync-ext-static/src/main/resources/ProfileRadius.json}")
+	private String radiusProfileFileName;
+	
 	@Value("${connectus.ovsdb.locationFileName:/Users/mikehansen/git/wlan-cloud-workspace/wlan-cloud-opensync-controller/opensync-ext-static/src/main/resources/LocationBuildingExample.json}")
 	private String locationFileName;
 
@@ -76,11 +79,15 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 			
 			com.telecominfraproject.wlan.profile.models.Profile apProfile = com.telecominfraproject.wlan.profile.models.Profile
 					.fromFile(apProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
+			
 			List<com.telecominfraproject.wlan.profile.models.Profile> ssidProfiles = com.telecominfraproject.wlan.profile.models.Profile
 					.listFromFile(ssidProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
 
 			ssidProfiles.stream().forEach(p -> apProfile.getChildProfileIds().add(p.getId()));
 
+			List<com.telecominfraproject.wlan.profile.models.Profile> radiusProfiles = com.telecominfraproject.wlan.profile.models.Profile
+					.listFromFile(radiusProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
+			
 			equipment.setProfileId(apProfile.getId());
 
 			Location location = Location.fromFile(locationFileName, Location.class);
@@ -91,6 +98,7 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 			ret.setCustomerEquipment(equipment);
 			ret.setApProfile(apProfile);
 			ret.setSsidProfile(ssidProfiles);
+			ret.setRadiusProfiles(radiusProfiles);
 			ret.setEquipmentLocation(location);
 
 		} catch (IOException e) {

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

@@ -1,290 +1,293 @@
 {
-  "model_type" : "Equipment",
+  "model_type": "Equipment",
-  "id" : 51,
+  "id": 51,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileId" : 3,
+  "profileId": 5,
-  "locationId" : 8,
+  "locationId": 8,
-  "equipmentType" : "AP",
+  "equipmentType": "AP",
-  "inventoryId" : "Test_Client_21P10C68818122",
+  "inventoryId": "Test_Client_21P10C68818122",
-  "name" : "Test_Client_21P10C68818122",
+  "name": "Test_Client_21P10C68818122",
-  "details" : {
+  "details": {
-    "model_type" : "ApElementConfiguration",
+    "model_type": "ApElementConfiguration",
-    "sampleDetailsStr" : null,
+    "equipmentModel": "EA8300-CA",
-    "elementConfigVersion" : "AP-V1",
+    "elementConfigVersion": "AP-V1",
-    "equipmentType" : "AP",
+    "equipmentType": "AP",
-    "deviceMode" : "standaloneAP",
+    "deviceMode": "standaloneAP",
-    "gettingIP" : "dhcp",
+    "gettingIP": "dhcp",
-    "staticIP" : null,
+    "staticIP": null,
-    "staticIpMaskCidr" : null,
+    "staticIpMaskCidr": null,
-    "staticIpGw" : null,
+    "staticIpGw": null,
-    "gettingDNS" : "dhcp",
+    "gettingDNS": "dhcp",
-    "staticDnsIp1" : null,
+    "staticDnsIp1": null,
-    "staticDnsIp2" : null,
+    "staticDnsIp2": null,
-    "peerInfoList" : [ ],
+    "peerInfoList": [],
-    "deviceName" : "Test_Client_21P10C68818122",
+    "deviceName": "Default Device Name",
-    "locationData" : null,
+    "locationData": null,
-    "locallyConfiguredMgmtVlan" : 0,
+    "locallyConfiguredMgmtVlan": 0,
-    "locallyConfigured" : false,
+    "locallyConfigured": false,
-    "deploymentType" : "CEILING",
+    "deploymentType": "CEILING",
-    "syntheticClientEnabled" : null,
+    "syntheticClientEnabled": null,
-    "frameReportThrottleEnabled" : true,
+    "frameReportThrottleEnabled": true,
-    "antennaType" : "OMNI",
+    "antennaType": "OMNI",
-    "costSavingEventsEnabled" : true,
+    "costSavingEventsEnabled": true,
-    "forwardMode" : "BRIDGE",
+    "forwardMode": "BRIDGE",
-    "radioMap" : {
+    "radioMap": {
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is2dot4GHz",
+        "radioType": "is2dot4GHz",
-        "channelNumber" : 6,
+        "channelNumber": 6,
-        "manualChannelNumber" : 6,
+        "manualChannelNumber": 6,
-        "backupChannelNumber" : 11,
+        "backupChannelNumber": 11,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is20MHz",
+        "channelBandwidth": "is20MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 6
+        "activeChannel": 6
       },
-      "is5GHzL" : {
+      "is5GHzU": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is5GHzL",
+        "radioType": "is5GHzU",
-        "channelNumber" : 36,
+        "channelNumber": 149,
-        "manualChannelNumber" : 36,
+        "manualChannelNumber": 149,
-        "backupChannelNumber" : 44,
+        "backupChannelNumber": 154,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is80MHz",
+        "channelBandwidth": "is80MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 36
+        "activeChannel": 149
       },
-      "is5GHzU" : {
+      "is5GHzL": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is5GHzU",
+        "radioType": "is5GHzL",
-        "channelNumber" : 149,
+        "channelNumber": 36,
-        "manualChannelNumber" : 149,
+        "manualChannelNumber": 36,
-        "backupChannelNumber" : 154,
+        "backupChannelNumber": 44,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is80MHz",
+        "channelBandwidth": "is80MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 149
+        "activeChannel": 36
       }
     },
-    "advancedRadioMap" : {
+    "advancedRadioMap": {
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is2dot4GHz",
+        "radioType": "is2dot4GHz",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeN",
+        "radioMode": "modeN",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 20,
+          "dropInSnrPercentage": 20,
-          "minLoadFactor" : 50
+          "minLoadFactor": 50
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is5GHzU",
+        "radioType": "is5GHzU",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeAC",
+        "radioMode": "modeAC",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 30,
+          "dropInSnrPercentage": 30,
-          "minLoadFactor" : 40
+          "minLoadFactor": 40
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is5GHzL",
+        "radioType": "is5GHzL",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeAC",
+        "radioMode": "modeAC",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 30,
+          "dropInSnrPercentage": 30,
-          "minLoadFactor" : 40
+          "minLoadFactor": 40
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       }
     }
   },
-  "latitude" : null,
+  "latitude": null,
-  "longitude" : null,
+  "longitude": null,
-  "serial" : "21P10C68818122",
+  "serial": "21P10C68818122",
-  "createdTimestamp" : 1590607072871,
+  "createdTimestamp": 1591653239821,
-  "lastModifiedTimestamp" : 1590607073116
+  "lastModifiedTimestamp": 1591653241398
 }

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

@@ -1,50 +1,54 @@
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 3,
+  "id": 5,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "equipment_ap",
+  "profileType": "equipment_ap",
-  "name" : "autoprovisionedApProfile",
+  "name": "DefaultApProfile",
-  "details" : {
+  "details": {
-    "model_type" : "ApNetworkConfiguration",
+    "model_type": "ApNetworkConfiguration",
-    "networkConfigVersion" : "AP-1",
+    "networkConfigVersion": "AP-1",
-    "equipmentType" : "AP",
+    "equipmentType": "AP",
-    "vlanNative" : true,
+    "vlanNative": true,
-    "vlan" : 0,
+    "vlan": 0,
-    "ntpServer" : {
+    "ntpServer": {
-      "model_type" : "AutoOrManualString",
+      "model_type": "AutoOrManualString",
-      "auto" : true,
+      "auto": true,
-      "value" : "pool.ntp.org"
+      "value": "pool.ntp.org"
     },
-    "syslogRelay" : null,
+    "syslogRelay": null,
-    "rtlsSettings" : null,
+    "rtlsSettings": null,
-    "syntheticClientEnabled" : true,
+    "syntheticClientEnabled": true,
-    "ledControlEnabled" : true,
+    "ledControlEnabled": true,
-    "equipmentDiscovery" : false,
+    "equipmentDiscovery": false,
-    "radioMap" : {
+    "radioMap": {
-      "is5GHz" : {
+      "is5GHz": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       }
     },
-    "profileType" : "equipment_ap"
+    "profileType": "equipment_ap"
   },
-  "createdTimestamp" : 1590607072994,
+  "createdTimestamp": 1591653239947,
-  "lastModifiedTimestamp" : 1590607073083,
+  "lastModifiedTimestamp": 1591654336724,
-  "childProfileIds" : [ 4, 5, 6 ]
+  "childProfileIds": [
+    6,
+    7,
+    8
+  ]
 }

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

@@ -0,0 +1,34 @@
+[
+{
+  "model_type": "Profile",
+  "id": 1,
+  "customerId": 2,
+  "profileType": "radius",
+  "name": "RadiusProfileOttawa",
+  "details": {
+    "model_type": "RadiusProfile",
+    "subnetConfiguration": null,
+    "serviceRegionMap": {
+      "Ottawa": {
+        "model_type": "RadiusServiceRegion",
+        "serverMap": {
+          "RadiusProfileOttawa": [
+            {
+              "model_type": "RadiusServer",
+              "ipAddress": "Mikes-MacBook-Pro.local",
+              "secret": "testing123",
+              "authPort": 1812,
+              "timeout": null
+            }
+          ]
+        },
+        "regionName": "Ottawa"
+      }
+    },
+    "profileType": "radius"
+  },
+  "createdTimestamp": 1591653174195,
+  "lastModifiedTimestamp": 1591653174195,
+  "childProfileIds": []
+}
+]

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

@@ -1,176 +1,184 @@
 [
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 4,
+  "id": 6,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid",
+  "name": "DefaultSsid-2g",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid",
+    "ssid": "Default-SSID-2g",
-    "appliedRadios" : [ "is2dot4GHz" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is2dot4GHz"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpa2PSK",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": null,
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073026,
+  "createdTimestamp": 1591653239983,
-  "lastModifiedTimestamp" : 1590607073026,
+  "lastModifiedTimestamp": 1591653239983,
-  "childProfileIds" : [ ]
+  "childProfileIds": []
 },
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 5,
+  "id": 7,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid-5l",
+  "name": "DefaultSsid-5gl",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid-5l",
+    "ssid": "Default-SSID-5gl",
-    "appliedRadios" : [ "is5GHzL" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is5GHzL"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpaEAP",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": "RadiusProfileOttawa",
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073044,
+  "createdTimestamp": 1591653240017,
-  "lastModifiedTimestamp" : 1590607073044,
+  "lastModifiedTimestamp": 1591654215374,
-  "childProfileIds" : [ ]
+  "childProfileIds": [
+    1
+  ]
 },
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 6,
+  "id": 8,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid-5u",
+  "name": "DefaultSsid-5gu",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid-5u",
+    "ssid": "Default-SSID-5gu",
-    "appliedRadios" : [ "is5GHzU" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is5GHzU"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpa2PSK",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": null,
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073065,
+  "createdTimestamp": 1591654301763,
-  "lastModifiedTimestamp" : 1590607073065,
+  "lastModifiedTimestamp": 1591654301763,
-  "childProfileIds" : [ ]
+  "childProfileIds": []
 }
 ]

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

@@ -18,7 +18,8 @@
     <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.telecominfraproject.wlan.opensync.experiment.OpenSyncGatewayCloudProcess"/>
     <listAttribute key="org.eclipse.jdt.launching.MODULEPATH"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="opensync-gateway-cloud-process"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-cloud-process"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dtip.wlan.introspectTokenApi.host=${local_server_address}:9096&#10;-Dtip.wlan.introspectTokenApi.clientToken=token_placeholder&#10;-Dtip.wlan.serviceUser=user&#10;-Dtip.wlan.servicePassword=password&#10;-Dconnectus.ovsdb.autoProvisionedCustomerId=2&#10;-Dconnectus.ovsdb.autoProvisionedSsid=Connectus-cloud&#10;-Dspring.main.show-banner=false&#10;-Dserver.port=9096&#10;-Dtip.wlan.secondaryPort=7071&#10;-Dtip.wlan.csrf-enabled=false&#10;-Dspring.profiles.include=opensync_cloud_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dconnectus.ovsdb.wifi-iface.default_bridge=br-lan&#10;-Dtip.wlan.introspectTokenApi.host=${local_server_address}:9096&#10;-Dtip.wlan.introspectTokenApi.clientToken=token_placeholder&#10;-Dtip.wlan.serviceUser=user&#10;-Dtip.wlan.servicePassword=password&#10;-Dconnectus.ovsdb.autoProvisionedCustomerId=2&#10;-Dconnectus.ovsdb.autoProvisionedSsid=Connectus-cloud&#10;-Dspring.main.show-banner=false&#10;-Dserver.port=9096&#10;-Dtip.wlan.secondaryPort=7071&#10;-Dtip.wlan.csrf-enabled=false&#10;-Dspring.profiles.include=opensync_cloud_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
 </launchConfiguration>

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

@@ -1,290 +1,293 @@
 {
-  "model_type" : "Equipment",
+  "model_type": "Equipment",
-  "id" : 51,
+  "id": 51,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileId" : 3,
+  "profileId": 5,
-  "locationId" : 8,
+  "locationId": 8,
-  "equipmentType" : "AP",
+  "equipmentType": "AP",
-  "inventoryId" : "Test_Client_21P10C68818122",
+  "inventoryId": "Test_Client_21P10C68818122",
-  "name" : "Test_Client_21P10C68818122",
+  "name": "Test_Client_21P10C68818122",
-  "details" : {
+  "details": {
-    "model_type" : "ApElementConfiguration",
+    "model_type": "ApElementConfiguration",
-    "sampleDetailsStr" : null,
+    "equipmentModel": "EA8300-CA",
-    "elementConfigVersion" : "AP-V1",
+    "elementConfigVersion": "AP-V1",
-    "equipmentType" : "AP",
+    "equipmentType": "AP",
-    "deviceMode" : "standaloneAP",
+    "deviceMode": "standaloneAP",
-    "gettingIP" : "dhcp",
+    "gettingIP": "dhcp",
-    "staticIP" : null,
+    "staticIP": null,
-    "staticIpMaskCidr" : null,
+    "staticIpMaskCidr": null,
-    "staticIpGw" : null,
+    "staticIpGw": null,
-    "gettingDNS" : "dhcp",
+    "gettingDNS": "dhcp",
-    "staticDnsIp1" : null,
+    "staticDnsIp1": null,
-    "staticDnsIp2" : null,
+    "staticDnsIp2": null,
-    "peerInfoList" : [ ],
+    "peerInfoList": [],
-    "deviceName" : "Test_Client_21P10C68818122",
+    "deviceName": "Default Device Name",
-    "locationData" : null,
+    "locationData": null,
-    "locallyConfiguredMgmtVlan" : 0,
+    "locallyConfiguredMgmtVlan": 0,
-    "locallyConfigured" : false,
+    "locallyConfigured": false,
-    "deploymentType" : "CEILING",
+    "deploymentType": "CEILING",
-    "syntheticClientEnabled" : null,
+    "syntheticClientEnabled": null,
-    "frameReportThrottleEnabled" : true,
+    "frameReportThrottleEnabled": true,
-    "antennaType" : "OMNI",
+    "antennaType": "OMNI",
-    "costSavingEventsEnabled" : true,
+    "costSavingEventsEnabled": true,
-    "forwardMode" : "BRIDGE",
+    "forwardMode": "BRIDGE",
-    "radioMap" : {
+    "radioMap": {
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is2dot4GHz",
+        "radioType": "is2dot4GHz",
-        "channelNumber" : 6,
+        "channelNumber": 6,
-        "manualChannelNumber" : 6,
+        "manualChannelNumber": 6,
-        "backupChannelNumber" : 11,
+        "backupChannelNumber": 11,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is20MHz",
+        "channelBandwidth": "is20MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 6
+        "activeChannel": 6
       },
-      "is5GHzL" : {
+      "is5GHzU": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is5GHzL",
+        "radioType": "is5GHzU",
-        "channelNumber" : 36,
+        "channelNumber": 149,
-        "manualChannelNumber" : 36,
+        "manualChannelNumber": 149,
-        "backupChannelNumber" : 44,
+        "backupChannelNumber": 154,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is80MHz",
+        "channelBandwidth": "is80MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 36
+        "activeChannel": 149
       },
-      "is5GHzU" : {
+      "is5GHzL": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is5GHzU",
+        "radioType": "is5GHzL",
-        "channelNumber" : 149,
+        "channelNumber": 36,
-        "manualChannelNumber" : 149,
+        "manualChannelNumber": 36,
-        "backupChannelNumber" : 154,
+        "backupChannelNumber": 44,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is80MHz",
+        "channelBandwidth": "is80MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 149
+        "activeChannel": 36
       }
     },
-    "advancedRadioMap" : {
+    "advancedRadioMap": {
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is2dot4GHz",
+        "radioType": "is2dot4GHz",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeN",
+        "radioMode": "modeN",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 20,
+          "dropInSnrPercentage": 20,
-          "minLoadFactor" : 50
+          "minLoadFactor": 50
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is5GHzU",
+        "radioType": "is5GHzU",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeAC",
+        "radioMode": "modeAC",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 30,
+          "dropInSnrPercentage": 30,
-          "minLoadFactor" : 40
+          "minLoadFactor": 40
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is5GHzL",
+        "radioType": "is5GHzL",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeAC",
+        "radioMode": "modeAC",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 30,
+          "dropInSnrPercentage": 30,
-          "minLoadFactor" : 40
+          "minLoadFactor": 40
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       }
     }
   },
-  "latitude" : null,
+  "latitude": null,
-  "longitude" : null,
+  "longitude": null,
-  "serial" : "21P10C68818122",
+  "serial": "21P10C68818122",
-  "createdTimestamp" : 1590607072871,
+  "createdTimestamp": 1591653239821,
-  "lastModifiedTimestamp" : 1590607073116
+  "lastModifiedTimestamp": 1591653241398
 }

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

@@ -1,50 +1,54 @@
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 3,
+  "id": 5,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "equipment_ap",
+  "profileType": "equipment_ap",
-  "name" : "autoprovisionedApProfile",
+  "name": "DefaultApProfile",
-  "details" : {
+  "details": {
-    "model_type" : "ApNetworkConfiguration",
+    "model_type": "ApNetworkConfiguration",
-    "networkConfigVersion" : "AP-1",
+    "networkConfigVersion": "AP-1",
-    "equipmentType" : "AP",
+    "equipmentType": "AP",
-    "vlanNative" : true,
+    "vlanNative": true,
-    "vlan" : 0,
+    "vlan": 0,
-    "ntpServer" : {
+    "ntpServer": {
-      "model_type" : "AutoOrManualString",
+      "model_type": "AutoOrManualString",
-      "auto" : true,
+      "auto": true,
-      "value" : "pool.ntp.org"
+      "value": "pool.ntp.org"
     },
-    "syslogRelay" : null,
+    "syslogRelay": null,
-    "rtlsSettings" : null,
+    "rtlsSettings": null,
-    "syntheticClientEnabled" : true,
+    "syntheticClientEnabled": true,
-    "ledControlEnabled" : true,
+    "ledControlEnabled": true,
-    "equipmentDiscovery" : false,
+    "equipmentDiscovery": false,
-    "radioMap" : {
+    "radioMap": {
-      "is5GHz" : {
+      "is5GHz": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       }
     },
-    "profileType" : "equipment_ap"
+    "profileType": "equipment_ap"
   },
-  "createdTimestamp" : 1590607072994,
+  "createdTimestamp": 1591653239947,
-  "lastModifiedTimestamp" : 1590607073083,
+  "lastModifiedTimestamp": 1591654336724,
-  "childProfileIds" : [ 4, 5, 6 ]
+  "childProfileIds": [
+    6,
+    7,
+    8
+  ]
 }

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

@@ -0,0 +1,34 @@
+[
+{
+  "model_type": "Profile",
+  "id": 1,
+  "customerId": 2,
+  "profileType": "radius",
+  "name": "RadiusProfileOttawa",
+  "details": {
+    "model_type": "RadiusProfile",
+    "subnetConfiguration": null,
+    "serviceRegionMap": {
+      "Ottawa": {
+        "model_type": "RadiusServiceRegion",
+        "serverMap": {
+          "RadiusProfileOttawa": [
+            {
+              "model_type": "RadiusServer",
+              "ipAddress": "Mikes-MacBook-Pro.local",
+              "secret": "testing123",
+              "authPort": 1812,
+              "timeout": null
+            }
+          ]
+        },
+        "regionName": "Ottawa"
+      }
+    },
+    "profileType": "radius"
+  },
+  "createdTimestamp": 1591653174195,
+  "lastModifiedTimestamp": 1591653174195,
+  "childProfileIds": []
+}
+]

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

@@ -1,176 +1,184 @@
 [
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 4,
+  "id": 6,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid",
+  "name": "DefaultSsid-2g",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid",
+    "ssid": "Default-SSID-2g",
-    "appliedRadios" : [ "is2dot4GHz" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is2dot4GHz"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpa2PSK",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": null,
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073026,
+  "createdTimestamp": 1591653239983,
-  "lastModifiedTimestamp" : 1590607073026,
+  "lastModifiedTimestamp": 1591653239983,
-  "childProfileIds" : [ ]
+  "childProfileIds": []
 },
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 5,
+  "id": 7,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid-5l",
+  "name": "DefaultSsid-5gl",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid-5l",
+    "ssid": "Default-SSID-5gl",
-    "appliedRadios" : [ "is5GHzL" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is5GHzL"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpaEAP",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": "RadiusProfileOttawa",
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073044,
+  "createdTimestamp": 1591653240017,
-  "lastModifiedTimestamp" : 1590607073044,
+  "lastModifiedTimestamp": 1591654215374,
-  "childProfileIds" : [ ]
+  "childProfileIds": [
+    1
+  ]
 },
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 6,
+  "id": 8,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid-5u",
+  "name": "DefaultSsid-5gu",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid-5u",
+    "ssid": "Default-SSID-5gu",
-    "appliedRadios" : [ "is5GHzU" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is5GHzU"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpa2PSK",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": null,
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073065,
+  "createdTimestamp": 1591654301763,
-  "lastModifiedTimestamp" : 1590607073065,
+  "lastModifiedTimestamp": 1591654301763,
-  "childProfileIds" : [ ]
+  "childProfileIds": []
 }
 ]

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

@@ -1,27 +0,0 @@
-{
-  "model_type" : "OpensyncAPConfig",
-  "radioConfig" : {
-    "model_type" : "OpensyncAPRadioConfig",
-    "country" : "CA",
-    "radioChannel24G" : 1,
-    "radioChannel5LG" : 44,
-    "radioChannel5HG" : 108
-  },
-  "ssidConfigs" : [ {
-    "model_type" : "OpensyncAPSsidConfig",
-    "radioType" : "is2dot4GHz",
-    "ssid" : "Connectus-local",
-    "encryption" : "WPA-PSK",
-    "key" : "12345678",
-    "mode" : "2",
-    "broadcast" : true
-  }, {
-    "model_type" : "OpensyncAPSsidConfig",
-    "radioType" : "is5GHzL",
-    "ssid" : "Connectus-local-5l",
-    "encryption" : "WPA-PSK",
-    "key" : "12345678",
-    "mode" : "2",
-    "broadcast" : true    
-  } ]
-}

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

@@ -1,290 +1,293 @@
 {
-  "model_type" : "Equipment",
+  "model_type": "Equipment",
-  "id" : 51,
+  "id": 51,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileId" : 3,
+  "profileId": 5,
-  "locationId" : 8,
+  "locationId": 8,
-  "equipmentType" : "AP",
+  "equipmentType": "AP",
-  "inventoryId" : "Test_Client_21P10C68818122",
+  "inventoryId": "Test_Client_21P10C68818122",
-  "name" : "Test_Client_21P10C68818122",
+  "name": "Test_Client_21P10C68818122",
-  "details" : {
+  "details": {
-    "model_type" : "ApElementConfiguration",
+    "model_type": "ApElementConfiguration",
-    "sampleDetailsStr" : null,
+    "equipmentModel": "EA8300-CA",
-    "elementConfigVersion" : "AP-V1",
+    "elementConfigVersion": "AP-V1",
-    "equipmentType" : "AP",
+    "equipmentType": "AP",
-    "deviceMode" : "standaloneAP",
+    "deviceMode": "standaloneAP",
-    "gettingIP" : "dhcp",
+    "gettingIP": "dhcp",
-    "staticIP" : null,
+    "staticIP": null,
-    "staticIpMaskCidr" : null,
+    "staticIpMaskCidr": null,
-    "staticIpGw" : null,
+    "staticIpGw": null,
-    "gettingDNS" : "dhcp",
+    "gettingDNS": "dhcp",
-    "staticDnsIp1" : null,
+    "staticDnsIp1": null,
-    "staticDnsIp2" : null,
+    "staticDnsIp2": null,
-    "peerInfoList" : [ ],
+    "peerInfoList": [],
-    "deviceName" : "Test_Client_21P10C68818122",
+    "deviceName": "Default Device Name",
-    "locationData" : null,
+    "locationData": null,
-    "locallyConfiguredMgmtVlan" : 0,
+    "locallyConfiguredMgmtVlan": 0,
-    "locallyConfigured" : false,
+    "locallyConfigured": false,
-    "deploymentType" : "CEILING",
+    "deploymentType": "CEILING",
-    "syntheticClientEnabled" : null,
+    "syntheticClientEnabled": null,
-    "frameReportThrottleEnabled" : true,
+    "frameReportThrottleEnabled": true,
-    "antennaType" : "OMNI",
+    "antennaType": "OMNI",
-    "costSavingEventsEnabled" : true,
+    "costSavingEventsEnabled": true,
-    "forwardMode" : "BRIDGE",
+    "forwardMode": "BRIDGE",
-    "radioMap" : {
+    "radioMap": {
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is2dot4GHz",
+        "radioType": "is2dot4GHz",
-        "channelNumber" : 6,
+        "channelNumber": 6,
-        "manualChannelNumber" : 6,
+        "manualChannelNumber": 6,
-        "backupChannelNumber" : 11,
+        "backupChannelNumber": 11,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is20MHz",
+        "channelBandwidth": "is20MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 6
+        "activeChannel": 6
       },
-      "is5GHzL" : {
+      "is5GHzU": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is5GHzL",
+        "radioType": "is5GHzU",
-        "channelNumber" : 36,
+        "channelNumber": 149,
-        "manualChannelNumber" : 36,
+        "manualChannelNumber": 149,
-        "backupChannelNumber" : 44,
+        "backupChannelNumber": 154,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is80MHz",
+        "channelBandwidth": "is80MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 36
+        "activeChannel": 149
       },
-      "is5GHzU" : {
+      "is5GHzL": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is5GHzU",
+        "radioType": "is5GHzL",
-        "channelNumber" : 149,
+        "channelNumber": 36,
-        "manualChannelNumber" : 149,
+        "manualChannelNumber": 36,
-        "backupChannelNumber" : 154,
+        "backupChannelNumber": 44,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is80MHz",
+        "channelBandwidth": "is80MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 149
+        "activeChannel": 36
       }
     },
-    "advancedRadioMap" : {
+    "advancedRadioMap": {
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is2dot4GHz",
+        "radioType": "is2dot4GHz",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeN",
+        "radioMode": "modeN",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 20,
+          "dropInSnrPercentage": 20,
-          "minLoadFactor" : 50
+          "minLoadFactor": 50
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is5GHzU",
+        "radioType": "is5GHzU",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeAC",
+        "radioMode": "modeAC",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 30,
+          "dropInSnrPercentage": 30,
-          "minLoadFactor" : 40
+          "minLoadFactor": 40
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is5GHzL",
+        "radioType": "is5GHzL",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeAC",
+        "radioMode": "modeAC",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 30,
+          "dropInSnrPercentage": 30,
-          "minLoadFactor" : 40
+          "minLoadFactor": 40
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       }
     }
   },
-  "latitude" : null,
+  "latitude": null,
-  "longitude" : null,
+  "longitude": null,
-  "serial" : "21P10C68818122",
+  "serial": "21P10C68818122",
-  "createdTimestamp" : 1590607072871,
+  "createdTimestamp": 1591653239821,
-  "lastModifiedTimestamp" : 1590607073116
+  "lastModifiedTimestamp": 1591653241398
 }

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

@@ -1,50 +1,54 @@
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 3,
+  "id": 5,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "equipment_ap",
+  "profileType": "equipment_ap",
-  "name" : "autoprovisionedApProfile",
+  "name": "DefaultApProfile",
-  "details" : {
+  "details": {
-    "model_type" : "ApNetworkConfiguration",
+    "model_type": "ApNetworkConfiguration",
-    "networkConfigVersion" : "AP-1",
+    "networkConfigVersion": "AP-1",
-    "equipmentType" : "AP",
+    "equipmentType": "AP",
-    "vlanNative" : true,
+    "vlanNative": true,
-    "vlan" : 0,
+    "vlan": 0,
-    "ntpServer" : {
+    "ntpServer": {
-      "model_type" : "AutoOrManualString",
+      "model_type": "AutoOrManualString",
-      "auto" : true,
+      "auto": true,
-      "value" : "pool.ntp.org"
+      "value": "pool.ntp.org"
     },
-    "syslogRelay" : null,
+    "syslogRelay": null,
-    "rtlsSettings" : null,
+    "rtlsSettings": null,
-    "syntheticClientEnabled" : true,
+    "syntheticClientEnabled": true,
-    "ledControlEnabled" : true,
+    "ledControlEnabled": true,
-    "equipmentDiscovery" : false,
+    "equipmentDiscovery": false,
-    "radioMap" : {
+    "radioMap": {
-      "is5GHz" : {
+      "is5GHz": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       }
     },
-    "profileType" : "equipment_ap"
+    "profileType": "equipment_ap"
   },
-  "createdTimestamp" : 1590607072994,
+  "createdTimestamp": 1591653239947,
-  "lastModifiedTimestamp" : 1590607073083,
+  "lastModifiedTimestamp": 1591654336724,
-  "childProfileIds" : [ 4, 5, 6 ]
+  "childProfileIds": [
+    6,
+    7,
+    8
+  ]
 }

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

@@ -0,0 +1,34 @@
+[
+{
+  "model_type": "Profile",
+  "id": 1,
+  "customerId": 2,
+  "profileType": "radius",
+  "name": "RadiusProfileOttawa",
+  "details": {
+    "model_type": "RadiusProfile",
+    "subnetConfiguration": null,
+    "serviceRegionMap": {
+      "Ottawa": {
+        "model_type": "RadiusServiceRegion",
+        "serverMap": {
+          "RadiusProfileOttawa": [
+            {
+              "model_type": "RadiusServer",
+              "ipAddress": "Mikes-MacBook-Pro.local",
+              "secret": "testing123",
+              "authPort": 1812,
+              "timeout": null
+            }
+          ]
+        },
+        "regionName": "Ottawa"
+      }
+    },
+    "profileType": "radius"
+  },
+  "createdTimestamp": 1591653174195,
+  "lastModifiedTimestamp": 1591653174195,
+  "childProfileIds": []
+}
+]

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

@@ -1,176 +1,184 @@
 [
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 4,
+  "id": 6,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid",
+  "name": "DefaultSsid-2g",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid",
+    "ssid": "Default-SSID-2g",
-    "appliedRadios" : [ "is2dot4GHz" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is2dot4GHz"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpa2PSK",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": null,
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073026,
+  "createdTimestamp": 1591653239983,
-  "lastModifiedTimestamp" : 1590607073026,
+  "lastModifiedTimestamp": 1591653239983,
-  "childProfileIds" : [ ]
+  "childProfileIds": []
 },
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 5,
+  "id": 7,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid-5l",
+  "name": "DefaultSsid-5gl",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid-5l",
+    "ssid": "Default-SSID-5gl",
-    "appliedRadios" : [ "is5GHzL" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is5GHzL"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpaEAP",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": "RadiusProfileOttawa",
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073044,
+  "createdTimestamp": 1591653240017,
-  "lastModifiedTimestamp" : 1590607073044,
+  "lastModifiedTimestamp": 1591654215374,
-  "childProfileIds" : [ ]
+  "childProfileIds": [
+    1
+  ]
 },
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 6,
+  "id": 8,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid-5u",
+  "name": "DefaultSsid-5gu",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid-5u",
+    "ssid": "Default-SSID-5gu",
-    "appliedRadios" : [ "is5GHzU" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is5GHzU"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpa2PSK",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": null,
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073065,
+  "createdTimestamp": 1591654301763,
-  "lastModifiedTimestamp" : 1590607073065,
+  "lastModifiedTimestamp": 1591654301763,
-  "childProfileIds" : [ ]
+  "childProfileIds": []
 }
 ]

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

@@ -1,27 +0,0 @@
-{
-  "model_type" : "OpensyncAPConfig",
-  "radioConfig" : {
-    "model_type" : "OpensyncAPRadioConfig",
-    "country" : "CA",
-    "radioChannel24G" : 1,
-    "radioChannel5LG" : 44,
-    "radioChannel5HG" : 108
-  },
-  "ssidConfigs" : [ {
-    "model_type" : "OpensyncAPSsidConfig",
-    "radioType" : "is2dot4GHz",
-    "ssid" : "Connectus-local",
-    "encryption" : "WPA-PSK",
-    "key" : "12345678",
-    "mode" : "2",
-    "broadcast" : true
-  }, {
-    "model_type" : "OpensyncAPSsidConfig",
-    "radioType" : "is5GHzL",
-    "ssid" : "Connectus-local-5l",
-    "encryption" : "WPA-PSK",
-    "key" : "12345678",
-    "mode" : "2",
-    "broadcast" : true    
-  } ]
-}

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

@@ -1,290 +1,293 @@
 {
-  "model_type" : "Equipment",
+  "model_type": "Equipment",
-  "id" : 51,
+  "id": 51,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileId" : 3,
+  "profileId": 5,
-  "locationId" : 8,
+  "locationId": 8,
-  "equipmentType" : "AP",
+  "equipmentType": "AP",
-  "inventoryId" : "Test_Client_21P10C68818122",
+  "inventoryId": "Test_Client_21P10C68818122",
-  "name" : "Test_Client_21P10C68818122",
+  "name": "Test_Client_21P10C68818122",
-  "details" : {
+  "details": {
-    "model_type" : "ApElementConfiguration",
+    "model_type": "ApElementConfiguration",
-    "sampleDetailsStr" : null,
+    "equipmentModel": "EA8300-CA",
-    "elementConfigVersion" : "AP-V1",
+    "elementConfigVersion": "AP-V1",
-    "equipmentType" : "AP",
+    "equipmentType": "AP",
-    "deviceMode" : "standaloneAP",
+    "deviceMode": "standaloneAP",
-    "gettingIP" : "dhcp",
+    "gettingIP": "dhcp",
-    "staticIP" : null,
+    "staticIP": null,
-    "staticIpMaskCidr" : null,
+    "staticIpMaskCidr": null,
-    "staticIpGw" : null,
+    "staticIpGw": null,
-    "gettingDNS" : "dhcp",
+    "gettingDNS": "dhcp",
-    "staticDnsIp1" : null,
+    "staticDnsIp1": null,
-    "staticDnsIp2" : null,
+    "staticDnsIp2": null,
-    "peerInfoList" : [ ],
+    "peerInfoList": [],
-    "deviceName" : "Test_Client_21P10C68818122",
+    "deviceName": "Default Device Name",
-    "locationData" : null,
+    "locationData": null,
-    "locallyConfiguredMgmtVlan" : 0,
+    "locallyConfiguredMgmtVlan": 0,
-    "locallyConfigured" : false,
+    "locallyConfigured": false,
-    "deploymentType" : "CEILING",
+    "deploymentType": "CEILING",
-    "syntheticClientEnabled" : null,
+    "syntheticClientEnabled": null,
-    "frameReportThrottleEnabled" : true,
+    "frameReportThrottleEnabled": true,
-    "antennaType" : "OMNI",
+    "antennaType": "OMNI",
-    "costSavingEventsEnabled" : true,
+    "costSavingEventsEnabled": true,
-    "forwardMode" : "BRIDGE",
+    "forwardMode": "BRIDGE",
-    "radioMap" : {
+    "radioMap": {
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is2dot4GHz",
+        "radioType": "is2dot4GHz",
-        "channelNumber" : 6,
+        "channelNumber": 6,
-        "manualChannelNumber" : 6,
+        "manualChannelNumber": 6,
-        "backupChannelNumber" : 11,
+        "backupChannelNumber": 11,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is20MHz",
+        "channelBandwidth": "is20MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 6
+        "activeChannel": 6
       },
-      "is5GHzL" : {
+      "is5GHzU": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is5GHzL",
+        "radioType": "is5GHzU",
-        "channelNumber" : 36,
+        "channelNumber": 149,
-        "manualChannelNumber" : 36,
+        "manualChannelNumber": 149,
-        "backupChannelNumber" : 44,
+        "backupChannelNumber": 154,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is80MHz",
+        "channelBandwidth": "is80MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 36
+        "activeChannel": 149
       },
-      "is5GHzU" : {
+      "is5GHzL": {
-        "model_type" : "ElementRadioConfiguration",
+        "model_type": "ElementRadioConfiguration",
-        "radioType" : "is5GHzU",
+        "radioType": "is5GHzL",
-        "channelNumber" : 149,
+        "channelNumber": 36,
-        "manualChannelNumber" : 149,
+        "manualChannelNumber": 36,
-        "backupChannelNumber" : 154,
+        "backupChannelNumber": 44,
-        "autoChannelSelection" : true,
+        "autoChannelSelection": false,
-        "channelBandwidth" : "is80MHz",
+        "channelBandwidth": "is80MHz",
-        "bannedChannels" : [ ],
+        "bannedChannels": [],
-        "rxCellSizeDb" : {
+        "allowedChannels": [],
-          "model_type" : "AutoOrManualValue",
+        "rxCellSizeDb": {
-          "auto" : true,
+          "model_type": "AutoOrManualValue",
-          "value" : -90
+          "auto": true,
+          "value": -90
         },
-        "probeResponseThresholdDb" : {
+        "probeResponseThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "clientDisconnectThresholdDb" : {
+        "clientDisconnectThresholdDb": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": true,
-          "value" : -90
+          "value": -90
         },
-        "eirpTxPower" : {
+        "eirpTxPower": {
-          "model_type" : "AutoOrManualValue",
+          "model_type": "AutoOrManualValue",
-          "auto" : true,
+          "auto": false,
-          "value" : 18
+          "value": 32
         },
-        "bestApEnabled" : null,
+        "bestApEnabled": null,
-        "neighbouringListApConfig" : {
+        "neighbouringListApConfig": {
-          "model_type" : "NeighbouringAPListConfiguration",
+          "model_type": "NeighbouringAPListConfiguration",
-          "minSignal" : -85,
+          "minSignal": -85,
-          "maxAps" : 25
+          "maxAps": 25
         },
-        "minAutoCellSize" : -80,
+        "minAutoCellSize": -80,
-        "perimeterDetectionEnabled" : true,
+        "perimeterDetectionEnabled": true,
-        "bestAPSteerType" : "both",
+        "bestAPSteerType": "both",
-        "deauthAttackDetection" : null,
+        "deauthAttackDetection": null,
-        "allowedChannelsPowerLevels" : [ ],
+        "allowedChannelsPowerLevels": [],
-        "activeChannel" : 149
+        "activeChannel": 36
       }
     },
-    "advancedRadioMap" : {
+    "advancedRadioMap": {
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is2dot4GHz",
+        "radioType": "is2dot4GHz",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeN",
+        "radioMode": "modeN",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 20,
+          "dropInSnrPercentage": 20,
-          "minLoadFactor" : 50
+          "minLoadFactor": 50
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is5GHzU",
+        "radioType": "is5GHzU",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeAC",
+        "radioMode": "modeAC",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 30,
+          "dropInSnrPercentage": 30,
-          "minLoadFactor" : 40
+          "minLoadFactor": 40
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioConfiguration",
+        "model_type": "RadioConfiguration",
-        "radioType" : "is5GHzL",
+        "radioType": "is5GHzL",
-        "radioAdminState" : "enabled",
+        "radioAdminState": "enabled",
-        "fragmentationThresholdBytes" : 2346,
+        "fragmentationThresholdBytes": 2346,
-        "rtsCtsThreshold" : 65535,
+        "rtsCtsThreshold": 65535,
-        "autoChannelSelection" : "disabled",
+        "autoChannelSelection": "disabled",
-        "radioMode" : "modeAC",
+        "radioMode": "modeAC",
-        "mimoMode" : "twoByTwo",
+        "mimoMode": "twoByTwo",
-        "wmmState" : "enabled",
+        "wmmState": "enabled",
-        "uapsdState" : "enabled",
+        "uapsdState": "enabled",
-        "maxNumClients" : 100,
+        "maxNumClients": 100,
-        "stationIsolation" : "disabled",
+        "stationIsolation": "disabled",
-        "multicastRate" : "auto",
+        "multicastRate": "auto",
-        "managementRate" : "auto",
+        "managementRate": "auto",
-        "activeScanSettings" : {
+        "activeScanSettings": {
-          "model_type" : "ActiveScanSettings",
+          "model_type": "ActiveScanSettings",
-          "enabled" : true,
+          "enabled": true,
-          "scanFrequencySeconds" : 10,
+          "scanFrequencySeconds": 10,
-          "scanDurationMillis" : 65
+          "scanDurationMillis": 65
         },
-        "channelHopSettings" : {
+        "channelHopSettings": {
-          "model_type" : "ChannelHopSettings",
+          "model_type": "ChannelHopSettings",
-          "noiseFloorThresholdInDB" : -75,
+          "noiseFloorThresholdInDB": -75,
-          "noiseFloorThresholdTimeInSeconds" : 180,
+          "noiseFloorThresholdTimeInSeconds": 180,
-          "nonWifiThresholdInPercentage" : 50,
+          "nonWifiThresholdInPercentage": 50,
-          "nonWifiThresholdTimeInSeconds" : 180,
+          "nonWifiThresholdTimeInSeconds": 180,
-          "obssHopMode" : "NON_WIFI"
+          "obssHopMode": "NON_WIFI"
         },
-        "bestApSettings" : {
+        "bestApSettings": {
-          "model_type" : "RadioBestApSettings",
+          "model_type": "RadioBestApSettings",
-          "mlComputed" : true,
+          "mlComputed": true,
-          "dropInSnrPercentage" : 30,
+          "dropInSnrPercentage": 30,
-          "minLoadFactor" : 40
+          "minLoadFactor": 40
         },
-        "forceScanDuringVoice" : "disabled",
+        "forceScanDuringVoice": "disabled",
-        "legacyBSSRate" : "enabled",
+        "legacyBSSRate": "enabled",
-        "beaconInterval" : 100,
+        "beaconInterval": 100,
-        "deauthAttackDetection" : null
+        "deauthAttackDetection": null
       }
     }
   },
-  "latitude" : null,
+  "latitude": null,
-  "longitude" : null,
+  "longitude": null,
-  "serial" : "21P10C68818122",
+  "serial": "21P10C68818122",
-  "createdTimestamp" : 1590607072871,
+  "createdTimestamp": 1591653239821,
-  "lastModifiedTimestamp" : 1590607073116
+  "lastModifiedTimestamp": 1591653241398
 }

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

@@ -1,50 +1,54 @@
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 3,
+  "id": 5,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "equipment_ap",
+  "profileType": "equipment_ap",
-  "name" : "autoprovisionedApProfile",
+  "name": "DefaultApProfile",
-  "details" : {
+  "details": {
-    "model_type" : "ApNetworkConfiguration",
+    "model_type": "ApNetworkConfiguration",
-    "networkConfigVersion" : "AP-1",
+    "networkConfigVersion": "AP-1",
-    "equipmentType" : "AP",
+    "equipmentType": "AP",
-    "vlanNative" : true,
+    "vlanNative": true,
-    "vlan" : 0,
+    "vlan": 0,
-    "ntpServer" : {
+    "ntpServer": {
-      "model_type" : "AutoOrManualString",
+      "model_type": "AutoOrManualString",
-      "auto" : true,
+      "auto": true,
-      "value" : "pool.ntp.org"
+      "value": "pool.ntp.org"
     },
-    "syslogRelay" : null,
+    "syslogRelay": null,
-    "rtlsSettings" : null,
+    "rtlsSettings": null,
-    "syntheticClientEnabled" : true,
+    "syntheticClientEnabled": true,
-    "ledControlEnabled" : true,
+    "ledControlEnabled": true,
-    "equipmentDiscovery" : false,
+    "equipmentDiscovery": false,
-    "radioMap" : {
+    "radioMap": {
-      "is5GHz" : {
+      "is5GHz": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioProfileConfiguration",
+        "model_type": "RadioProfileConfiguration",
-        "bestApEnabled" : true,
+        "bestApEnabled": true,
-        "bestAPSteerType" : "both"
+        "bestAPSteerType": "both"
       }
     },
-    "profileType" : "equipment_ap"
+    "profileType": "equipment_ap"
   },
-  "createdTimestamp" : 1590607072994,
+  "createdTimestamp": 1591653239947,
-  "lastModifiedTimestamp" : 1590607073083,
+  "lastModifiedTimestamp": 1591654336724,
-  "childProfileIds" : [ 4, 5, 6 ]
+  "childProfileIds": [
+    6,
+    7,
+    8
+  ]
 }

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

@@ -0,0 +1,34 @@
+[
+{
+  "model_type": "Profile",
+  "id": 1,
+  "customerId": 2,
+  "profileType": "radius",
+  "name": "RadiusProfileOttawa",
+  "details": {
+    "model_type": "RadiusProfile",
+    "subnetConfiguration": null,
+    "serviceRegionMap": {
+      "Ottawa": {
+        "model_type": "RadiusServiceRegion",
+        "serverMap": {
+          "RadiusProfileOttawa": [
+            {
+              "model_type": "RadiusServer",
+              "ipAddress": "Mikes-MacBook-Pro.local",
+              "secret": "testing123",
+              "authPort": 1812,
+              "timeout": null
+            }
+          ]
+        },
+        "regionName": "Ottawa"
+      }
+    },
+    "profileType": "radius"
+  },
+  "createdTimestamp": 1591653174195,
+  "lastModifiedTimestamp": 1591653174195,
+  "childProfileIds": []
+}
+]

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

@@ -1,176 +1,184 @@
 [
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 4,
+  "id": 6,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid",
+  "name": "DefaultSsid-2g",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid",
+    "ssid": "Default-SSID-2g",
-    "appliedRadios" : [ "is2dot4GHz" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is2dot4GHz"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpa2PSK",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": null,
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073026,
+  "createdTimestamp": 1591653239983,
-  "lastModifiedTimestamp" : 1590607073026,
+  "lastModifiedTimestamp": 1591653239983,
-  "childProfileIds" : [ ]
+  "childProfileIds": []
 },
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 5,
+  "id": 7,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid-5l",
+  "name": "DefaultSsid-5gl",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid-5l",
+    "ssid": "Default-SSID-5gl",
-    "appliedRadios" : [ "is5GHzL" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is5GHzL"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpaEAP",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": "RadiusProfileOttawa",
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073044,
+  "createdTimestamp": 1591653240017,
-  "lastModifiedTimestamp" : 1590607073044,
+  "lastModifiedTimestamp": 1591654215374,
-  "childProfileIds" : [ ]
+  "childProfileIds": [
+    1
+  ]
 },
 {
-  "model_type" : "Profile",
+  "model_type": "Profile",
-  "id" : 6,
+  "id": 8,
-  "customerId" : 2,
+  "customerId": 2,
-  "profileType" : "ssid",
+  "profileType": "ssid",
-  "name" : "autoProvisionedSsid-5u",
+  "name": "DefaultSsid-5gu",
-  "details" : {
+  "details": {
-    "model_type" : "SsidConfiguration",
+    "model_type": "SsidConfiguration",
-    "ssid" : "autoProvisionedSsid-5u",
+    "ssid": "Default-SSID-5gu",
-    "appliedRadios" : [ "is5GHzU" ],
+    "appliedRadios": [
-    "ssidAdminState" : "enabled",
+      "is5GHzU"
-    "secureMode" : "wpa2PSK",
+    ],
-    "vlanId" : 1,
+    "ssidAdminState": "enabled",
-    "keyStr" : "12345678",
+    "secureMode": "wpa2PSK",
-    "broadcastSsid" : "enabled",
+    "vlanId": 1,
-    "keyRefresh" : 0,
+    "keyStr": "12345678",
-    "noLocalSubnets" : false,
+    "broadcastSsid": "enabled",
-    "radiusServiceName" : null,
+    "keyRefresh": 0,
-    "captivePortalId" : null,
+    "noLocalSubnets": false,
-    "bandwidthLimitDown" : 0,
+    "radiusServiceName": null,
-    "bandwidthLimitUp" : 0,
+    "captivePortalId": null,
-    "videoTrafficOnly" : false,
+    "bandwidthLimitDown": 0,
-    "radioBasedConfigs" : {
+    "bandwidthLimitUp": 0,
-      "is5GHz" : {
+    "videoTrafficOnly": false,
-        "model_type" : "RadioBasedSsidConfiguration",
+    "radioBasedConfigs": {
-        "enable80211r" : null,
+      "is5GHz": {
-        "enable80211k" : null,
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211v" : null
+        "enable80211r": null,
+        "enable80211k": null,
+        "enable80211v": null
       },
-      "is2dot4GHz" : {
+      "is2dot4GHz": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzU" : {
+      "is5GHzU": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       },
-      "is5GHzL" : {
+      "is5GHzL": {
-        "model_type" : "RadioBasedSsidConfiguration",
+        "model_type": "RadioBasedSsidConfiguration",
-        "enable80211r" : null,
+        "enable80211r": null,
-        "enable80211k" : null,
+        "enable80211k": null,
-        "enable80211v" : null
+        "enable80211v": null
       }
     },
-    "bonjourGatewayProfileId" : null,
+    "bonjourGatewayProfileId": null,
-    "enable80211w" : null,
+    "enable80211w": null,
-    "wepConfig" : null,
+    "wepConfig": null,
-    "forwardMode" : null,
+    "forwardMode": null,
-    "profileType" : "ssid"
+    "profileType": "ssid"
   },
-  "createdTimestamp" : 1590607073065,
+  "createdTimestamp": 1591654301763,
-  "lastModifiedTimestamp" : 1590607073065,
+  "lastModifiedTimestamp": 1591654301763,
-  "childProfileIds" : [ ]
+  "childProfileIds": []
 }
 ]

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

@@ -3,7 +3,7 @@
   "radioConfig" : {
     "model_type" : "OpensyncAPRadioConfig",
     "country" : "CA",
-    "radioChannel24G" : 1,
+    "radioChannel24G" : 6,
     "radioChannel5LG" : 44,
     "radioChannel5HG" : 108
   },

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

@@ -11,7 +11,8 @@
     <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"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.telecominfraproject.wlan.opensync.experiment.OpenSyncProcess"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="opensync-gateway-static-process"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-static-process"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.ovsdb.customerEquipmentFileName=${project_loc:opensync-ext-static}/src/main/resources/EquipmentExample.json&#10;-Dconnectus.ovsdb.apProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileAPExample.json&#10;-Dconnectus.ovsdb.ssidProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileSsid.json&#10;-Dconnectus.ovsdb.locationFileName=${project_loc:opensync-ext-static}/src/main/resources/LocationBuildingExample.json&#10;&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dspring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth,opensync_static_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.ovsdb.customerEquipmentFileName=${project_loc:opensync-ext-static}/src/main/resources/EquipmentExample.json&#10;-Dconnectus.ovsdb.apProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileAPExample.json&#10;-Dconnectus.ovsdb.ssidProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileSsid.json&#10;-Dconnectus.ovsdb.locationFileName=${project_loc:opensync-ext-static}/src/main/resources/LocationBuildingExample.json&#10;-Dconnectus.ovsdb.radiusProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileRadius.json&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dspring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth,opensync_static_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
 </launchConfiguration>

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

@@ -186,15 +186,6 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
         String apId = clientCn + "_" + connectNodeInfo.serialNumber;
         OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
 
-        ovsdbDao.configureStats(ovsdbClient);
-
-        // Check if device stats is configured in Wifi_Stats_Config table,
-        // provision it
-        // if needed
-        if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
-            ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
-        }
-
         try {
             ovsdbDao.provisionBridgePortInterface(ovsdbClient);
         }
@@ -210,6 +201,15 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
             ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
         }
         
+        ovsdbDao.configureStats(ovsdbClient);
+
+        // Check if device stats is configured in Wifi_Stats_Config table,
+        // provision it
+        // if needed
+        if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
+            ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
+        }
+
         // ovsdbDao.configureWifiInet(ovsdbClient);
 
         LOG.debug("Client connect Done");

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

@@ -12,6 +12,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,6 +43,9 @@ import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiRadioConfigInf
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiStatsConfigInfo;
 import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiVifConfigInfo;
 import com.telecominfraproject.wlan.profile.models.Profile;
+import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile;
+import com.telecominfraproject.wlan.profile.radius.models.RadiusServer;
+import com.telecominfraproject.wlan.profile.radius.models.RadiusServiceRegion;
 import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
 import com.vmware.ovsdb.exception.OvsdbClientException;
 import com.vmware.ovsdb.protocol.methods.RowUpdate;
@@ -70,6 +74,9 @@ public class OvsdbDao {
 	@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.managerAddr:3.88.149.10}")
 	private String managerIpAddr;
 
+	@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.region:Ottawa}")
+	public String region;
+
 	@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.listenPort:6640}")
 	private int ovsdbListenPort;
 
@@ -1973,18 +1980,46 @@ public class OvsdbDao {
 					opensyncSecurityMode = "WPA-PSK";
 				} else if (ssidSecurityMode.equals("wep")) {
 					opensyncSecurityMode = "WEP";
-				} else if (ssidSecurityMode.equals("wepEAP")) {
+				} else if (ssidSecurityMode.equals("wpaEAP")) {
-					opensyncSecurityMode = "WEP-EAP";
+					opensyncSecurityMode = "WPA-EAP";
+
 				}
 
 				security.put("encryption", opensyncSecurityMode);
 				// key and mode is N/A for OPEN security
 				if (!opensyncSecurityMode.equals("OPEN")) {
-					security.put("key", ssidConfig.getKeyStr());
+					if (ssidSecurityMode.equals("wpa2PSK") || ssidSecurityMode.equals("wpa2OnlyPSK")) {
-					if (ssidSecurityMode.equals("wpa2PSK") || ssidSecurityMode.equals("wepEAP")
+						security.put("key", ssidConfig.getKeyStr());
-							|| ssidSecurityMode.equals("wpa2OnlyPSK")) {
 						security.put("mode", "2");
+					} else if (opensyncSecurityMode.equals("WPA-EAP")) {
+						security.put("mode", "2");
+						// Has Radius ?
+						List<Profile> radiusServiceList = new ArrayList<Profile>();
+						radiusServiceList = opensyncApConfig.getRadiusProfiles().stream()
+								.filter(p -> p.getName().equals((ssidConfig.getRadiusServiceName())))
+								.collect(Collectors.toList());
+						if (!radiusServiceList.isEmpty()) {
+							Profile profileRadius = radiusServiceList.get(0);
+							String region = opensyncApConfig.getEquipmentLocation().getName();
+							List<RadiusServer> radiusServerList = new ArrayList<RadiusServer>();
+							RadiusProfile radiusProfileDetails = ((RadiusProfile) profileRadius.getDetails());
+							LOG.debug("Radius Profile Details {}", radiusProfileDetails.toPrettyString());
+							RadiusServiceRegion radiusServiceRegion = radiusProfileDetails.findServiceRegion(region);
+							LOG.debug("Radius Service Region {}", radiusServiceRegion.toPrettyString());
+
+							radiusServerList = radiusServiceRegion
+									.findServerConfiguration(ssidConfig.getRadiusServiceName());
+							if (!radiusServerList.isEmpty()) {
+
+								RadiusServer rServer = radiusServerList.get(0);
+								security.put("radius_server_ip", rServer.getIpAddress().getHostAddress());
+								security.put("radius_server_port", String.valueOf(rServer.getAuthPort()));
+								security.put("radius_server_secret", rServer.getSecret());
+
+							}
+						}
 					} else {
+						security.put("key", ssidConfig.getKeyStr());
 						security.put("mode", "1");
 					}
 				}
@@ -2247,7 +2282,6 @@ public class OvsdbDao {
 
 		try {
 			List<Operation> operations = new ArrayList<>();
-			Map<String, Value> updateColumns = new HashMap<>();
 			Map<String, Integer> thresholdMap = new HashMap<>();
 			thresholdMap.put("max_delay", 600);
 			thresholdMap.put("util", 10);
@@ -2256,15 +2290,15 @@ public class OvsdbDao {
 			com.vmware.ovsdb.protocol.operation.notation.Map<String, Integer> thresholds = com.vmware.ovsdb.protocol.operation.notation.Map
 					.of(thresholdMap);
 
-//            provisionWifiStatsConfigDevice(getProvisionedWifiStatsConfigs(ovsdbClient), operations, updateColumns);
+			Map<String, WifiRadioConfigInfo> radioConfigs = getProvisionedWifiRadioConfigs(ovsdbClient);
+			provisionWifiStatsConfigSurvey(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations,
+					thresholds);
 
-			provisionWifiStatsConfigSurvey(getProvisionedWifiStatsConfigs(ovsdbClient), operations, thresholds);
+			provisionWifiStatsConfigNeighbor(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
 
-			provisionWifiStatsConfigNeighbor(getProvisionedWifiStatsConfigs(ovsdbClient), operations);
+			provisionWifiStatsConfigClient(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
 
-			provisionWifiStatsConfigClient(getProvisionedWifiStatsConfigs(ovsdbClient), operations);
+			provisionWifiStatsRssi(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
-
-			provisionWifiStatsRssi(getProvisionedWifiStatsConfigs(ovsdbClient), operations);
 
 			if (!operations.isEmpty()) {
 				CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
@@ -2284,66 +2318,130 @@ public class OvsdbDao {
 		}
 	}
 
-	private void provisionWifiStatsRssi(Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs,
+	private void provisionWifiStatsRssi(Map<String, WifiRadioConfigInfo> radioConfigs,
-			List<Operation> operations) {
+			Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) {
-		Map<String, Value> updateColumns;
+
-		Row row;
+		radioConfigs.values().stream().forEach(rc -> {
-		for (String band : new String[] { "2.4G", "5GL", "5GU" }) {
+			if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_rssi")) {
-			if (!provisionedWifiStatsConfigs.containsKey(band + "_rssi_on-chan")) {
+				//
-				updateColumns = new HashMap<>();
+				Map<String, Value> rowColumns = new HashMap<>();
-				updateColumns.put("radio_type", new Atom<>(band));
+				Set<Long> channelSet = new HashSet<Long>();
-				updateColumns.put("reporting_count", new Atom<>(0));
+				channelSet.add(Long.valueOf(rc.channel));
-				updateColumns.put("reporting_interval", new Atom<>(60));
+				rowColumns.put("channel_list", com.vmware.ovsdb.protocol.operation.notation.Set.of(channelSet));
-				updateColumns.put("sampling_interval", new Atom<>(10));
+				rowColumns.put("radio_type", new Atom<>(rc.freqBand));
-				updateColumns.put("stats_type", new Atom<>("rssi"));
+				rowColumns.put("reporting_interval", new Atom<>(30));
-				updateColumns.put("survey_interval_ms", new Atom<>(0));
+				rowColumns.put("sampling_interval", new Atom<>(3));
-				updateColumns.put("survey_type", new Atom<>("on-chan"));
+				rowColumns.put("stats_type", new Atom<>("rssi"));
-				row = new Row(updateColumns);
+				rowColumns.put("survey_interval_ms", new Atom<>(30));
+				rowColumns.put("report_type", new Atom<>("raw"));
+//				rowColumns.put("survey_type", new Atom<>("on-chan"));
+
+				Row updateRow = new Row(rowColumns);
+				operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
 
-				operations.add(new Insert(wifiStatsConfigDbTable, row));
 			}
-
+		});
-		}
 	}
 
-	private void provisionWifiStatsConfigNeighbor(Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs,
+	private void provisionWifiStatsConfigNeighbor(Map<String, WifiRadioConfigInfo> radioConfigs,
-			List<Operation> operations) {
+			Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) {
 		Map<String, Value> updateColumns;
 		Row row;
 
+		// For off channel, all allowed channels
+//		* 2412 MHz [1] (30.0 dBm)
+//		* 2417 MHz [2] (30.0 dBm)
+//		* 2422 MHz [3] (30.0 dBm)
+//		* 2427 MHz [4] (30.0 dBm)
+//		* 2432 MHz [5] (30.0 dBm)
+//		* 2437 MHz [6] (30.0 dBm)
+//		* 2442 MHz [7] (30.0 dBm)
+//		* 2447 MHz [8] (30.0 dBm)
+//		* 2452 MHz [9] (30.0 dBm)
+//		* 2457 MHz [10] (30.0 dBm)
+//		* 2462 MHz [11] (30.0 dBm)
 		Set<Integer> channelSet2g = new HashSet<>();
 		channelSet2g.add(1);
+//		channelSet2g.add(2);
+//		channelSet2g.add(3);
+//		channelSet2g.add(4);
+//		channelSet2g.add(5);
 		channelSet2g.add(6);
+//		channelSet2g.add(7);
+//		channelSet2g.add(8);
+//		channelSet2g.add(9);
+//		channelSet2g.add(10);
 		channelSet2g.add(11);
+
 		com.vmware.ovsdb.protocol.operation.notation.Set channels2g = com.vmware.ovsdb.protocol.operation.notation.Set
 				.of(channelSet2g);
 
 		Set<Integer> channelSet5gl = new HashSet<>();
+//		* 5180 MHz [36] (23.0 dBm)
+//		* 5200 MHz [40] (23.0 dBm)
+//		* 5220 MHz [44] (23.0 dBm)
+//		* 5240 MHz [48] (23.0 dBm)
+//		* 5260 MHz [52] (24.0 dBm) (radar detection)
+//		* 5280 MHz [56] (24.0 dBm) (radar detection)
+//		* 5300 MHz [60] (24.0 dBm) (radar detection)
+//		* 5320 MHz [64] (24.0 dBm) (radar detection)
 		channelSet5gl.add(36);
+		channelSet5gl.add(40);
 		channelSet5gl.add(44);
-		channelSet5gl.add(52);
+		channelSet5gl.add(48);
+//		channelSet5gl.add(52);
+//		channelSet5gl.add(56);
+//		channelSet5gl.add(60);
+//		channelSet5gl.add(64);
 		com.vmware.ovsdb.protocol.operation.notation.Set channels5gl = com.vmware.ovsdb.protocol.operation.notation.Set
 				.of(channelSet5gl);
 
 		Set<Integer> channelSet5gu = new HashSet<>();
-		channelSet5gu.add(100);
+//		* 5500 MHz [100] (24.0 dBm) (radar detection)
-		channelSet5gu.add(108);
+//		* 5520 MHz [104] (24.0 dBm) (radar detection)
-		channelSet5gu.add(116);
+//		* 5540 MHz [108] (24.0 dBm) (radar detection)
+//		* 5560 MHz [112] (24.0 dBm) (radar detection)
+//		* 5580 MHz [116] (24.0 dBm) (radar detection)
+//		* 5600 MHz [120] (disabled)
+//		* 5620 MHz [124] (disabled)
+//		* 5640 MHz [128] (disabled)
+//		* 5660 MHz [132] (24.0 dBm) (radar detection)
+//		* 5680 MHz [136] (24.0 dBm) (radar detection)
+//		* 5700 MHz [140] (24.0 dBm) (radar detection)
+//		* 5720 MHz [144] (24.0 dBm) (radar detection)
+//		* 5745 MHz [149] (30.0 dBm)
+//		* 5765 MHz [153] (30.0 dBm)
+//		* 5785 MHz [157] (30.0 dBm)
+//		* 5805 MHz [161] (30.0 dBm)
+//		* 5825 MHz [165] (30.0 dBm)
+//		channelSet5gu.add(100);
+//		channelSet5gu.add(104);
+//		channelSet5gu.add(108);
+//		channelSet5gu.add(112);
+//		channelSet5gu.add(116);
+//		channelSet5gu.add(132);
+//		channelSet5gu.add(136);
+//		channelSet5gu.add(140);
+//		channelSet5gu.add(144);
+		channelSet5gu.add(149);
+		channelSet5gu.add(153);
+		channelSet5gu.add(157);
+		channelSet5gu.add(161);
+		channelSet5gu.add(165);
+
 		com.vmware.ovsdb.protocol.operation.notation.Set channels5gu = com.vmware.ovsdb.protocol.operation.notation.Set
 				.of(channelSet5gu);
 
 		if (!provisionedWifiStatsConfigs.containsKey("2.4G_neighbor_off-chan")) {
-
 			updateColumns = new HashMap<>();
 			updateColumns.put("channel_list", channels2g);
 			updateColumns.put("radio_type", new Atom<>("2.4G"));
-			updateColumns.put("reporting_interval", new Atom<>(120));
+			updateColumns.put("reporting_interval", new Atom<>(1800));
-			updateColumns.put("sampling_interval", new Atom<>(0));
+			updateColumns.put("report_type", new Atom<>("raw"));
+			updateColumns.put("sampling_interval", new Atom<>(60));
 			updateColumns.put("stats_type", new Atom<>("neighbor"));
-			updateColumns.put("survey_interval_ms", new Atom<>(0));
+			updateColumns.put("survey_interval_ms", new Atom<>(30));
 			updateColumns.put("survey_type", new Atom<>("off-chan"));
-			// updateColumns.put("threshold", thresholds );
-
 			row = new Row(updateColumns);
 			operations.add(new Insert(wifiStatsConfigDbTable, row));
 
@@ -2354,13 +2452,12 @@ public class OvsdbDao {
 			updateColumns = new HashMap<>();
 			updateColumns.put("channel_list", channels5gl);
 			updateColumns.put("radio_type", new Atom<>("5GL"));
-			updateColumns.put("reporting_interval", new Atom<>(120));
+			updateColumns.put("reporting_interval", new Atom<>(1800));
-			updateColumns.put("sampling_interval", new Atom<>(0));
+			updateColumns.put("report_type", new Atom<>("raw"));
+			updateColumns.put("sampling_interval", new Atom<>(45));
 			updateColumns.put("stats_type", new Atom<>("neighbor"));
-			updateColumns.put("survey_interval_ms", new Atom<>(0));
+			updateColumns.put("survey_interval_ms", new Atom<>(30));
 			updateColumns.put("survey_type", new Atom<>("off-chan"));
-			// updateColumns.put("threshold", thresholds );
-
 			row = new Row(updateColumns);
 			operations.add(new Insert(wifiStatsConfigDbTable, row));
 
@@ -2371,72 +2468,43 @@ public class OvsdbDao {
 			updateColumns = new HashMap<>();
 			updateColumns.put("channel_list", channels5gu);
 			updateColumns.put("radio_type", new Atom<>("5GU"));
-			updateColumns.put("reporting_interval", new Atom<>(120));
+			updateColumns.put("reporting_interval", new Atom<>(1800));
-			updateColumns.put("sampling_interval", new Atom<>(0));
+			updateColumns.put("report_type", new Atom<>("raw"));
+			updateColumns.put("sampling_interval", new Atom<>(36));
 			updateColumns.put("stats_type", new Atom<>("neighbor"));
-			updateColumns.put("survey_interval_ms", new Atom<>(0));
+			updateColumns.put("survey_interval_ms", new Atom<>(30));
 			updateColumns.put("survey_type", new Atom<>("off-chan"));
-			// updateColumns.put("threshold", thresholds );
-
 			row = new Row(updateColumns);
 			operations.add(new Insert(wifiStatsConfigDbTable, row));
 
 		}
 
-		if (!provisionedWifiStatsConfigs.containsKey("5GU_neighbor_on-chan")) {
+		radioConfigs.values().stream().forEach(rc -> {
-			//
+			if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_neighbor_on-chan")) {
-			updateColumns = new HashMap<>();
+				//
-			// updateColumns.put("channel_list", channels );
+				Map<String, Value> rowColumns = new HashMap<>();
-			updateColumns.put("radio_type", new Atom<>("5GU"));
+				Set<Long> channelSet = new HashSet<Long>();
-			updateColumns.put("reporting_interval", new Atom<>(60));
+				channelSet.add(Long.valueOf(rc.channel));
-			updateColumns.put("sampling_interval", new Atom<>(0));
+				rowColumns.put("channel_list", com.vmware.ovsdb.protocol.operation.notation.Set.of(channelSet));
-			updateColumns.put("stats_type", new Atom<>("neighbor"));
+				rowColumns.put("radio_type", new Atom<>(rc.freqBand));
-			updateColumns.put("survey_interval_ms", new Atom<>(0));
+				rowColumns.put("reporting_interval", new Atom<>(60));
-			updateColumns.put("survey_type", new Atom<>("on-chan"));
+				rowColumns.put("report_type", new Atom<>("raw"));
-			// updateColumns.put("threshold", thresholds );
+				rowColumns.put("sampling_interval", new Atom<>(6));
+				rowColumns.put("stats_type", new Atom<>("neighbor"));
+				rowColumns.put("survey_interval_ms", new Atom<>(30));
+				rowColumns.put("survey_type", new Atom<>("on-chan"));
 
-			row = new Row(updateColumns);
+				Row updateRow = new Row(rowColumns);
-			operations.add(new Insert(wifiStatsConfigDbTable, row));
+				operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
-			//
-		}
 
-		if (!provisionedWifiStatsConfigs.containsKey("5GL_neighbor_on-chan")) {
+			}
-			//
+		});
-			updateColumns = new HashMap<>();
-			// updateColumns.put("channel_list", channels );
-			updateColumns.put("radio_type", new Atom<>("5GL"));
-			updateColumns.put("reporting_interval", new Atom<>(60));
-			updateColumns.put("sampling_interval", new Atom<>(0));
-			updateColumns.put("stats_type", new Atom<>("neighbor"));
-			updateColumns.put("survey_interval_ms", new Atom<>(0));
-			updateColumns.put("survey_type", new Atom<>("on-chan"));
-			// updateColumns.put("threshold", thresholds );
 
-			row = new Row(updateColumns);
-			operations.add(new Insert(wifiStatsConfigDbTable, row));
-			//
-		}
-
-		if (!provisionedWifiStatsConfigs.containsKey("2.4G_neighbor_on-chan")) {
-			//
-			updateColumns = new HashMap<>();
-			// updateColumns.put("channel_list", channels );
-			updateColumns.put("radio_type", new Atom<>("2.4G"));
-			updateColumns.put("reporting_interval", new Atom<>(60));
-			updateColumns.put("sampling_interval", new Atom<>(0));
-			updateColumns.put("stats_type", new Atom<>("neighbor"));
-			updateColumns.put("survey_interval_ms", new Atom<>(0));
-			updateColumns.put("survey_type", new Atom<>("on-chan"));
-			// updateColumns.put("threshold", thresholds );
-
-			row = new Row(updateColumns);
-			operations.add(new Insert(wifiStatsConfigDbTable, row));
-			//
-		}
 	}
 
-	private void provisionWifiStatsConfigSurvey(Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs,
+	private void provisionWifiStatsConfigSurvey(Map<String, WifiRadioConfigInfo> radioConfigs,
-			List<Operation> operations, com.vmware.ovsdb.protocol.operation.notation.Map<String, Integer> thresholds) {
+			Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations,
+			com.vmware.ovsdb.protocol.operation.notation.Map<String, Integer> thresholds) {
 
 		Set<Integer> channelSet2g = new HashSet<>();
 		channelSet2g.add(1);
@@ -2447,167 +2515,122 @@ public class OvsdbDao {
 
 		Set<Integer> channelSet5gl = new HashSet<>();
 		channelSet5gl.add(36);
+		channelSet5gl.add(40);
 		channelSet5gl.add(44);
-		channelSet5gl.add(52);
+		channelSet5gl.add(48);
 		com.vmware.ovsdb.protocol.operation.notation.Set channels5gl = com.vmware.ovsdb.protocol.operation.notation.Set
 				.of(channelSet5gl);
 
 		Set<Integer> channelSet5gu = new HashSet<>();
-		channelSet5gu.add(100);
+		channelSet5gu.add(149);
-		channelSet5gu.add(108);
+		channelSet5gu.add(153);
-		channelSet5gu.add(116);
+		channelSet5gu.add(157);
+		channelSet5gu.add(161);
+		channelSet5gu.add(165);
 		com.vmware.ovsdb.protocol.operation.notation.Set channels5gu = com.vmware.ovsdb.protocol.operation.notation.Set
 				.of(channelSet5gu);
 
 		Map<String, Value> updateColumns;
 		Row row;
 
-		if (!provisionedWifiStatsConfigs.containsKey("2.4G_survey_on-chan")) {
+		radioConfigs.values().stream().forEach(rc -> {
-			//
+			if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_survey_on-chan")) {
-			updateColumns = new HashMap<>();
-			updateColumns.put("radio_type", new Atom<>("2.4G"));
-			updateColumns.put("reporting_count", new Atom<>(0));
-			updateColumns.put("reporting_interval", new Atom<>(60));
-			updateColumns.put("sampling_interval", new Atom<>(10));
-			updateColumns.put("stats_type", new Atom<>("survey"));
-			updateColumns.put("survey_interval_ms", new Atom<>(0));
-			updateColumns.put("survey_type", new Atom<>("on-chan"));
-			row = new Row(updateColumns);
-			operations.add(new Insert(wifiStatsConfigDbTable, row));
-			//
-		}
 
-		if (!provisionedWifiStatsConfigs.containsKey("5GL_survey_on-chan")) {
+				Map<String, Value> rowColumns = new HashMap<>();
-			//
+				Set<Long> channelSet = new HashSet<Long>();
-			updateColumns = new HashMap<>();
+				channelSet.add(Long.valueOf(rc.channel));
-			updateColumns.put("radio_type", new Atom<>("5GL"));
+				rowColumns.put("channel_list", com.vmware.ovsdb.protocol.operation.notation.Set.of(channelSet));
-			updateColumns.put("reporting_count", new Atom<>(0));
+				rowColumns.put("radio_type", new Atom<>(rc.freqBand));
-			updateColumns.put("reporting_interval", new Atom<>(60));
+				rowColumns.put("reporting_interval", new Atom<>(60));
-			updateColumns.put("sampling_interval", new Atom<>(10));
+				rowColumns.put("report_type", new Atom<>("raw"));
-			updateColumns.put("stats_type", new Atom<>("survey"));
+				rowColumns.put("sampling_interval", new Atom<>(6));
-			updateColumns.put("survey_interval_ms", new Atom<>(0));
+				rowColumns.put("stats_type", new Atom<>("survey"));
-			updateColumns.put("survey_type", new Atom<>("on-chan"));
+				rowColumns.put("survey_interval_ms", new Atom<>(30));
-			row = new Row(updateColumns);
+				rowColumns.put("survey_type", new Atom<>("on-chan"));
-			operations.add(new Insert(wifiStatsConfigDbTable, row));
-			//
-		}
 
-		if (!provisionedWifiStatsConfigs.containsKey("5GU_survey_on-chan")) {
+				Row updateRow = new Row(rowColumns);
-			updateColumns = new HashMap<>();
+				operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
-			updateColumns.put("radio_type", new Atom<>("5GU"));
+
-			updateColumns.put("reporting_count", new Atom<>(0));
+			}
-			updateColumns.put("reporting_interval", new Atom<>(60));
+		});
-			updateColumns.put("sampling_interval", new Atom<>(10));
-			updateColumns.put("stats_type", new Atom<>("survey"));
-			updateColumns.put("survey_interval_ms", new Atom<>(0));
-			updateColumns.put("survey_type", new Atom<>("on-chan"));
-			row = new Row(updateColumns);
-			operations.add(new Insert(wifiStatsConfigDbTable, row));
-		}
 
 		if (!provisionedWifiStatsConfigs.containsKey("2.4G_survey_off-chan")) {
-			//
+
 			updateColumns = new HashMap<>();
 			updateColumns.put("channel_list", channels2g);
 			updateColumns.put("radio_type", new Atom<>("2.4G"));
-			updateColumns.put("reporting_interval", new Atom<>(0));
+			updateColumns.put("reporting_interval", new Atom<>(1800));
-			updateColumns.put("sampling_interval", new Atom<>(0));
+			updateColumns.put("report_type", new Atom<>("raw"));
+			updateColumns.put("sampling_interval", new Atom<>(60));
 			updateColumns.put("stats_type", new Atom<>("survey"));
-			updateColumns.put("survey_interval_ms", new Atom<>(10));
+			updateColumns.put("survey_interval_ms", new Atom<>(30));
 			updateColumns.put("survey_type", new Atom<>("off-chan"));
 			updateColumns.put("threshold", thresholds);
 			row = new Row(updateColumns);
 			operations.add(new Insert(wifiStatsConfigDbTable, row));
-			//
+
 		}
 
 		if (!provisionedWifiStatsConfigs.containsKey("5GL_survey_off-chan")) {
-			//
+
 			updateColumns = new HashMap<>();
 			updateColumns.put("channel_list", channels5gl);
 			updateColumns.put("radio_type", new Atom<>("5GL"));
-			updateColumns.put("reporting_interval", new Atom<>(0));
+			updateColumns.put("reporting_interval", new Atom<>(1800));
-			updateColumns.put("sampling_interval", new Atom<>(0));
+			updateColumns.put("report_type", new Atom<>("raw"));
+			updateColumns.put("sampling_interval", new Atom<>(45));
 			updateColumns.put("stats_type", new Atom<>("survey"));
-			updateColumns.put("survey_interval_ms", new Atom<>(10));
+			updateColumns.put("survey_interval_ms", new Atom<>(30));
 			updateColumns.put("survey_type", new Atom<>("off-chan"));
 			updateColumns.put("threshold", thresholds);
 			row = new Row(updateColumns);
 			operations.add(new Insert(wifiStatsConfigDbTable, row));
-			//
+
 		}
 
 		if (!provisionedWifiStatsConfigs.containsKey("5GU_survey_off-chan")) {
-			//
+
 			updateColumns = new HashMap<>();
 			updateColumns.put("channel_list", channels5gu);
 			updateColumns.put("radio_type", new Atom<>("5GU"));
-			updateColumns.put("reporting_interval", new Atom<>(0));
+			updateColumns.put("reporting_interval", new Atom<>(1800));
-			updateColumns.put("sampling_interval", new Atom<>(0));
+			updateColumns.put("report_type", new Atom<>("raw"));
+			updateColumns.put("sampling_interval", new Atom<>(30));
 			updateColumns.put("stats_type", new Atom<>("survey"));
-			updateColumns.put("survey_interval_ms", new Atom<>(10));
+			updateColumns.put("survey_interval_ms", new Atom<>(30));
 			updateColumns.put("survey_type", new Atom<>("off-chan"));
 			updateColumns.put("threshold", thresholds);
 			row = new Row(updateColumns);
 			operations.add(new Insert(wifiStatsConfigDbTable, row));
-			//
+
 		}
 
 	}
 
-//    private void provisionWifiStatsConfigDevice(Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs,
+	private void provisionWifiStatsConfigClient(Map<String, WifiRadioConfigInfo> radioConfigs,
-//            List<Operation> operations, Map<String, Value> updateColumns) {
+			Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) {
-//        Row row;
-//        if (!provisionedWifiStatsConfigs.containsKey("2.4G_device")) {
-//            updateColumns.put("radio_type", new Atom<>("2.4G"));
-//            updateColumns.put("reporting_interval", new Atom<>(900));
-//            updateColumns.put("sampling_interval", new Atom<>(0));
-//            updateColumns.put("stats_type", new Atom<>("device"));
-//            row = new Row(updateColumns);
-//            operations.add(new Insert(wifiStatsConfigDbTable, row));
-//        }
-//
-//    }
 
-	private void provisionWifiStatsConfigClient(Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs,
+		radioConfigs.values().stream().forEach(rc -> {
-			List<Operation> operations) {
+			if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_client")) {
-		Map<String, Value> updateColumns;
+				//
-		Row row;
+				Map<String, Value> rowColumns = new HashMap<>();
-		if (!provisionedWifiStatsConfigs.containsKey("2.4G_client")) {
+				Set<Long> channelSet = new HashSet<Long>();
-			updateColumns = new HashMap<>();
+				channelSet.add(Long.valueOf(rc.channel));
-			updateColumns.put("radio_type", new Atom<>("2.4G"));
+				rowColumns.put("channel_list", com.vmware.ovsdb.protocol.operation.notation.Set.of(channelSet));
-			updateColumns.put("reporting_count", new Atom<>(0));
+				rowColumns.put("radio_type", new Atom<>(rc.freqBand));
-			updateColumns.put("reporting_interval", new Atom<>(60));
+				rowColumns.put("reporting_interval", new Atom<>(60));
-			updateColumns.put("sampling_interval", new Atom<>(10));
+				rowColumns.put("report_type", new Atom<>("raw"));
-			updateColumns.put("stats_type", new Atom<>("client"));
+				rowColumns.put("sampling_interval", new Atom<>(6));
-			row = new Row(updateColumns);
+				rowColumns.put("stats_type", new Atom<>("client"));
-			operations.add(new Insert(wifiStatsConfigDbTable, row));
+				rowColumns.put("survey_interval_ms", new Atom<>(30));
-		}
+//				rowColumns.put("survey_type", new Atom<>("on-chan"));
 
-		if (!provisionedWifiStatsConfigs.containsKey("5GL_client")) {
+				Row updateRow = new Row(rowColumns);
+				operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
 
-			updateColumns = new HashMap<>();
+			}
-			updateColumns.put("radio_type", new Atom<>("5GL"));
+		});
-			updateColumns.put("reporting_count", new Atom<>(0));
-			updateColumns.put("reporting_interval", new Atom<>(60));
-			updateColumns.put("sampling_interval", new Atom<>(10));
-			updateColumns.put("stats_type", new Atom<>("client"));
-			row = new Row(updateColumns);
-			operations.add(new Insert(wifiStatsConfigDbTable, row));
 
-		}
-
-		if (!provisionedWifiStatsConfigs.containsKey("5GU_client")) {
-
-			updateColumns = new HashMap<>();
-			updateColumns.put("radio_type", new Atom<>("5GU"));
-			updateColumns.put("reporting_count", new Atom<>(0));
-			updateColumns.put("reporting_interval", new Atom<>(60));
-			updateColumns.put("sampling_interval", new Atom<>(10));
-			updateColumns.put("stats_type", new Atom<>("client"));
-			row = new Row(updateColumns);
-			operations.add(new Insert(wifiStatsConfigDbTable, row));
-		}
 	}
 
 	public String changeRedirectorAddress(OvsdbClient ovsdbClient, String apId, String newRedirectorAddress) {