Telecominfraproject/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2026-03-22 05:39:23 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Channels specified only for off-channel, remove unimplemented/unsupported parameters from ovsdb neighbor stats config

Browse Source
This commit is contained in:
Mike Hansen
2020-06-12 12:27:52 -04:00
parent 519588edcf
commit 9b1f79440c
2 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2336,15 +2336,11 @@ public class OvsdbDao {
if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_rssi")) {
//
Map<String, Value> rowColumns = new HashMap<>();
Set<Long> channelSet = new HashSet<Long>();
channelSet.add(Long.valueOf(rc.channel));
rowColumns.put("channel_list", com.vmware.ovsdb.protocol.operation.notation.Set.of(channelSet));
rowColumns.put("radio_type", new Atom<>(rc.freqBand));
rowColumns.put("reporting_interval", new Atom<>(30));
rowColumns.put("sampling_interval", new Atom<>(3));
// rowColumns.put("sampling_interval", new Atom<>(3));
rowColumns.put("stats_type", new Atom<>("rssi"));
rowColumns.put("survey_interval_ms", new Atom<>(65));
rowColumns.put("report_type", new Atom<>("raw"));
// rowColumns.put("survey_type", new Atom<>("on-chan"));
Row updateRow = new Row(rowColumns);
@@ -2447,11 +2443,8 @@ public class OvsdbDao {
updateColumns = new HashMap<>();
updateColumns.put("channel_list", channels2g);
updateColumns.put("radio_type", new Atom<>("2.4G"));
updateColumns.put("reporting_interval", new Atom<>(600));
updateColumns.put("report_type", new Atom<>("raw"));
updateColumns.put("sampling_interval", new Atom<>(60));
updateColumns.put("reporting_interval", new Atom<>(120));
updateColumns.put("stats_type", new Atom<>("neighbor"));
updateColumns.put("survey_interval_ms", new Atom<>(65));
updateColumns.put("survey_type", new Atom<>("off-chan"));
row = new Row(updateColumns);
operations.add(new Insert(wifiStatsConfigDbTable, row));
@@ -2463,11 +2456,8 @@ public class OvsdbDao {
updateColumns = new HashMap<>();
updateColumns.put("channel_list", channels5gl);
updateColumns.put("radio_type", new Atom<>("5GL"));
updateColumns.put("reporting_interval", new Atom<>(600));
updateColumns.put("report_type", new Atom<>("raw"));
updateColumns.put("sampling_interval", new Atom<>(45));
updateColumns.put("reporting_interval", new Atom<>(120));
updateColumns.put("stats_type", new Atom<>("neighbor"));
updateColumns.put("survey_interval_ms", new Atom<>(65));
updateColumns.put("survey_type", new Atom<>("off-chan"));
row = new Row(updateColumns);
operations.add(new Insert(wifiStatsConfigDbTable, row));
@@ -2479,11 +2469,8 @@ public class OvsdbDao {
updateColumns = new HashMap<>();
updateColumns.put("channel_list", channels5gu);
updateColumns.put("radio_type", new Atom<>("5GU"));
updateColumns.put("reporting_interval", new Atom<>(600));
updateColumns.put("report_type", new Atom<>("raw"));
updateColumns.put("sampling_interval", new Atom<>(36));
updateColumns.put("reporting_interval", new Atom<>(120));
updateColumns.put("stats_type", new Atom<>("neighbor"));
updateColumns.put("survey_interval_ms", new Atom<>(65));
updateColumns.put("survey_type", new Atom<>("off-chan"));
row = new Row(updateColumns);
operations.add(new Insert(wifiStatsConfigDbTable, row));
@@ -2494,15 +2481,9 @@ public class OvsdbDao {
if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_neighbor_on-chan")) {
//
Map<String, Value> rowColumns = new HashMap<>();
Set<Long> channelSet = new HashSet<Long>();
channelSet.add(Long.valueOf(rc.channel));
rowColumns.put("channel_list", com.vmware.ovsdb.protocol.operation.notation.Set.of(channelSet));
rowColumns.put("radio_type", new Atom<>(rc.freqBand));
rowColumns.put("reporting_interval", new Atom<>(60));
rowColumns.put("report_type", new Atom<>("raw"));
rowColumns.put("sampling_interval", new Atom<>(6));
rowColumns.put("stats_type", new Atom<>("neighbor"));
rowColumns.put("survey_interval_ms", new Atom<>(65));
rowColumns.put("survey_type", new Atom<>("on-chan"));
Row updateRow = new Row(rowColumns);
@@ -2548,9 +2529,6 @@ public class OvsdbDao {
if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_survey_on-chan")) {
Map<String, Value> rowColumns = new HashMap<>();
Set<Long> channelSet = new HashSet<Long>();
channelSet.add(Long.valueOf(rc.channel));
rowColumns.put("channel_list", com.vmware.ovsdb.protocol.operation.notation.Set.of(channelSet));
rowColumns.put("radio_type", new Atom<>(rc.freqBand));
rowColumns.put("reporting_interval", new Atom<>(60));
rowColumns.put("report_type", new Atom<>("raw"));
@@ -2625,9 +2603,6 @@ public class OvsdbDao {
if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_client")) {
//
Map<String, Value> rowColumns = new HashMap<>();
Set<Long> channelSet = new HashSet<Long>();
channelSet.add(Long.valueOf(rc.channel));
rowColumns.put("channel_list", com.vmware.ovsdb.protocol.operation.notation.Set.of(channelSet));
rowColumns.put("radio_type", new Atom<>(rc.freqBand));
rowColumns.put("reporting_interval", new Atom<>(60));
rowColumns.put("report_type", new Atom<>("raw"));