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

Migrate to OVSDB 2.0 protos, placeholder in Dao for steering and capacity reports

Browse Source
This commit is contained in:
Mike Hansen
2020-06-15 13:58:09 -04:00
parent 52387b6079
commit d7966b81fa
5 changed files with 253 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,17 +88,17 @@ import com.telecominfraproject.wlan.status.models.StatusDataType;
import com.telecominfraproject.wlan.status.network.models.NetworkAdminStatusData; import com.telecominfraproject.wlan.status.network.models.NetworkAdminStatusData;
import com.telecominfraproject.wlan.status.network.models.NetworkAggregateStatusData; import com.telecominfraproject.wlan.status.network.models.NetworkAggregateStatusData;
import sts.PlumeStats.Client; import sts.OpensyncStats.Client;
import sts.PlumeStats.ClientReport; import sts.OpensyncStats.ClientReport;
import sts.PlumeStats.Device; import sts.OpensyncStats.Device;
import sts.PlumeStats.Device.RadioTemp; import sts.OpensyncStats.Device.RadioTemp;
import sts.PlumeStats.Neighbor; import sts.OpensyncStats.Neighbor;
import sts.PlumeStats.Neighbor.NeighborBss; import sts.OpensyncStats.Neighbor.NeighborBss;
import sts.PlumeStats.RadioBandType; import sts.OpensyncStats.RadioBandType;
import sts.PlumeStats.Report; import sts.OpensyncStats.Report;
import sts.PlumeStats.Survey; import sts.OpensyncStats.Survey;
import sts.PlumeStats.Survey.SurveySample; import sts.OpensyncStats.Survey.SurveySample;
import sts.PlumeStats.SurveyType; import sts.OpensyncStats.SurveyType;
import traffic.NetworkMetadata.FlowReport; import traffic.NetworkMetadata.FlowReport;
import wc.stats.IpDnsTelemetry.WCStatsReport; import wc.stats.IpDnsTelemetry.WCStatsReport;
@@ -926,13 +926,16 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
nr.setSsid(nBss.getSsid()); nr.setSsid(nBss.getSsid());
} }
LOG.debug("populateNeighbourScanReports created report {} from stats {}", neighbourScanReports, neighbor); if (LOG.isDebugEnabled()) {
LOG.debug("populateNeighbourScanReports created report {} from stats {}", neighbourScanReports,
neighbor);
}
} }
} }
private void handleClientSessionUpdate(int customerId, long equipmentId, String apId, long locationId, int channel, private void handleClientSessionUpdate(int customerId, long equipmentId, String apId, long locationId, int channel,
RadioBandType band, long timestamp, sts.PlumeStats.Client client) { RadioBandType band, long timestamp, sts.OpensyncStats.Client client) {
com.telecominfraproject.wlan.client.models.Client clientInstance = clientServiceInterface.getOrNull(customerId, com.telecominfraproject.wlan.client.models.Client clientInstance = clientServiceInterface.getOrNull(customerId,
new MacAddress(client.getMacAddress())); new MacAddress(client.getMacAddress()));
@@ -1007,8 +1010,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
clientSession.getDetails().setMetricDetails(metricDetails); clientSession.getDetails().setMetricDetails(metricDetails);
clientSession = clientServiceInterface.updateSession(clientSession); clientSession = clientServiceInterface.updateSession(clientSession);
if (clientSession != null) LOG.debug("CreatedOrUpdated clientSession {}", clientSession);
LOG.debug("CreatedOrUpdated clientSession {}", clientSession);
} catch (Exception e) { } catch (Exception e) {
LOG.error("Error while attempting to create ClientSession and Info", e); LOG.error("Error while attempting to create ClientSession and Info", e);
@@ -1109,7 +1111,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
} }
LOG.debug("Created ApSsidMetrics Report {}", apSsidMetrics); LOG.debug("ApSsidMetrics {}", apSsidMetrics);
// LOG.debug("Created ApSsidMetrics Report {}", apSsidMetrics);
} }
@@ -1199,6 +1203,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
} }
} }
LOG.debug("ChannelInfoReports {}", channelInfoReports); LOG.debug("ChannelInfoReports {}", channelInfoReports);
} }
@@ -1215,7 +1220,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
busySelf += sample.getBusySelf(); busySelf += sample.getBusySelf();
busy += sample.getBusy(); busy += sample.getBusy();
channelInfo.setChanNumber(sample.getChannel()); channelInfo.setChanNumber(sample.getChannel());
LOG.debug("MJH Channel {} Sample for Radio {}", sample.getChannel(), radioType);
} }
int iBSS = busyTx + busySelf; int iBSS = busyTx + busySelf;
@@ -1329,7 +1333,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
continue; continue;
} }
if (radioState.getAllowedChannels() != null && !radioState.getAllowedChannels().isEmpty()) { if (radioState.getAllowedChannels() != null) {
apElementConfiguration = ((ApElementConfiguration) ce.getDetails()); apElementConfiguration = ((ApElementConfiguration) ce.getDetails());
apElementConfiguration.getRadioMap().get(radioState.getFreqBand()) apElementConfiguration.getRadioMap().get(radioState.getFreqBand())
.setAllowedChannels(new ArrayList<>(radioState.getAllowedChannels())); .setAllowedChannels(new ArrayList<>(radioState.getAllowedChannels()));

2
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java vendored
View File

@@ -10,7 +10,7 @@ import com.telecominfraproject.wlan.opensync.external.integration.models.Opensyn
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAWLANNode; import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAWLANNode;
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncWifiAssociatedClients; import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncWifiAssociatedClients;
import sts.PlumeStats.Report; import sts.OpensyncStats.Report;
import traffic.NetworkMetadata.FlowReport; import traffic.NetworkMetadata.FlowReport;
import wc.stats.IpDnsTelemetry.WCStatsReport; import wc.stats.IpDnsTelemetry.WCStatsReport;

2
opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java vendored
View File

@@ -21,7 +21,7 @@ import com.telecominfraproject.wlan.opensync.external.integration.models.Opensyn
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAWLANNode; import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAWLANNode;
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncWifiAssociatedClients; import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncWifiAssociatedClients;
import sts.PlumeStats.Report; import sts.OpensyncStats.Report;
import traffic.NetworkMetadata.FlowReport; import traffic.NetworkMetadata.FlowReport;
import wc.stats.IpDnsTelemetry.WCStatsReport; import wc.stats.IpDnsTelemetry.WCStatsReport;

330
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
View File

@@ -27,8 +27,8 @@ import com.google.protobuf.util.JsonFormat.TypeRegistry;
import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface; import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface;
import com.telecominfraproject.wlan.opensync.util.ZlibUtil; import com.telecominfraproject.wlan.opensync.util.ZlibUtil;
import sts.PlumeStats; import sts.OpensyncStats;
import sts.PlumeStats.Report; import sts.OpensyncStats.Report;
import traffic.NetworkMetadata; import traffic.NetworkMetadata;
import traffic.NetworkMetadata.FlowReport; import traffic.NetworkMetadata.FlowReport;
import wc.stats.IpDnsTelemetry; import wc.stats.IpDnsTelemetry;
@@ -38,204 +38,196 @@ import wc.stats.IpDnsTelemetry.WCStatsReport;
@Component @Component
public class OpensyncMqttClient implements ApplicationListener<ContextClosedEvent> { public class OpensyncMqttClient implements ApplicationListener<ContextClosedEvent> {
private static final Logger LOG = LoggerFactory.getLogger(OpensyncMqttClient.class); private static final Logger LOG = LoggerFactory.getLogger(OpensyncMqttClient.class);
private static final Logger MQTT_LOG = LoggerFactory.getLogger("MQTT_DATA"); private static final Logger MQTT_LOG = LoggerFactory.getLogger("MQTT_DATA");
public static Charset utf8 = Charset.forName("UTF-8"); public static Charset utf8 = Charset.forName("UTF-8");
@Autowired @Autowired
private OpensyncExternalIntegrationInterface extIntegrationInterface; private OpensyncExternalIntegrationInterface extIntegrationInterface;
//
// See https://github.com/fusesource/mqtt-client for the docs
//
// private boolean keepReconnecting = true;
// See https://github.com/fusesource/mqtt-client for the docs private Thread mqttClientThread;
//
private boolean keepReconnecting = true; public OpensyncMqttClient(@Autowired io.netty.handler.ssl.SslContext sslContext,
private Thread mqttClientThread; @Value("${connectus.mqttBroker.address:testportal.123wlan.com}") String mqttBrokerAddress,
@Value("${connectus.mqttBroker.listenPort:1883}") int mqttBrokerListenPort,
@Value("${connectus.mqttBroker.user:admin}") String username,
@Value("${connectus.mqttBroker.password:admin}") String password,
@Value("${mqtt.javax.net.ssl.keyStore:/opt/tip-wlan/certs/client_keystore.jks}") String jdkKeyStoreLocation,
@Value("${mqtt.javax.net.ssl.keyStorePassword:mypassword}") String jdkKeyStorePassword,
@Value("${mqtt.javax.net.ssl.trustStore:/opt/tip-wlan/certs/truststore.jks}") String jdkTrustStoreLocation,
@Value("${mqtt.javax.net.ssl.trustStorePassword:mypassword}") String jdkTrustStorePassword) {
public OpensyncMqttClient( if (System.getProperty("javax.net.ssl.keyStore") == null) {
@Autowired io.netty.handler.ssl.SslContext sslContext, System.setProperty("javax.net.ssl.keyStore", jdkKeyStoreLocation);
@Value("${connectus.mqttBroker.address:testportal.123wlan.com}") }
String mqttBrokerAddress,
@Value("${connectus.mqttBroker.listenPort:1883}")
int mqttBrokerListenPort,
@Value("${connectus.mqttBroker.user:admin}")
String username,
@Value("${connectus.mqttBroker.password:admin}")
String password,
@Value("${mqtt.javax.net.ssl.keyStore:/opt/tip-wlan/certs/client_keystore.jks}")
String jdkKeyStoreLocation,
@Value("${mqtt.javax.net.ssl.keyStorePassword:mypassword}")
String jdkKeyStorePassword,
@Value("${mqtt.javax.net.ssl.trustStore:/opt/tip-wlan/certs/truststore.jks}")
String jdkTrustStoreLocation,
@Value("${mqtt.javax.net.ssl.trustStorePassword:mypassword}")
String jdkTrustStorePassword
){
if(System.getProperty("javax.net.ssl.keyStore") == null) { if (System.getProperty("javax.net.ssl.keyStorePassword") == null) {
System.setProperty("javax.net.ssl.keyStore", jdkKeyStoreLocation); System.setProperty("javax.net.ssl.keyStorePassword", jdkKeyStorePassword);
} }
if(System.getProperty("javax.net.ssl.keyStorePassword") == null) { if (System.getProperty("javax.net.ssl.trustStore") == null) {
System.setProperty("javax.net.ssl.keyStorePassword", jdkKeyStorePassword); System.setProperty("javax.net.ssl.trustStore", jdkTrustStoreLocation);
} }
if(System.getProperty("javax.net.ssl.trustStore") == null) { if (System.getProperty("javax.net.ssl.trustStorePassword") == null) {
System.setProperty("javax.net.ssl.trustStore", jdkTrustStoreLocation); System.setProperty("javax.net.ssl.trustStorePassword", jdkTrustStorePassword);
} }
if(System.getProperty("javax.net.ssl.trustStorePassword") == null) { Runnable mqttClientRunnable = () -> {
System.setProperty("javax.net.ssl.trustStorePassword", jdkTrustStorePassword); while (keepReconnecting) {
} BlockingConnection connection = null;
try {
Thread.sleep(5000);
Runnable mqttClientRunnable = () -> { // Create a new MQTT connection to the broker.
while(keepReconnecting) { /*
BlockingConnection connection = null; * Using SSL connections If you want to connect over SSL/TLS instead of TCP, use
try { * an "ssl://" or "tls://" URI prefix instead of "tcp://" for the host field.
Thread.sleep(5000); * Supported protocol values are:
*
* ssl:// - Use the JVM default version of the SSL algorithm. sslv*:// - Use a
* specific SSL version where * is a version supported by your JVM. Example:
* sslv3 tls:// - Use the JVM default version of the TLS algorithm. tlsv*:// -
* Use a specific TLS version where * is a version supported by your JVM.
* Example: tlsv1.1 The client will use the default JVM SSLContext which is
* configured via JVM system properties unless you configure the MQTT instance
* using the setSslContext method.
*
* SSL connections perform blocking operations against internal thread pool
* unless you call the setBlockingExecutor method to configure that executor
* they will use instead.
*
*/
// Create a new MQTT connection to the broker. MQTT mqtt = new MQTT();
/* // mqtt.setHost("tcp://192.168.0.137:61616");
* Using SSL connections mqtt.setHost("tls://" + mqttBrokerAddress + ":" + mqttBrokerListenPort);
* If you want to connect over SSL/TLS instead of LOG.info("Connecting to MQTT broker at {}", mqtt.getHost());
* TCP, use an "ssl://" or "tls://" URI prefix instead of "tcp://" for mqtt.setClientId("opensync_mqtt");
* the host field. mqtt.setUserName(username);
* Supported protocol values are: mqtt.setPassword(password);
* // Note: the following does not work with the serverContext, it has to be the
* ssl:// - Use the JVM default version of the SSL algorithm. // clientContext
* sslv*:// - Use a specific SSL version where * is a version supported by your JVM. Example: sslv3 // mqtt.setSslContext(((JdkSslContext) sslContext).context());
* tls:// - Use the JVM default version of the TLS algorithm. // For now we'll rely on regular SSLContext from the JDK
* tlsv*:// - Use a specific TLS version where * is a version supported by your JVM. Example: tlsv1.1
* The client will use the
* default JVM SSLContext which is configured via JVM system properties
* unless you configure the MQTT instance using the setSslContext method.
*
* SSL connections perform blocking operations against internal thread
* pool unless you call the setBlockingExecutor method to configure that
* executor they will use instead.
*
*/
MQTT mqtt = new MQTT(); // TODO: revisit this blocking connection, change it to futureConnection
//mqtt.setHost("tcp://192.168.0.137:61616"); connection = mqtt.blockingConnection();
mqtt.setHost("tls://"+mqttBrokerAddress+":"+mqttBrokerListenPort); connection.connect();
LOG.info("Connecting to MQTT broker at {}", mqtt.getHost()); LOG.info("Connected to MQTT broker at {}", mqtt.getHost());
mqtt.setClientId("opensync_mqtt");
mqtt.setUserName(username);
mqtt.setPassword(password);
//Note: the following does not work with the serverContext, it has to be the clientContext
//mqtt.setSslContext(((JdkSslContext) sslContext).context());
//For now we'll rely on regular SSLContext from the JDK
//TODO: revisit this blocking connection, change it to futureConnection // Subscribe to topics:
connection = mqtt.blockingConnection(); //
connection.connect(); // new Topic("mqtt/example/publish", QoS.AT_LEAST_ONCE),
LOG.info("Connected to MQTT broker at {}", mqtt.getHost()); // new Topic("#", QoS.AT_LEAST_ONCE),
// new Topic("test/#", QoS.EXACTLY_ONCE),
// new Topic("foo/+/bar", QoS.AT_LEAST_ONCE)
Topic[] topics = { new Topic("#", QoS.AT_LEAST_ONCE), };
// Subscribe to topics: connection.subscribe(topics);
// LOG.info("Subscribed to mqtt topics {}", Arrays.asList(topics));
// new Topic("mqtt/example/publish", QoS.AT_LEAST_ONCE),
// new Topic("#", QoS.AT_LEAST_ONCE),
// new Topic("test/#", QoS.EXACTLY_ONCE),
// new Topic("foo/+/bar", QoS.AT_LEAST_ONCE)
Topic[] topics = {
new Topic("#", QoS.AT_LEAST_ONCE),
};
connection.subscribe(topics); // prepare a JSONPrinter to format protobuf messages as json
LOG.info("Subscribed to mqtt topics {}", Arrays.asList(topics)); List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>();
protobufDescriptors.addAll(OpensyncStats.getDescriptor().getMessageTypes());
protobufDescriptors.addAll(IpDnsTelemetry.getDescriptor().getMessageTypes());
protobufDescriptors.addAll(NetworkMetadata.getDescriptor().getMessageTypes());
TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build();
JsonFormat.Printer jsonPrinter = JsonFormat.printer().includingDefaultValueFields()
.omittingInsignificantWhitespace().usingTypeRegistry(oldRegistry);
//prepare a JSONPrinter to format protobuf messages as json // main loop - receive messages
List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>(); while (true) {
protobufDescriptors.addAll(PlumeStats.getDescriptor().getMessageTypes()); Message mqttMsg = connection.receive(5, TimeUnit.SECONDS);
protobufDescriptors.addAll(IpDnsTelemetry.getDescriptor().getMessageTypes());
protobufDescriptors.addAll(NetworkMetadata.getDescriptor().getMessageTypes());
TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build();
JsonFormat.Printer jsonPrinter = JsonFormat.printer().includingDefaultValueFields().omittingInsignificantWhitespace().usingTypeRegistry(oldRegistry );
//main loop - receive messages if (mqttMsg == null) {
while(true) { continue;
Message mqttMsg = connection.receive(5, TimeUnit.SECONDS); }
if(mqttMsg == null) { byte payload[] = mqttMsg.getPayload();
continue; // we acknowledge right after receive because:
} // a. none of the stats messages are so important that we cannot skip one
// b. if there's some kind of problem with the message (decoding or processing)
// - we want to move on as quickly as possible and not let it get stuck in the
// queue
mqttMsg.ack();
byte payload[] = mqttMsg.getPayload(); LOG.trace("received message on topic {} size {}", mqttMsg.getTopic(), payload.length);
//we acknowledge right after receive because:
// a. none of the stats messages are so important that we cannot skip one
// b. if there's some kind of problem with the message (decoding or processing) - we want to move on as quickly as possible and not let it get stuck in the queue
mqttMsg.ack();
LOG.trace("received message on topic {} size {}", mqttMsg.getTopic(), payload.length); if (payload[0] == 0x78) {
// looks like zlib-compressed data, let's decompress it before deserializing
payload = ZlibUtil.decompress(payload);
}
if(payload[0]==0x78) { // attempt to parse the message as protobuf
//looks like zlib-compressed data, let's decompress it before deserializing MessageOrBuilder encodedMsg = null;
payload = ZlibUtil.decompress(payload); try {
}
//attempt to parse the message as protobuf encodedMsg = Report.parseFrom(payload);
MessageOrBuilder encodedMsg = null; MQTT_LOG.info("topic = {} Report = {}", mqttMsg.getTopic(), jsonPrinter.print(encodedMsg));
try { extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), (Report) encodedMsg);
encodedMsg = Report.parseFrom(payload); } catch (Exception e) {
MQTT_LOG.info("topic = {} Report = {}", mqttMsg.getTopic(), jsonPrinter.print(encodedMsg)); try {
extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), (Report) encodedMsg); // not a plume_stats report, attempt to deserialize as network_metadata
encodedMsg = FlowReport.parseFrom(payload);
MQTT_LOG.info("topic = {} FlowReport = {}", mqttMsg.getTopic(),
jsonPrinter.print(encodedMsg));
extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), (FlowReport) encodedMsg);
} catch (Exception e1) {
}catch(Exception e) { try {
try { // not a plume_stats report and not network_metadata report, attempt to
//not a plume_stats report, attempt to deserialize as network_metadata // deserialize as WCStatsReport
encodedMsg = FlowReport.parseFrom(payload); encodedMsg = WCStatsReport.parseFrom(payload);
MQTT_LOG.info("topic = {} FlowReport = {}", mqttMsg.getTopic(), jsonPrinter.print(encodedMsg)); MQTT_LOG.info("topic = {} IpDnsTelemetry = {}", mqttMsg.getTopic(),
extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), (FlowReport) encodedMsg); jsonPrinter.print(encodedMsg));
}catch(Exception e1) { extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(),
(WCStatsReport) encodedMsg);
} catch (Exception e2) {
String msgStr = new String(mqttMsg.getPayload(), utf8);
MQTT_LOG.info("topic = {} message = {}", mqttMsg.getTopic(), msgStr);
}
}
}
try { }
//not a plume_stats report and not network_metadata report, attempt to deserialize as WCStatsReport
encodedMsg = WCStatsReport.parseFrom(payload);
MQTT_LOG.info("topic = {} IpDnsTelemetry = {}", mqttMsg.getTopic(), jsonPrinter.print(encodedMsg));
extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), (WCStatsReport) encodedMsg);
}catch(Exception e2) {
String msgStr = new String(mqttMsg.getPayload(), utf8);
MQTT_LOG.info("topic = {} message = {}", mqttMsg.getTopic(), msgStr);
}
}
}
} } catch (Exception e) {
LOG.error("Exception in MQTT receiver", e);
} finally {
try {
if (connection != null) {
connection.disconnect();
}
} catch (Exception e1) {
// do nothing
}
}
}
} catch(Exception e) { };
LOG.error("Exception in MQTT receiver", e);
} finally {
try {
if(connection!=null) {
connection.disconnect();
}
} catch(Exception e1) {
//do nothing
}
}
}
}; mqttClientThread = new Thread(mqttClientRunnable, "mqttClientThread");
mqttClientThread.setDaemon(true);
mqttClientThread.start();
mqttClientThread = new Thread(mqttClientRunnable, "mqttClientThread"); }
mqttClientThread.setDaemon(true);
mqttClientThread.start();
} @Override
public void onApplicationEvent(ContextClosedEvent event) {
LOG.debug("Processing ContextClosedEvent event");
keepReconnecting = false;
if (mqttClientThread != null) {
@Override mqttClientThread.interrupt();
public void onApplicationEvent(ContextClosedEvent event) { }
LOG.debug("Processing ContextClosedEvent event"); }
keepReconnecting = false;
if(mqttClientThread!=null) {
mqttClientThread.interrupt();
}
}
} }

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

@@ -2309,6 +2309,10 @@ public class OvsdbDao {
provisionWifiStatsConfigClient(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations); provisionWifiStatsConfigClient(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
provisionWifiStatsConfigBandSteering(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
provisionWifiStatsConfigCapacity(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
provisionWifiStatsRssi(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations); provisionWifiStatsRssi(radioConfigs, getProvisionedWifiStatsConfigs(ovsdbClient), operations);
if (!operations.isEmpty()) { if (!operations.isEmpty()) {
@@ -2329,6 +2333,50 @@ public class OvsdbDao {
} }
} }
private void provisionWifiStatsConfigCapacity(Map<String, WifiRadioConfigInfo> radioConfigs,
Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) {
radioConfigs.values().stream().forEach(rc -> {
if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_capacity")) {
//
Map<String, Value> rowColumns = new HashMap<>();
rowColumns.put("radio_type", new Atom<>(rc.freqBand));
rowColumns.put("reporting_interval", new Atom<>(60));
// rowColumns.put("sampling_interval", new Atom<>(3));
rowColumns.put("stats_type", new Atom<>("capacity"));
// rowColumns.put("survey_interval_ms", new Atom<>(65));
// rowColumns.put("survey_type", new Atom<>("on-chan"));
Row updateRow = new Row(rowColumns);
operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
}
});
}
private void provisionWifiStatsConfigBandSteering(Map<String, WifiRadioConfigInfo> radioConfigs,
Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) {
radioConfigs.values().stream().forEach(rc -> {
if (!provisionedWifiStatsConfigs.containsKey(rc.freqBand + "_steering")) {
//
Map<String, Value> rowColumns = new HashMap<>();
rowColumns.put("radio_type", new Atom<>(rc.freqBand));
rowColumns.put("reporting_interval", new Atom<>(60));
// rowColumns.put("sampling_interval", new Atom<>(3));
rowColumns.put("stats_type", new Atom<>("steering"));
// rowColumns.put("survey_interval_ms", new Atom<>(65));
// rowColumns.put("survey_type", new Atom<>("on-chan"));
Row updateRow = new Row(rowColumns);
operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
}
});
}
private void provisionWifiStatsRssi(Map<String, WifiRadioConfigInfo> radioConfigs, private void provisionWifiStatsRssi(Map<String, WifiRadioConfigInfo> radioConfigs,
Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) { Map<String, WifiStatsConfigInfo> provisionedWifiStatsConfigs, List<Operation> operations) {