scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-02 19:47:52 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

code cleanup re static analysis checks

Browse Source
This commit is contained in:
Mike Hansen
2020-12-01 17:59:20 -05:00
parent f083c3488c
commit 9e58a9d7b7
6 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1437,8 +1437,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
FailureReason fwUpgradeFailureReason = null; FailureReason fwUpgradeFailureReason = null;
if (opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_FACTORY_RESET) if (opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_FACTORY_RESET)
|| opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_FACTORY_RESET) || opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_REBOOT)
|| opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_FACTORY_RESET) || opensyncAPState.getFirmwareUrl().equals(OvsdbStringConstants.OVSDB_AWLAN_AP_SWITCH_SOFTWARE_BANK)
|| opensyncAPState.getFirmwareUrl().equals("")) { || opensyncAPState.getFirmwareUrl().equals("")) {
LOG.debug("Firmware Url {}, no fwUpgradeState", opensyncAPState.getFirmwareUrl()); LOG.debug("Firmware Url {}, no fwUpgradeState", opensyncAPState.getFirmwareUrl());
@@ -1605,11 +1605,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
return; return;
} }
if (equipmentId < 0L) {
LOG.debug("wifiVIFStateDbTableDelete Cannot get equipmentId {} for session {}", equipmentId);
return;
}
Status activeBssidsStatus = statusServiceInterface.getOrNull(customerId, equipmentId, Status activeBssidsStatus = statusServiceInterface.getOrNull(customerId, equipmentId,
StatusDataType.ACTIVE_BSSIDS); StatusDataType.ACTIVE_BSSIDS);
@@ -1644,7 +1639,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
} }
bssidList.removeAll(toBeDeleted); if (bssidList != null) bssidList.removeAll(toBeDeleted);
statusDetails.setActiveBSSIDs(bssidList); statusDetails.setActiveBSSIDs(bssidList);

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

@@ -1787,17 +1787,16 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
if (radiusMetrics.hasLatency()) { if (radiusMetrics.hasLatency()) {
networkProbeMetrics.setRadiusLatencyInMs(radiusMetrics.getLatency()); networkProbeMetrics.setRadiusLatencyInMs(radiusMetrics.getLatency());
} }
if (radiusMetrics.hasRadiusState()) { if (radiusMetrics.hasRadiusState()) {
StateUpDownError radiusState = OvsdbToWlanCloudTypeMappingUtility
.getCloudMetricsStateFromOpensyncStatsStateUpDown(radiusMetrics.getRadiusState());
if (radiusMetrics.hasRadiusState()) { networkProbeMetrics.setRadiusState(radiusState);
StateUpDownError radiusState = OvsdbToWlanCloudTypeMappingUtility
.getCloudMetricsStateFromOpensyncStatsStateUpDown(radiusMetrics.getRadiusState());
networkProbeMetrics.setRadiusState(radiusState);
}
} }
} }
if (networkProbe.hasVlanProbe()) { if (networkProbe.hasVlanProbe()) {

1
opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch
View File

@@ -7,6 +7,7 @@
<listEntry value="1"/> <listEntry value="1"/>
</listAttribute> </listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH"> <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">

1
opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch
View File

@@ -7,6 +7,7 @@
<listEntry value="1"/> <listEntry value="1"/>
</listAttribute> </listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

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

@@ -775,10 +775,9 @@ public class OvsdbDao {
Row row = null; Row row = null;
if ((result != null) && (result.length > 0) && !((SelectResult) result[0]).getRows().isEmpty()) { if ((result != null) && (result.length > 0) && !((SelectResult) result[0]).getRows().isEmpty()) {
row = ((SelectResult) result[0]).getRows().iterator().next(); row = ((SelectResult) result[0]).getRows().iterator().next();
} for (OperationResult res : result) {
LOG.debug("Op Result {}", res);
for (OperationResult res : result) { }
LOG.debug("Op Result {}", res);
} }
firmwareVersion = row != null ? row.getStringColumn("firmware_version") : null; firmwareVersion = row != null ? row.getStringColumn("firmware_version") : null;
@@ -4856,34 +4855,36 @@ public class OvsdbDao {
} }
int multicastRateMbps = 0; int multicastRateMbps = 0;
switch (multicastRate) { if (multicastRate != null) {
case rate6mbps: switch (multicastRate) {
multicastRateMbps = 6; case rate6mbps:
break; multicastRateMbps = 6;
case rate9mbps: break;
multicastRateMbps = 9; case rate9mbps:
break; multicastRateMbps = 9;
case rate12mbps: break;
multicastRateMbps = 12; case rate12mbps:
break; multicastRateMbps = 12;
case rate18mbps: break;
multicastRateMbps = 18; case rate18mbps:
break; multicastRateMbps = 18;
case rate24mbps: break;
multicastRateMbps = 24; case rate24mbps:
break; multicastRateMbps = 24;
case rate36mbps: break;
multicastRateMbps = 36; case rate36mbps:
break; multicastRateMbps = 36;
case rate48mbps: break;
multicastRateMbps = 48; case rate48mbps:
break; multicastRateMbps = 48;
case rate54mbps: break;
multicastRateMbps = 54; case rate54mbps:
break; multicastRateMbps = 54;
case auto: break;
default: case auto:
multicastRateMbps = 0; default:
multicastRateMbps = 0;
}
} }
if (freqBand != null) { if (freqBand != null) {

3
opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTestUtilities.java
View File

@@ -121,14 +121,13 @@ public class OvsdbDaoTestUtilities {
mccMncList.add(passpointMccMnc); mccMncList.add(passpointMccMnc);
Set<String> naiRealms = new HashSet<>(); Set<String> naiRealms = new HashSet<>();
naiRealms.add(naiRealm); naiRealms.add(naiRealm);
naiRealm.split(".");
List<Byte> roamingOi = new ArrayList<>(); List<Byte> roamingOi = new ArrayList<>();
roamingOi.add(Byte.valueOf("1")); roamingOi.add(Byte.valueOf("1"));
roamingOi.add(Byte.valueOf("2")); roamingOi.add(Byte.valueOf("2"));
roamingOi.add(Byte.valueOf("3")); roamingOi.add(Byte.valueOf("3"));
roamingOi.add(Byte.valueOf("4")); roamingOi.add(Byte.valueOf("4"));
hotspot20IdProviderProfile = createOsuProviderProfile(customerId, hotspot20IdProviderProfile, mccMncList, hotspot20IdProviderProfile = createOsuProviderProfile(customerId, hotspot20IdProviderProfile, mccMncList,
naiRealms, "https://example.com/osu/" + naiRealm.split(".com")[0], naiRealm.split(".com")[0], naiRealm, naiRealms, "https://example.com/osu/" + naiRealm.split("/.com")[0], naiRealm.split(".com")[0], naiRealm,
roamingOi); roamingOi);
return hotspot20IdProviderProfile; return hotspot20IdProviderProfile;
} }