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

Stats Config, Default Profile settings

Browse Source
This commit is contained in:
Mike Hansen
2020-06-04 17:21:15 -04:00
parent b91adbcd4c
commit 922045b310
4 changed files with 239 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,6 +133,7 @@ public class OvsdbDao {
columns.add("model");
columns.add("firmware_version");
columns.add("platform_version");
columns.add("revision");
operations.add(new Select(awlanNodeDbTable, conditions, columns));
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
@@ -158,6 +159,8 @@ public class OvsdbDao {
ret.platformVersion = row != null ? row.getStringColumn("platform_version") : null;
ret.firmwareVersion = row != null ? row.getStringColumn("firmware_version") : null;
ret.revision = row != null ? row.getStringColumn("revision") : null;
ret.skuNumber = getSingleValueFromSet(row, "sku_number");
ret.serialNumber = getSingleValueFromSet(row, "serial_number");
ret.model = getSingleValueFromSet(row, "model");
@@ -872,6 +875,7 @@ public class OvsdbDao {
else {
ret.put(wifiStatsConfigInfo.radioType + "_" + wifiStatsConfigInfo.statsType + "_"
+ wifiStatsConfigInfo.surveyType, wifiStatsConfigInfo);
}
}
@@ -2291,7 +2295,7 @@ 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);
// provisionWifiStatsConfigDevice(getProvisionedWifiStatsConfigs(ovsdbClient), operations, updateColumns);
provisionWifiStatsConfigSurvey(getProvisionedWifiStatsConfigs(ovsdbClient), operations, thresholds);
@@ -2591,38 +2595,19 @@ public class OvsdbDao {
}
private void provisionWifiStatsConfigDevice(Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs,
List<Operation> operations, Map<String, Value> updateColumns) {
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));
}
if (!provisionedWifiStatsConfigs.containsKey("5GL_device")) {
// updateColumns.put("channel_list", channels );
updateColumns.put("radio_type", new Atom<>("5GL"));
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));
}
if (!provisionedWifiStatsConfigs.containsKey("5GU_device")) {
// updateColumns.put("channel_list", channels );
updateColumns.put("radio_type", new Atom<>("5GU"));
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 provisionWifiStatsConfigDevice(Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs,
// List<Operation> operations, Map<String, Value> updateColumns) {
// 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,
List<Operation> operations) {