scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-01 02:57:49 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Compare commits

base: scottk:20201204-1.0
Branches Tags
scottk:master scottk:release/v1.2 scottk:WIFI-7889-fix-clientdisconnectedevents-handling scottk:WIFI-7888-burst-config-push-handling scottk:WIFI-7823-ctxRoutingId-disconnect scottk:WIFI-7708-add-bssid scottk:NE-4690/portMismatch scottk:WIFI-7588-disconnecting-client-sessions scottk:WIFI-7579-update-default-auto-upgrade scottk:WIFI-7514-init-dhcp-lease-when-connected scottk:WIFI-7336-2 scottk:WIFI-7323 scottk:WIFI-6721-manual-radproxy-gateway scottk:WIFI-5112-bugfix-passpoint-ssid-association scottk:WIFI-4417-2 scottk:WIFI-4415 scottk:WIFI-4732 scottk:WIFI-2079-master scottk:WIFI-3471 scottk:WIFI-3358 scottk:WIFI-3344 scottk:WIFI-3129 scottk:WIFI-3216 scottk:change_sessionId_to_String scottk:release/v1.1 scottk:release/v1.1.x scottk:hotfix/netexp-2342 scottk:hotfix/NETEXP-2077 scottk:WIFI-2519-clientTxFrames scottk:WIFI-2434 scottk:WIFI-2096 scottk:WIFI-2026 scottk:WIFI-2007 scottk:WIFI-1669 scottk:release-testing2/20201203-1.0 scottk:release-testing scottk:testv1.0 scottk:hotfix/cannot-resolve-ProfileVenueTypeAssignment-as-type-id scottk:feature/NETEXP-485 scottk:WIFI-797-Rf-Source-Control scottk:TOOLS-23-sonar
scottk:20201204-1.0 scottk:20201203-1.0 scottk:1.0
...
compare: scottk:WIFI-797-Rf-Source-Control
Branches Tags
scottk:release/v1.2 scottk:WIFI-7889-fix-clientdisconnectedevents-handling scottk:WIFI-7888-burst-config-push-handling scottk:WIFI-7823-ctxRoutingId-disconnect scottk:WIFI-7708-add-bssid scottk:NE-4690/portMismatch scottk:WIFI-7588-disconnecting-client-sessions scottk:WIFI-7579-update-default-auto-upgrade scottk:WIFI-7514-init-dhcp-lease-when-connected scottk:WIFI-7336-2 scottk:WIFI-7323 scottk:WIFI-6721-manual-radproxy-gateway scottk:WIFI-5112-bugfix-passpoint-ssid-association scottk:WIFI-4417-2 scottk:WIFI-4415 scottk:WIFI-4732 scottk:master scottk:WIFI-2079-master scottk:WIFI-3471 scottk:WIFI-3358 scottk:WIFI-3344 scottk:WIFI-3129 scottk:WIFI-3216 scottk:change_sessionId_to_String scottk:release/v1.1 scottk:release/v1.1.x scottk:hotfix/netexp-2342 scottk:hotfix/NETEXP-2077 scottk:WIFI-2519-clientTxFrames scottk:WIFI-2434 scottk:WIFI-2096 scottk:WIFI-2026 scottk:WIFI-2007 scottk:WIFI-1669 scottk:release-testing2/20201203-1.0 scottk:release-testing scottk:testv1.0 scottk:hotfix/cannot-resolve-ProfileVenueTypeAssignment-as-type-id scottk:feature/NETEXP-485 scottk:WIFI-797-Rf-Source-Control scottk:TOOLS-23-sonar
scottk:20201204-1.0 scottk:20201203-1.0 scottk:1.0

5 Commits
20201204-1 ... WIFI-797-R

Author SHA1 Message Date
ralphlee
b776610d5e Removing unused imports 2020-10-21 15:03:49 -04:00
ralphlee
f9eb99ae65 Merge branch 'master' of github.com:Telecominfraproject/wlan-cloud-opensync-controller into WIFI-797-Rf-Source-Control 2020-10-21 09:53:37 -04:00
ralphlee
fc19bc59df Null check on rfConfig 2020-10-21 09:30:03 -04:00
ralphlee
d5b534c025 Spacing fix 2020-10-20 20:02:12 -04:00
ralphlee
ffc07452c6 Implementing SourceSelection on RRM parameters, updating static json 2020-10-20 16:59:26 -04:00
10 changed files with 413 additions and 623 deletions
Expand all files Collapse all files

46
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -30,10 +30,11 @@ import com.telecominfraproject.wlan.client.session.models.ClientDhcpDetails;
import com.telecominfraproject.wlan.client.session.models.ClientSession; import com.telecominfraproject.wlan.client.session.models.ClientSession;
import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails; import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
import com.telecominfraproject.wlan.core.model.entity.CountryCode; import com.telecominfraproject.wlan.core.model.entity.CountryCode;
import com.telecominfraproject.wlan.core.model.equipment.AutoOrManualValue;
import com.telecominfraproject.wlan.core.model.equipment.EquipmentType; import com.telecominfraproject.wlan.core.model.equipment.EquipmentType;
import com.telecominfraproject.wlan.core.model.equipment.MacAddress; import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
import com.telecominfraproject.wlan.core.model.equipment.RadioType; import com.telecominfraproject.wlan.core.model.equipment.RadioType;
import com.telecominfraproject.wlan.core.model.equipment.SourceSelectionValue;
import com.telecominfraproject.wlan.core.model.equipment.SourceType;
import com.telecominfraproject.wlan.core.model.pagination.PaginationContext; import com.telecominfraproject.wlan.core.model.pagination.PaginationContext;
import com.telecominfraproject.wlan.core.model.pagination.PaginationResponse; import com.telecominfraproject.wlan.core.model.pagination.PaginationResponse;
import com.telecominfraproject.wlan.customer.models.Customer; import com.telecominfraproject.wlan.customer.models.Customer;
@@ -285,36 +286,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
// one: // one:
Profile apProfile = createDefaultApProfile(ce, connectNodeInfo); Profile apProfile = createDefaultApProfile(ce, connectNodeInfo);
profileId = apProfile.getId(); profileId = apProfile.getId();
// Initialize equipment from RF Profile
ProfileContainer profileContainer = new ProfileContainer(
profileServiceInterface.getProfileWithChildren(profileId));
RfConfiguration rfConfig = (RfConfiguration) profileContainer.getChildOfTypeOrNull(profileId, ProfileType.rf)
.getDetails();
ApElementConfiguration config = (ApElementConfiguration) ce.getDetails();
Map<RadioType, ElementRadioConfiguration> baseRadioMap = config.getRadioMap();
Map<RadioType, RadioConfiguration> advRadioMap = config.getAdvancedRadioMap();
for (RadioType rType : config.getRadioMap().keySet()) {
ElementRadioConfiguration elementRadioConfig = baseRadioMap.get(rType);
RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(rType);
elementRadioConfig.setClientDisconnectThresholdDb(rfElementConfig.getClientDisconnectThresholdDb());
elementRadioConfig.setEirpTxPower(rfElementConfig.getEirpTxPower());
elementRadioConfig.setPerimeterDetectionEnabled(rfElementConfig.getPerimeterDetectionEnabled());
elementRadioConfig.setProbeResponseThresholdDb(rfElementConfig.getProbeResponseThresholdDb());
elementRadioConfig.setRxCellSizeDb(rfElementConfig.getRxCellSizeDb());
}
for (RadioType rType : config.getAdvancedRadioMap().keySet()) {
RadioConfiguration radioConfig = advRadioMap.get(rType);
RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(rType);
radioConfig.setBestApSettings(rfElementConfig.getBestApSettings());
radioConfig.setManagementRate(rfElementConfig.getManagementRate());
}
config.setAdvancedRadioMap(advRadioMap);
config.setRadioMap(baseRadioMap);
ce.setDetails(config);
} }
ce.setProfileId(profileId); ce.setProfileId(profileId);
@@ -1086,8 +1057,19 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
} }
if (radioState.getTxPower() > 0) { if (radioState.getTxPower() > 0) {
SourceType txPowerSource = apElementConfiguration.getRadioMap().get(radioState.getFreqBand())
.getEirpTxPower().getSource();
// Preserve the source while updating the value
if (txPowerSource == SourceType.auto) {
apElementConfiguration.getRadioMap().get(radioState.getFreqBand()) apElementConfiguration.getRadioMap().get(radioState.getFreqBand())
.setEirpTxPower(AutoOrManualValue.createManualInstance(radioState.getTxPower())); .setEirpTxPower(SourceSelectionValue.createAutomaticInstance(radioState.getTxPower()));
} else if (txPowerSource == SourceType.profile) {
apElementConfiguration.getRadioMap().get(radioState.getFreqBand())
.setEirpTxPower(SourceSelectionValue.createProfileInstance(radioState.getTxPower()));
} else {
apElementConfiguration.getRadioMap().get(radioState.getFreqBand())
.setEirpTxPower(SourceSelectionValue.createManualInstance(radioState.getTxPower()));
}
LOG.debug("Updated TxPower from Wifi_Radio_State table change for AP {}", apId); LOG.debug("Updated TxPower from Wifi_Radio_State table change for AP {}", apId);
} }

169
opensync-ext-static/src/main/resources/EquipmentExample.json
View File

@@ -38,37 +38,28 @@
"channelNumber": 6, "channelNumber": 6,
"manualChannelNumber": 6, "manualChannelNumber": 6,
"backupChannelNumber": 11, "backupChannelNumber": 11,
"autoChannelSelection": false,
"channelBandwidth": "is20MHz",
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
"bestAPSteerType": "both", "bestAPSteerType": "both",
"deauthAttackDetection": null, "deauthAttackDetection": null,
@@ -81,37 +72,28 @@
"channelNumber": 149, "channelNumber": 149,
"manualChannelNumber": 149, "manualChannelNumber": 149,
"backupChannelNumber": 154, "backupChannelNumber": 154,
"autoChannelSelection": false,
"channelBandwidth": "is80MHz",
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
"bestAPSteerType": "both", "bestAPSteerType": "both",
"deauthAttackDetection": null, "deauthAttackDetection": null,
@@ -124,37 +106,28 @@
"channelNumber": 36, "channelNumber": 36,
"manualChannelNumber": 36, "manualChannelNumber": 36,
"backupChannelNumber": 44, "backupChannelNumber": 44,
"autoChannelSelection": false,
"channelBandwidth": "is80MHz",
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
"bestAPSteerType": "both", "bestAPSteerType": "both",
"deauthAttackDetection": null, "deauthAttackDetection": null,
@@ -168,39 +141,25 @@
"radioType": "is2dot4GHz", "radioType": "is2dot4GHz",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"rtsCtsThreshold": 65535,
"autoChannelSelection": "disabled",
"radioMode": "modeN",
"mimoMode": "twoByTwo",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"maxNumClients": 100,
"stationIsolation": "disabled", "stationIsolation": "disabled",
"multicastRate": "auto", "managementRate": {
"managementRate": "auto", "model_type": "SourceSelectionManagement",
"activeScanSettings": { "source": "auto",
"model_type": "ActiveScanSettings", "value": "auto"
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
}, },
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 20, "dropInSnrPercentage": 30,
"minLoadFactor": 50 "minLoadFactor": 40
}
}, },
"forceScanDuringVoice": "disabled",
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"beaconInterval": 100,
"deauthAttackDetection": null "deauthAttackDetection": null
}, },
"is5GHzU": { "is5GHzU": {
@@ -208,39 +167,25 @@
"radioType": "is5GHzU", "radioType": "is5GHzU",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"rtsCtsThreshold": 65535,
"autoChannelSelection": "disabled",
"radioMode": "modeAC",
"mimoMode": "twoByTwo",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"maxNumClients": 100,
"stationIsolation": "disabled", "stationIsolation": "disabled",
"multicastRate": "auto", "managementRate": {
"managementRate": "auto", "model_type": "SourceSelectionManagement",
"activeScanSettings": { "source": "auto",
"model_type": "ActiveScanSettings", "value": "auto"
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
}, },
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
}
}, },
"forceScanDuringVoice": "disabled",
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"beaconInterval": 100,
"deauthAttackDetection": null "deauthAttackDetection": null
}, },
"is5GHzL": { "is5GHzL": {
@@ -248,39 +193,25 @@
"radioType": "is5GHzL", "radioType": "is5GHzL",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"rtsCtsThreshold": 65535,
"autoChannelSelection": "disabled",
"radioMode": "modeAC",
"mimoMode": "twoByTwo",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"maxNumClients": 100,
"stationIsolation": "disabled", "stationIsolation": "disabled",
"multicastRate": "auto", "managementRate": {
"managementRate": "auto", "model_type": "SourceSelectionManagement",
"activeScanSettings": { "source": "auto",
"model_type": "ActiveScanSettings", "value": "auto"
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
}, },
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
}
}, },
"forceScanDuringVoice": "disabled",
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"beaconInterval": 100,
"deauthAttackDetection": null "deauthAttackDetection": null
} }
} }

116
opensync-ext-static/src/main/resources/ProfileRf.json
View File

@@ -10,6 +10,8 @@
"is5GHz": { "is5GHz": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHz",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -25,26 +27,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -65,11 +51,14 @@
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
} },
"minAutoCellSize": -65
}, },
"is2dot4GHz": { "is2dot4GHz": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is2dot4GHz",
"radioMode": "modeN",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -85,26 +74,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -125,11 +98,14 @@
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 20, "dropInSnrPercentage": 20,
"minLoadFactor": 50 "minLoadFactor": 50
} },
"minAutoCellSize": -65
}, },
"is5GHzU": { "is5GHzU": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHzU",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -145,26 +121,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -185,11 +145,14 @@
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
} },
"minAutoCellSize": -65
}, },
"is5GHzL": { "is5GHzL": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHzL",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -205,26 +168,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -245,7 +192,8 @@
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
} },
"minAutoCellSize": -65
} }
}, },
"profileType": "rf" "profileType": "rf"

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

@@ -41,23 +41,23 @@
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
@@ -75,23 +75,23 @@
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
@@ -109,23 +109,23 @@
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
@@ -141,16 +141,23 @@
"radioType": "is2dot4GHz", "radioType": "is2dot4GHz",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"radioMode": "modeN",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"stationIsolation": "disabled", "stationIsolation": "disabled",
"managementRate": "auto", "managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"value": "auto"
},
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 20, "dropInSnrPercentage": 30,
"minLoadFactor": 50 "minLoadFactor": 40
}
}, },
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"deauthAttackDetection": null "deauthAttackDetection": null
@@ -160,16 +167,23 @@
"radioType": "is5GHzU", "radioType": "is5GHzU",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"radioMode": "modeAC",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"stationIsolation": "disabled", "stationIsolation": "disabled",
"managementRate": "auto", "managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"value": "auto"
},
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
}
}, },
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"deauthAttackDetection": null "deauthAttackDetection": null
@@ -179,16 +193,23 @@
"radioType": "is5GHzL", "radioType": "is5GHzL",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"radioMode": "modeAC",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"stationIsolation": "disabled", "stationIsolation": "disabled",
"managementRate": "auto", "managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"value": "auto"
},
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
}
}, },
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"deauthAttackDetection": null "deauthAttackDetection": null

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

@@ -10,6 +10,8 @@
"is5GHz": { "is5GHz": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHz",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -25,26 +27,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -71,6 +57,8 @@
"is2dot4GHz": { "is2dot4GHz": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is2dot4GHz",
"radioMode": "modeN",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -86,26 +74,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -132,6 +104,8 @@
"is5GHzU": { "is5GHzU": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHzU",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -147,26 +121,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -193,6 +151,8 @@
"is5GHzL": { "is5GHzL": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHzL",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -208,26 +168,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",

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

@@ -41,23 +41,23 @@
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
@@ -75,23 +75,23 @@
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
@@ -109,23 +109,23 @@
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
@@ -141,16 +141,23 @@
"radioType": "is2dot4GHz", "radioType": "is2dot4GHz",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"radioMode": "modeN",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"stationIsolation": "disabled", "stationIsolation": "disabled",
"managementRate": "auto", "managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"value": "auto"
},
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 20, "dropInSnrPercentage": 30,
"minLoadFactor": 50 "minLoadFactor": 40
}
}, },
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"deauthAttackDetection": null "deauthAttackDetection": null
@@ -160,16 +167,23 @@
"radioType": "is5GHzU", "radioType": "is5GHzU",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"radioMode": "modeAC",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"stationIsolation": "disabled", "stationIsolation": "disabled",
"managementRate": "auto", "managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"value": "auto"
},
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
}
}, },
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"deauthAttackDetection": null "deauthAttackDetection": null
@@ -179,16 +193,23 @@
"radioType": "is5GHzL", "radioType": "is5GHzL",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"radioMode": "modeAC",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"stationIsolation": "disabled", "stationIsolation": "disabled",
"managementRate": "auto", "managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"value": "auto"
},
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
}
}, },
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"deauthAttackDetection": null "deauthAttackDetection": null

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

@@ -10,6 +10,8 @@
"is5GHz": { "is5GHz": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHz",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -25,26 +27,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -71,6 +57,8 @@
"is2dot4GHz": { "is2dot4GHz": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is2dot4GHz",
"radioMode": "modeN",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -86,26 +74,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -132,6 +104,8 @@
"is5GHzU": { "is5GHzU": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHzU",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -147,26 +121,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -193,6 +151,8 @@
"is5GHzL": { "is5GHzL": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHzL",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -208,26 +168,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",

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

@@ -41,23 +41,23 @@
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
@@ -75,23 +75,23 @@
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
@@ -109,23 +109,23 @@
"bannedChannels": [], "bannedChannels": [],
"allowedChannels": [], "allowedChannels": [],
"rxCellSizeDb": { "rxCellSizeDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"probeResponseThresholdDb": { "probeResponseThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"clientDisconnectThresholdDb": { "clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": true, "source": "auto",
"value": -90 "value": -90
}, },
"eirpTxPower": { "eirpTxPower": {
"model_type": "AutoOrManualValue", "model_type": "SourceSelectionValue",
"auto": false, "source": "auto",
"value": 32 "value": 32
}, },
"perimeterDetectionEnabled": true, "perimeterDetectionEnabled": true,
@@ -141,16 +141,23 @@
"radioType": "is2dot4GHz", "radioType": "is2dot4GHz",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"radioMode": "modeN",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"stationIsolation": "disabled", "stationIsolation": "disabled",
"managementRate": "auto", "managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"value": "auto"
},
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 20, "dropInSnrPercentage": 30,
"minLoadFactor": 50 "minLoadFactor": 40
}
}, },
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"deauthAttackDetection": null "deauthAttackDetection": null
@@ -160,16 +167,23 @@
"radioType": "is5GHzU", "radioType": "is5GHzU",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"radioMode": "modeAC",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"stationIsolation": "disabled", "stationIsolation": "disabled",
"managementRate": "auto", "managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"value": "auto"
},
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
}
}, },
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"deauthAttackDetection": null "deauthAttackDetection": null
@@ -179,16 +193,23 @@
"radioType": "is5GHzL", "radioType": "is5GHzL",
"radioAdminState": "enabled", "radioAdminState": "enabled",
"fragmentationThresholdBytes": 2346, "fragmentationThresholdBytes": 2346,
"radioMode": "modeAC",
"wmmState": "enabled", "wmmState": "enabled",
"uapsdState": "enabled", "uapsdState": "enabled",
"stationIsolation": "disabled", "stationIsolation": "disabled",
"managementRate": "auto", "managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"value": "auto"
},
"bestApSettings": { "bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"value": {
"model_type": "RadioBestApSettings", "model_type": "RadioBestApSettings",
"mlComputed": true, "mlComputed": true,
"dropInSnrPercentage": 30, "dropInSnrPercentage": 30,
"minLoadFactor": 40 "minLoadFactor": 40
}
}, },
"legacyBSSRate": "enabled", "legacyBSSRate": "enabled",
"deauthAttackDetection": null "deauthAttackDetection": null

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

@@ -10,6 +10,8 @@
"is5GHz": { "is5GHz": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHz",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -25,26 +27,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -71,6 +57,8 @@
"is2dot4GHz": { "is2dot4GHz": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is2dot4GHz",
"radioMode": "modeN",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -86,26 +74,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -132,6 +104,8 @@
"is5GHzU": { "is5GHzU": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHzU",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -147,26 +121,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",
@@ -193,6 +151,8 @@
"is5GHzL": { "is5GHzL": {
"model_type": "RfElementConfiguration", "model_type": "RfElementConfiguration",
"rf": "TipWlan-rf", "rf": "TipWlan-rf",
"radioType": "is5GHzL",
"radioMode": "modeAC",
"beaconInterval": 100, "beaconInterval": 100,
"forceScanDuringVoice": "disabled", "forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535, "rtsCtsThreshold": 65535,
@@ -208,26 +168,10 @@
"scanDurationMillis": 65 "scanDurationMillis": 65
}, },
"managementRate": "auto", "managementRate": "auto",
"rxCellSizeDb": { "rxCellSizeDb": -90,
"model_type": "AutoOrManualValue", "probeResponseThresholdDb": -90,
"auto": true, "clientDisconnectThresholdDb": -90,
"value": -90 "eirpTxPower": 18,
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null, "bestApEnabled": null,
"neighbouringListApConfig": { "neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration", "model_type": "NeighbouringAPListConfiguration",

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

@@ -29,6 +29,7 @@ import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
import com.telecominfraproject.wlan.core.model.equipment.MacAddress; import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
import com.telecominfraproject.wlan.core.model.equipment.RadioBestApSettings; import com.telecominfraproject.wlan.core.model.equipment.RadioBestApSettings;
import com.telecominfraproject.wlan.core.model.equipment.RadioType; import com.telecominfraproject.wlan.core.model.equipment.RadioType;
import com.telecominfraproject.wlan.core.model.equipment.SourceType;
import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration; import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration; import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration;
@@ -1941,12 +1942,14 @@ public class OvsdbDao {
boolean enabled = radioConfig.getRadioAdminState().equals(StateSetting.enabled); boolean enabled = radioConfig.getRadioAdminState().equals(StateSetting.enabled);
int txPower = 0; int txPower = 0;
if (!elementRadioConfig.getEirpTxPower().isAuto()) { if (elementRadioConfig.getEirpTxPower().getSource() == SourceType.profile) {
txPower = elementRadioConfig.getEirpTxPower().getValue(); txPower = rfElementConfig.getEirpTxPower();
} else {
txPower = (int) elementRadioConfig.getEirpTxPower().getValue();
} }
String hwMode = null; String hwMode = null;
switch (radioConfig.getRadioMode()) { switch (rfElementConfig.getRadioMode()) {
case modeA: case modeA:
hwMode = "11a"; hwMode = "11a";
break; break;
@@ -2977,7 +2980,7 @@ public class OvsdbDao {
int dtimPeriod = radioConfiguration.getDtimPeriod(); int dtimPeriod = radioConfiguration.getDtimPeriod();
int rtsCtsThreshold = rfElementConfig.getRtsCtsThreshold(); int rtsCtsThreshold = rfElementConfig.getRtsCtsThreshold();
int fragThresholdBytes = radioConfiguration.getFragmentationThresholdBytes(); int fragThresholdBytes = radioConfiguration.getFragmentationThresholdBytes();
RadioMode radioMode = radioConfiguration.getRadioMode(); RadioMode radioMode = rfElementConfig.getRadioMode();
String minHwMode = "11n"; // min_hw_mode is 11ac, wifi 5, we can String minHwMode = "11n"; // min_hw_mode is 11ac, wifi 5, we can
// also take ++ (11ax) but 2.4GHz only // also take ++ (11ax) but 2.4GHz only
// Wifi4 -- // Wifi4 --
@@ -4723,6 +4726,7 @@ public class OvsdbDao {
ApElementConfiguration apElementConfig = (ApElementConfiguration) opensyncApConfig.getCustomerEquipment() ApElementConfiguration apElementConfig = (ApElementConfiguration) opensyncApConfig.getCustomerEquipment()
.getDetails(); .getDetails();
RfConfiguration rfConfig = (RfConfiguration) opensyncApConfig.getRfProfile().getDetails();
for (RadioType radioType : apElementConfig.getRadioMap().keySet()) { for (RadioType radioType : apElementConfig.getRadioMap().keySet()) {
String freqBand = null; String freqBand = null;
if (radioType == RadioType.is2dot4GHz) { if (radioType == RadioType.is2dot4GHz) {
@@ -4735,24 +4739,45 @@ public class OvsdbDao {
freqBand = "5G"; freqBand = "5G";
} }
if (rfConfig == null) {
continue;
}
ElementRadioConfiguration elementRadioConfig = apElementConfig.getRadioMap().get(radioType); ElementRadioConfiguration elementRadioConfig = apElementConfig.getRadioMap().get(radioType);
if (elementRadioConfig == null) { RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
if (elementRadioConfig == null || rfElementConfig == null) {
continue; // don't have a radio of this kind in the map continue; // don't have a radio of this kind in the map
} }
AutoOrManualValue rxCellSizeDb = null;
AutoOrManualValue probeResponseThresholdDb = null;
AutoOrManualValue clientDisconnectThresholdDb = null;
if (elementRadioConfig != null && rfElementConfig != null) {
rxCellSizeDb = getSourcedValue(elementRadioConfig.getRxCellSizeDb().getSource(),
rfElementConfig.getRxCellSizeDb(), elementRadioConfig.getRxCellSizeDb().getValue());
probeResponseThresholdDb = getSourcedValue(elementRadioConfig.getProbeResponseThresholdDb().getSource(),
rfElementConfig.getProbeResponseThresholdDb(), elementRadioConfig.getProbeResponseThresholdDb().getValue());
clientDisconnectThresholdDb = getSourcedValue(elementRadioConfig.getClientDisconnectThresholdDb().getSource(),
rfElementConfig.getClientDisconnectThresholdDb(), elementRadioConfig.getClientDisconnectThresholdDb().getValue());
}
RadioConfiguration radioConfig = apElementConfig.getAdvancedRadioMap().get(radioType); RadioConfiguration radioConfig = apElementConfig.getAdvancedRadioMap().get(radioType);
ManagementRate managementRate = null; ManagementRate managementRate = null;
RadioBestApSettings bestApSettings = null; RadioBestApSettings bestApSettings = null;
if (radioConfig != null) { if (radioConfig != null && rfElementConfig != null) {
managementRate = radioConfig.getManagementRate(); managementRate = radioConfig.getManagementRate().getSource() == SourceType.profile ?
bestApSettings = radioConfig.getBestApSettings(); rfElementConfig.getManagementRate() : radioConfig.getManagementRate().getValue();
bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile ?
rfElementConfig.getBestApSettings() : radioConfig.getBestApSettings().getValue();
} }
if (freqBand != null) { if (freqBand != null) {
try { try {
configureWifiRrm(ovsdbClient, freqBand, elementRadioConfig.getBackupChannelNumber(), configureWifiRrm(ovsdbClient, freqBand, elementRadioConfig.getBackupChannelNumber(),
elementRadioConfig.getRxCellSizeDb(), elementRadioConfig.getProbeResponseThresholdDb(), rxCellSizeDb, probeResponseThresholdDb, clientDisconnectThresholdDb,
elementRadioConfig.getClientDisconnectThresholdDb(), managementRate, bestApSettings); managementRate, bestApSettings);
} catch (OvsdbClientException e) { } catch (OvsdbClientException e) {
LOG.error("configureRrm failed with OvsdbClient exception.", e); LOG.error("configureRrm failed with OvsdbClient exception.", e);
throw new RuntimeException(e); throw new RuntimeException(e);
@@ -4902,4 +4927,13 @@ public class OvsdbDao {
} }
public AutoOrManualValue getSourcedValue(SourceType source, int profileValue, int equipmentValue) {
if (source == SourceType.profile) {
return AutoOrManualValue.createManualInstance(profileValue);
} else if (source == SourceType.auto) {
return AutoOrManualValue.createAutomaticInstance(equipmentValue);
}
return AutoOrManualValue.createManualInstance(equipmentValue);
}
} }