Telecominfraproject/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2026-03-22 01:39:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Keep GW process even though RRM on AP is not ready

Browse Source
This commit is contained in:
Lynn Shi
2020-08-06 16:54:05 -04:00
parent 0d3f80a8c0
commit e8acb5920b
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java
View File

@@ -193,14 +193,12 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
}
ovsdbDao.removeAllSsids(ovsdbClient); // always
//TODO turn on when RRM is ready
// ovsdbDao.removeWifiRrm(ovsdbClient);
ovsdbDao.removeWifiRrm(ovsdbClient);
if (opensyncAPConfig != null) {
ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
//TODO turn on when RRM is ready
// ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
}
ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
@@ -262,14 +260,12 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
}
ovsdbDao.removeAllSsids(ovsdbClient); // always
//TODO turn on when RRM is ready
// ovsdbDao.removeWifiRrm(ovsdbClient);
ovsdbDao.removeWifiRrm(ovsdbClient);
ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
//TODO turn on when RRM is ready
// ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
ovsdbDao.configureStats(ovsdbClient);
// Check if device stats is configured in Wifi_Stats_Config table,

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

@@ -3235,17 +3235,12 @@ public class OvsdbDao {
} catch (TimeoutException e) {
LOG.error("configureRrm failed with Timeout.", e);
throw new RuntimeException(e);
} catch (ExecutionException e) {
LOG.error("configureRrm excecution failed.", e);
throw new RuntimeException(e);
} catch (InterruptedException e) {
LOG.error("configureRrm interrupted.", e);
throw new RuntimeException(e);
}
}
}
}
@@ -3338,7 +3333,9 @@ public class OvsdbDao {
LOG.info("Removed Wifi_RRM_Config");
} catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
} catch (ExecutionException e) {
LOG.error("Error in removeRrm", e);
} catch (OvsdbClientException | TimeoutException | InterruptedException e) {
LOG.error("Error in removeRrm", e);
throw new RuntimeException(e);
}