From 41f65673ca78470247e743c7b2ff22dfb0e1a0df Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Thu, 17 Dec 2020 19:41:36 -0500 Subject: [PATCH] WIFI-1215: Support Passpoint Provider and Icon unique string id for ovsdb -- add schema check until AP load is delivered into pending stream --- .../wlan/opensync/ovsdb/dao/OvsdbDao.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index 0614b80..fb12ec6 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -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 fResult = ovsdbClient.transact(ovsdbName, operations); OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);