WIFI-1215: Support Passpoint Provider and Icon unique string id for ovsdb -- add schema check until AP load is delivered into pending stream

This commit is contained in:
Mike Hansen
2020-12-17 19:41:36 -05:00
parent 33e004a3e0
commit 41f65673ca

View File

@@ -1502,7 +1502,11 @@ public class OvsdbDao {
try {
LOG.debug("Retrieving Hotspot20_Icon_Config:");
DatabaseSchema schema = ovsdbClient.getSchema(ovsdbName).get(ovsdbTimeoutSec, TimeUnit.SECONDS);
if (!schema.getTables().get(hotspot20ConfigDbTable).getColumns().containsKey("icon_config_name")) {
LOG.info("Removed icon_config_name from Hotspot20_Icon_Config columns {}",
columns.remove("icon_config_name"));
}
operations.add(new Select(hotspot20IconConfigDbTable, conditions, columns));
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);