mirror of
https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git
synced 2026-03-21 21:39:19 +00:00
TW-208: Row change refinement
This commit is contained in:
Mike Hansen
@@ -3,6 +3,22 @@ package com.telecominfraproject.wlan.opensync.external.integration;
|
||||
import java.util.Set;
|
||||
|
||||
public interface ConnectusOvsdbClientInterface {
|
||||
|
||||
static final String[] AWLAN_NODE_DB_TABLE_COLUMNS = new String[] { "device_mode", "id", "model",
|
||||
"serial_number", "firmware_version", "platform_version", "redirector_addr" };
|
||||
|
||||
static final String[] WIFI_VIF_STATE_DB_TABLE_COLUMNS = new String[] { "min_hw_mode", "if_name", "security",
|
||||
"bridge", "channel", "enabled", "ssid_broadcast", "mac", "ssid" };
|
||||
|
||||
static final String[] WIFI_INET_STATE_DB_TABLE_COLUMNS = new String[] { "hwaddr", "if_type", "if_name",
|
||||
"inet_addr", "dhcpc", "network" };
|
||||
|
||||
static final String[] WIFI_RADIO_STATE_DB_TABLE_COLUMNS = new String[] { "ht_mode", "hw_mode", "hw_params",
|
||||
"hw_type", "mac", "if_name", "freq_band", "country", "channel" };
|
||||
|
||||
static final String[] WIFI_ASSOCIATED_CLIENTS_DB_TABLE_COLUMNS = new String[] { "mac" };
|
||||
|
||||
|
||||
Set<String> getConnectedClientIds();
|
||||
String changeRedirectorAddress(String apId, String newRedirectorAddress);
|
||||
void processConfigChanged(String apId);
|
||||
|
||||
@@ -4,7 +4,6 @@ import java.util.Map;
|
||||
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Value;
|
||||
|
||||
import sts.PlumeStats.Report;
|
||||
import traffic.NetworkMetadata.FlowReport;
|
||||
@@ -13,15 +12,19 @@ import wc.stats.IpDnsTelemetry.WCStatsReport;
|
||||
public interface OpensyncExternalIntegrationInterface {
|
||||
void apConnected(String apId, ConnectNodeInfo connectNodeInfo);
|
||||
|
||||
public enum RowUpdateOperation {
|
||||
INIT, INSERT, DELETE, MODIFY
|
||||
}
|
||||
|
||||
void apDisconnected(String apId);
|
||||
|
||||
OpensyncAPConfig getApConfig(String apId);
|
||||
|
||||
void wifiVIFStateDbTableUpdate(Map <String,Value> row,String apId);
|
||||
void wifiVIFStateDbTableUpdate(Map<String, String> row, String apId, RowUpdateOperation operation);
|
||||
|
||||
void wifiRadioStatusDbTableUpdate(Map <String,Value> row,String apId);
|
||||
void wifiRadioStatusDbTableUpdate(Map<String, String> row, String apId, RowUpdateOperation operation);
|
||||
|
||||
void wifiInetStateDbTableUpdate(Map <String,Value> row,String apId);
|
||||
void wifiInetStateDbTableUpdate(Map<String, String> row, String apId, RowUpdateOperation operation);
|
||||
|
||||
void processMqttMessage(String topic, Report report);
|
||||
|
||||
@@ -29,7 +32,7 @@ public interface OpensyncExternalIntegrationInterface {
|
||||
|
||||
void processMqttMessage(String topic, WCStatsReport wcStatsReport);
|
||||
|
||||
void handleClientsChanged(Map <String,Value> row, String connectedClientId);
|
||||
|
||||
void awlanChanged(Map <String,Value> row, String connectedClientId);
|
||||
void wifiAssociatedClientsDbTableUpdate(Map<String, String> row, String apId, RowUpdateOperation operation);
|
||||
|
||||
void awlan_NodeDbTableUpdate(Map<String, String> row, String connectedClientId, RowUpdateOperation operation);
|
||||
}
|
||||
|
||||
@@ -97,34 +97,34 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
|
||||
}
|
||||
|
||||
@Override
|
||||
public void wifiVIFStateDbTableUpdate(Map<String, com.vmware.ovsdb.protocol.operation.notation.Value> row,
|
||||
String apId) {
|
||||
public void wifiVIFStateDbTableUpdate(Map<String, String> row,
|
||||
String apId, RowUpdateOperation operation) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void wifiRadioStatusDbTableUpdate(Map<String, com.vmware.ovsdb.protocol.operation.notation.Value> row, String apId) {
|
||||
public void wifiRadioStatusDbTableUpdate(Map<String, String> row, String apId, RowUpdateOperation operation) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void wifiInetStateDbTableUpdate(Map<String, com.vmware.ovsdb.protocol.operation.notation.Value> row, String apId) {
|
||||
public void wifiInetStateDbTableUpdate(Map<String, String> row, String apId, RowUpdateOperation operation) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleClientsChanged(Map<String, com.vmware.ovsdb.protocol.operation.notation.Value> row,
|
||||
String connectedClientId) {
|
||||
public void wifiAssociatedClientsDbTableUpdate(Map<String, String> row,
|
||||
String apId, RowUpdateOperation operation) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void awlanChanged(Map<String, com.vmware.ovsdb.protocol.operation.notation.Value> row,
|
||||
String connectedClientId) {
|
||||
public void awlan_NodeDbTableUpdate(Map<String, String> row, String connectedClientId,
|
||||
RowUpdateOperation operation) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.telecominfraproject.wlan.opensync.ovsdb;
|
||||
|
||||
import java.security.cert.X509Certificate;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
@@ -31,6 +32,7 @@ import com.vmware.ovsdb.protocol.methods.MonitorRequests;
|
||||
import com.vmware.ovsdb.protocol.methods.MonitorSelect;
|
||||
import com.vmware.ovsdb.protocol.methods.RowUpdate;
|
||||
import com.vmware.ovsdb.protocol.methods.TableUpdates;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Row;
|
||||
import com.vmware.ovsdb.service.OvsdbClient;
|
||||
import com.vmware.ovsdb.service.OvsdbPassiveConnectionListener;
|
||||
|
||||
@@ -40,18 +42,6 @@ import io.netty.handler.ssl.SslContext;
|
||||
@Component
|
||||
public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
|
||||
|
||||
private static final String[] AWLAN_NODE_DB_TABLE_COLUMNS = new String[] { "device_mode", "id", "model",
|
||||
"serial_number", "firmware_version", "platform_version", "redirector_addr" };
|
||||
|
||||
private static final String[] WIFI_VIF_STATE_DB_TABLE_COLUMNS = new String[] { "min_hw_mode", "if_name", "security",
|
||||
"bridge", "channel", "enabled", "ssid_broadcast", "mac", "ssid" };
|
||||
|
||||
private static final String[] WIFI_INET_STATE_DB_TABLE_COLUMNS = new String[] { "hwaddr", "if_type", "if_name",
|
||||
"inet_addr", "dhcpc", "network" };
|
||||
|
||||
private static final String[] WIFI_RADIO_STATE_DB_TABLE_COLUMNS = new String[] { "ht_mode", "hw_mode", "hw_params",
|
||||
"hw_type", "mac", "if_name", "freq_band", "country", "channel" };
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(ConnectusOvsdbClient.class);
|
||||
|
||||
@org.springframework.beans.factory.annotation.Value("${connectus.ovsdb.listenPort:6640}")
|
||||
@@ -126,8 +116,25 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
|
||||
tableUpdates.getTableUpdates().entrySet().stream().forEach(e -> {
|
||||
Map<UUID, RowUpdate> rowUpdates = e.getValue().getRowUpdates();
|
||||
for (UUID uuid : rowUpdates.keySet()) {
|
||||
extIntegrationInterface.wifiRadioStatusDbTableUpdate(
|
||||
rowUpdates.get(uuid).getNew().getColumns(), key);
|
||||
// initial, insert, modify,
|
||||
// null if delete
|
||||
Row newRow = rowUpdates.get(uuid).getNew();
|
||||
// delete, modify, null if
|
||||
// init or insert
|
||||
Row oldRow = rowUpdates.get(uuid).getOld();
|
||||
Map<String, String> rowContents = new HashMap<String, String>();
|
||||
|
||||
if (oldRow != null && newRow.getColumns().keySet()
|
||||
.containsAll(oldRow.getColumns().keySet())) {
|
||||
for (String column : oldRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(newRow, column));
|
||||
}
|
||||
extIntegrationInterface.wifiRadioStatusDbTableUpdate(
|
||||
rowContents, key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.MODIFY);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
@@ -149,8 +156,42 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
|
||||
tableUpdates.getTableUpdates().entrySet().stream().forEach(e -> {
|
||||
Map<UUID, RowUpdate> rowUpdates = e.getValue().getRowUpdates();
|
||||
for (UUID uuid : rowUpdates.keySet()) {
|
||||
extIntegrationInterface.wifiInetStateDbTableUpdate(
|
||||
rowUpdates.get(uuid).getNew().getColumns(), key);
|
||||
// initial, insert, modify,
|
||||
// null if delete
|
||||
Row newRow = rowUpdates.get(uuid).getNew();
|
||||
// delete, modify, null if
|
||||
// init or insert
|
||||
Row oldRow = rowUpdates.get(uuid).getOld();
|
||||
Map<String, String> rowContents = new HashMap<String, String>();
|
||||
|
||||
if (oldRow == null) {
|
||||
// row init, or insert
|
||||
for (String column : newRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(newRow, column));
|
||||
}
|
||||
extIntegrationInterface.wifiInetStateDbTableUpdate(rowContents,
|
||||
key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.INSERT);
|
||||
} else if (newRow == null) {
|
||||
for (String column : oldRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(oldRow, column));
|
||||
}
|
||||
extIntegrationInterface.wifiInetStateDbTableUpdate(rowContents,
|
||||
key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.DELETE);
|
||||
} else if (newRow.getColumns().keySet()
|
||||
.containsAll(oldRow.getColumns().keySet())) {
|
||||
for (String column : oldRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(newRow, column));
|
||||
}
|
||||
extIntegrationInterface.wifiInetStateDbTableUpdate(rowContents,
|
||||
key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.MODIFY);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
@@ -163,7 +204,7 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
|
||||
.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiVifStateDbTable,
|
||||
new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable,
|
||||
new MonitorRequest(Arrays.asList(WIFI_VIF_STATE_DB_TABLE_COLUMNS),
|
||||
new MonitorSelect(true, false, false, true)))),
|
||||
new MonitorSelect(true, true, true, true)))),
|
||||
new MonitorCallback() {
|
||||
|
||||
@Override
|
||||
@@ -172,8 +213,42 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
|
||||
tableUpdates.getTableUpdates().entrySet().stream().forEach(e -> {
|
||||
Map<UUID, RowUpdate> rowUpdates = e.getValue().getRowUpdates();
|
||||
for (UUID uuid : rowUpdates.keySet()) {
|
||||
extIntegrationInterface.wifiVIFStateDbTableUpdate(
|
||||
rowUpdates.get(uuid).getNew().getColumns(), key);
|
||||
// initial, insert, modify,
|
||||
// null if delete
|
||||
Row newRow = rowUpdates.get(uuid).getNew();
|
||||
// delete, modify, null if
|
||||
// init or insert
|
||||
Row oldRow = rowUpdates.get(uuid).getOld();
|
||||
Map<String, String> rowContents = new HashMap<String, String>();
|
||||
|
||||
if (oldRow == null) {
|
||||
// row init, or insert
|
||||
for (String column : newRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(newRow, column));
|
||||
}
|
||||
extIntegrationInterface.wifiVIFStateDbTableUpdate(rowContents,
|
||||
key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.INSERT);
|
||||
} else if (newRow == null) {
|
||||
for (String column : oldRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(oldRow, column));
|
||||
}
|
||||
extIntegrationInterface.wifiVIFStateDbTableUpdate(rowContents,
|
||||
key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.DELETE);
|
||||
} else if (newRow.getColumns().keySet()
|
||||
.containsAll(oldRow.getColumns().keySet())) {
|
||||
for (String column : oldRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(newRow, column));
|
||||
}
|
||||
extIntegrationInterface.wifiVIFStateDbTableUpdate(rowContents,
|
||||
key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.MODIFY);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
@@ -194,8 +269,72 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
|
||||
tableUpdates.getTableUpdates().entrySet().stream().forEach(e -> {
|
||||
Map<UUID, RowUpdate> rowUpdates = e.getValue().getRowUpdates();
|
||||
for (UUID uuid : rowUpdates.keySet()) {
|
||||
extIntegrationInterface.awlanChanged(
|
||||
rowUpdates.get(uuid).getNew().getColumns(), key);
|
||||
// initial, insert, modify,
|
||||
// null if delete
|
||||
Row newRow = rowUpdates.get(uuid).getNew();
|
||||
// delete, modify, null if
|
||||
// init or insert
|
||||
Row oldRow = rowUpdates.get(uuid).getOld();
|
||||
Map<String, String> rowContents = new HashMap<String, String>();
|
||||
|
||||
if (oldRow != null && newRow.getColumns().keySet()
|
||||
.containsAll(oldRow.getColumns().keySet())) {
|
||||
for (String column : oldRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(newRow, column));
|
||||
}
|
||||
extIntegrationInterface.awlan_NodeDbTableUpdate(rowContents,
|
||||
key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.MODIFY);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
ovsdbClient
|
||||
.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiAssociatedClientsDbTable,
|
||||
new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiAssociatedClientsDbTable,
|
||||
new MonitorRequest(Arrays.asList(WIFI_ASSOCIATED_CLIENTS_DB_TABLE_COLUMNS),
|
||||
new MonitorSelect(true, true, true, false)))),
|
||||
new MonitorCallback() {
|
||||
|
||||
@Override
|
||||
public void update(TableUpdates tableUpdates) {
|
||||
|
||||
tableUpdates.getTableUpdates().entrySet().stream().forEach(e -> {
|
||||
Map<UUID, RowUpdate> rowUpdates = e.getValue().getRowUpdates();
|
||||
for (UUID uuid : rowUpdates.keySet()) {
|
||||
// initial, insert, modify,
|
||||
// null if delete
|
||||
Row newRow = rowUpdates.get(uuid).getNew();
|
||||
// delete, modify, null if
|
||||
// init or insert
|
||||
Row oldRow = rowUpdates.get(uuid).getOld();
|
||||
Map<String, String> rowContents = new HashMap<String, String>();
|
||||
|
||||
if (oldRow == null) {
|
||||
// row init, or insert
|
||||
for (String column : newRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(newRow, column));
|
||||
}
|
||||
extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(
|
||||
rowContents, key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.INSERT);
|
||||
} else if (newRow == null) {
|
||||
for (String column : oldRow.getColumns().keySet()) {
|
||||
rowContents.put(column,
|
||||
ovsdbDao.getSingleValueFromSet(oldRow, column));
|
||||
}
|
||||
extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(
|
||||
rowContents, key,
|
||||
OpensyncExternalIntegrationInterface.RowUpdateOperation.DELETE);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user