scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-03 20:17:53 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

additional validation and error handling for equipment discovery and ap configuration

Browse Source
This commit is contained in:
Mike Hansen
2020-12-01 20:20:15 -05:00
parent 9e58a9d7b7
commit db4672a9a2
3 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,8 +212,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
ce.setSerial(connectNodeInfo.serialNumber); ce.setSerial(connectNodeInfo.serialNumber);
ce.setDetails(ApElementConfiguration.createWithDefaults()); ce.setDetails(ApElementConfiguration.createWithDefaults());
ce.setCustomerId(autoProvisionedCustomerId); ce.setCustomerId(autoProvisionedCustomerId);
ce.setName(apId); ce.setName(apId);
ce = equipmentServiceInterface.create(ce);
ApElementConfiguration apElementConfig = (ApElementConfiguration) ce.getDetails(); ApElementConfiguration apElementConfig = (ApElementConfiguration) ce.getDetails();
apElementConfig.setDeviceName(ce.getName()); apElementConfig.setDeviceName(ce.getName());
apElementConfig.setEquipmentModel(connectNodeInfo.model); apElementConfig.setEquipmentModel(connectNodeInfo.model);
@@ -272,7 +273,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
ce.setProfileId(profileId); ce.setProfileId(profileId);
ce = equipmentServiceInterface.create(ce); ce = equipmentServiceInterface.update(ce);
} else { } else {
// equipment already exists // equipment already exists

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

@@ -200,7 +200,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId); OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
ovsdbDao.configureInterfaces(ovsdbClient);
if (opensyncAPConfig != null) { if (opensyncAPConfig != null) {
@@ -213,6 +212,9 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
if (opensyncAPConfig.getHotspotConfig() != null) { if (opensyncAPConfig.getHotspotConfig() != null) {
ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig); ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig);
} }
ovsdbDao.configureInterfaces(ovsdbClient);
ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig); ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig);
if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) { if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats); ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
@@ -273,7 +275,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig); ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig); ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
ovsdbDao.configureInterfaces(ovsdbClient);
ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig); ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig); ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
@@ -281,6 +282,9 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
if (opensyncAPConfig.getHotspotConfig() != null) { if (opensyncAPConfig.getHotspotConfig() != null) {
ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig); ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig);
} }
ovsdbDao.configureInterfaces(ovsdbClient);
ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig); ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig);
if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) { if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats); ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);

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

@@ -1768,23 +1768,27 @@ public class OvsdbDao {
} }
public void removeAllSsids(OvsdbClient ovsdbClient) { public void removeAllSsids(OvsdbClient ovsdbClient) {
LOG.info("removeAllSsids from {}:", wifiVifConfigDbTable);
try { try {
List<Operation> operations = new ArrayList<>(); List<Operation> operations = new ArrayList<>();
operations = new ArrayList<>();
operations.add(new Delete(wifiVifConfigDbTable)); operations.add(new Delete(wifiVifConfigDbTable));
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations); CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
if (LOG.isDebugEnabled()) {
LOG.debug("Removed all existing SSIDs from {}:", wifiVifConfigDbTable);
for (OperationResult res : result) { for (OperationResult res : result) {
LOG.debug("Op Result {}", res); LOG.info("Op Result {}", res);
if (res instanceof UpdateResult) {
LOG.info("removeAllSsids:result {}", ((UpdateResult)res).toString());
} else if (res instanceof ErrorResult) {
LOG.error("removeAllSsids:result error {}", ((ErrorResult)res));
throw new RuntimeException("removeAllSsids " + ((ErrorResult)res).getError() + " " + ((ErrorResult)res).getDetails());
} }
} }
Map<String, WifiVifConfigInfo> provisionedVifConfigs = getProvisionedWifiVifConfigs(ovsdbClient); Map<String, WifiVifConfigInfo> provisionedVifConfigs = getProvisionedWifiVifConfigs(ovsdbClient);
// this should be empty // this should be empty
if (!provisionedVifConfigs.isEmpty()) { if (!provisionedVifConfigs.isEmpty()) {
@@ -1982,7 +1986,12 @@ public class OvsdbDao {
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
for (OperationResult res : result) { for (OperationResult res : result) {
LOG.debug("Op Result {}", res); if (res instanceof UpdateResult) {
LOG.info("configureLanInterfacesForDhcpSniffing {}", ((UpdateResult)res).toString());
} else if (res instanceof ErrorResult) {
LOG.error("configureLanInterfacesForDhcpSniffing error {}", ((ErrorResult)res));
throw new RuntimeException("configureLanInterfacesForDhcpSniffing " + ((ErrorResult)res).getError() + " " + ((ErrorResult)res).getDetails());
}
} }
} catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) { } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
LOG.error("OvsdbDao::configureLanInterfaces failed.", e); LOG.error("OvsdbDao::configureLanInterfaces failed.", e);
@@ -2009,8 +2018,12 @@ public class OvsdbDao {
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
for (OperationResult res : result) { for (OperationResult res : result) {
LOG.debug("Op Result {}", res); if (res instanceof UpdateResult) {
} LOG.info("configureWanInterfacesForDhcpSniffing {}", ((UpdateResult)res).toString());
} else if (res instanceof ErrorResult) {
LOG.error("configureWanInterfacesForDhcpSniffing error {}", ((ErrorResult)res));
throw new RuntimeException("configureWanInterfacesForDhcpSniffing " + ((ErrorResult)res).getError() + " " + ((ErrorResult)res).getDetails());
} }
} catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) { } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
LOG.error("OvsdbDao::configureWanInterfaces failed.", e); LOG.error("OvsdbDao::configureWanInterfaces failed.", e);
throw new RuntimeException(e); throw new RuntimeException(e);
@@ -2646,6 +2659,9 @@ public class OvsdbDao {
insertResult = (InsertResult) res; insertResult = (InsertResult) res;
LOG.info("configureSingleSsid:InsertResult {}", insertResult); LOG.info("configureSingleSsid:InsertResult {}", insertResult);
vifConfigUuid = ((InsertResult) res).getUuid(); vifConfigUuid = ((InsertResult) res).getUuid();
} else if (res instanceof ErrorResult) {
LOG.error("configureSingleSsid: error {}", ((ErrorResult)res));
throw new RuntimeException("configureSingleSsid " + ((ErrorResult)res).getError() + " " + ((ErrorResult)res).getDetails());
} }
} }
if (vifConfigUuid == null) { if (vifConfigUuid == null) {
@@ -2680,6 +2696,9 @@ public class OvsdbDao {
if (res instanceof SelectResult) { if (res instanceof SelectResult) {
LOG.info("Select Result for confirmRowExistsInTable {} with Uuid {} {}", table, rowUuid, LOG.info("Select Result for confirmRowExistsInTable {} with Uuid {} {}", table, rowUuid,
((SelectResult) res).getRows()); ((SelectResult) res).getRows());
} else if (res instanceof ErrorResult) {
LOG.error("confirmRowExistsInTable error {}", ((ErrorResult)res));
throw new RuntimeException("confirmRowExistsInTable " + ((ErrorResult)res).getError() + " " + ((ErrorResult)res).getDetails());
} }
} }
} catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) { } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
@@ -2767,6 +2786,9 @@ public class OvsdbDao {
for (OperationResult res : result) { for (OperationResult res : result) {
if (res instanceof UpdateResult) { if (res instanceof UpdateResult) {
LOG.debug("updateVifConfigsSetForRadio:result {}", (UpdateResult) res); LOG.debug("updateVifConfigsSetForRadio:result {}", (UpdateResult) res);
} else if (res instanceof ErrorResult) {
LOG.error("updateVifConfigsSetForRadio error {}", ((ErrorResult)res));
throw new RuntimeException("updateVifConfigsSetForRadio " + ((ErrorResult)res).getError() + " " + ((ErrorResult)res).getDetails());
} }
} }
@@ -2784,6 +2806,9 @@ public class OvsdbDao {
throw new RuntimeException("Wifi_Radio_Config " + row throw new RuntimeException("Wifi_Radio_Config " + row
+ "vif_configs table was not updated {} for new Wifi_VIF_Config " + vifConfigUuid); + "vif_configs table was not updated {} for new Wifi_VIF_Config " + vifConfigUuid);
} }
} else if (res instanceof ErrorResult) {
LOG.error("updateVifConfigsSetForRadio error {}", ((ErrorResult)res));
throw new RuntimeException("updateVifConfigsSetForRadio " + ((ErrorResult)res).getError() + " " + ((ErrorResult)res).getDetails());
} }
} }
LOG.info("Updated WifiRadioConfig {} for SSID {}:", radioFreqBand, ssid); LOG.info("Updated WifiRadioConfig {} for SSID {}:", radioFreqBand, ssid);
@@ -3142,6 +3167,19 @@ public class OvsdbDao {
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations); CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
for (OperationResult res : result) {
if (res instanceof SelectResult) {
LOG.info("configureGreTunnel {}", ((SelectResult) res).toString());
} else if (res instanceof ErrorResult) {
LOG.error("configureGreTunnel error {}", ((ErrorResult) res));
throw new RuntimeException("configureGreTunnel " + ((ErrorResult) res).getError()
+ " " + ((ErrorResult) res).getDetails());
}
}
if (((SelectResult) result[0]).getRows().isEmpty()) { if (((SelectResult) result[0]).getRows().isEmpty()) {
LOG.debug("Adding new Gre Tunnel {}", apNetworkConfiguration); LOG.debug("Adding new Gre Tunnel {}", apNetworkConfiguration);
@@ -3156,7 +3194,18 @@ public class OvsdbDao {
fResult = ovsdbClient.transact(ovsdbName, operations); fResult = ovsdbClient.transact(ovsdbName, operations);
result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
for (OperationResult res : result) { for (OperationResult res : result) {
LOG.debug("Configure Gre Tunnel Op Result {}", res);
if (res instanceof InsertResult) {
LOG.info("configureGreTunnel {}", ((InsertResult) res).toString());
} else if (res instanceof UpdateResult) {
LOG.info("configureGreTunnel {}", ((UpdateResult) res).toString());
} else if (res instanceof ErrorResult) {
LOG.error("configureGreTunnel error {}", ((ErrorResult) res));
throw new RuntimeException("configureGreTunnel " + ((ErrorResult) res).getError()
+ " " + ((ErrorResult) res).getDetails());
}
} }
} catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) { } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
LOG.error("Couldn't configure Gre Tunnel {}", apNetworkConfiguration, e); LOG.error("Couldn't configure Gre Tunnel {}", apNetworkConfiguration, e);
@@ -3254,7 +3303,17 @@ public class OvsdbDao {
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
for (OperationResult res : result) { for (OperationResult res : result) {
LOG.debug("Op Result {}", res);
if (res instanceof InsertResult) {
LOG.info("createVlanNetworkInterfaces {}", ((InsertResult) res).toString());
} else if (res instanceof UpdateResult) {
LOG.info("createVlanNetworkInterfaces {}", ((UpdateResult) res).toString());
} else if (res instanceof ErrorResult) {
LOG.error("createVlanNetworkInterfaces error {}", ((ErrorResult) res));
throw new RuntimeException("createVlanNetworkInterfaces " + ((ErrorResult) res).getError()
+ " " + ((ErrorResult) res).getDetails());
}
} }
inetConfigMap = getProvisionedWifiInetConfigs(ovsdbClient); inetConfigMap = getProvisionedWifiInetConfigs(ovsdbClient);
@@ -3516,6 +3575,9 @@ public class OvsdbDao {
confirmRowExistsInTable(ovsdbClient, ((InsertResult) res).getUuid(), wifiInetConfigDbTable); confirmRowExistsInTable(ovsdbClient, ((InsertResult) res).getUuid(), wifiInetConfigDbTable);
} else if (res instanceof UpdateResult) { } else if (res instanceof UpdateResult) {
LOG.info("configureInetInterface update new row result {}", ((UpdateResult)res)); LOG.info("configureInetInterface update new row result {}", ((UpdateResult)res));
} else if (res instanceof ErrorResult) {
LOG.error("configureInetInterface error {}", ((ErrorResult)res));
throw new RuntimeException("configureInetInterface " + ((ErrorResult)res).getError() + " " + ((ErrorResult)res).getDetails());
} }
} }
@@ -4977,8 +5039,9 @@ public class OvsdbDao {
LOG.info("configureWifiRrm insert new row result {}", ((InsertResult)res)); LOG.info("configureWifiRrm insert new row result {}", ((InsertResult)res));
// for insert, make sure it is actually in the table // for insert, make sure it is actually in the table
confirmRowExistsInTable(ovsdbClient, ((InsertResult) res).getUuid(), wifiRrmConfigDbTable); confirmRowExistsInTable(ovsdbClient, ((InsertResult) res).getUuid(), wifiRrmConfigDbTable);
} else if (res instanceof UpdateResult) { } else if (res instanceof ErrorResult) {
LOG.info("configureWifiRrm update row result {}", ((UpdateResult)res)); LOG.error("configureWifiRrm error {}", ((ErrorResult)res));
throw new RuntimeException("configureWifiRrm " + ((ErrorResult)res).getError() + " " + ((ErrorResult)res).getDetails());
} }
} }