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

OSGW: Support firmware upgrade - adding check of FW track

Browse Source
This commit is contained in:
Mike Hansen
2020-06-22 18:07:25 -04:00
parent 5a185cb38f
commit dda00db9e2
1 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,10 +39,16 @@ import com.telecominfraproject.wlan.core.model.equipment.RadioType;
import com.telecominfraproject.wlan.customer.models.Customer; import com.telecominfraproject.wlan.customer.models.Customer;
import com.telecominfraproject.wlan.customer.service.CustomerServiceInterface; import com.telecominfraproject.wlan.customer.service.CustomerServiceInterface;
import com.telecominfraproject.wlan.datastore.exceptions.DsConcurrentModificationException; import com.telecominfraproject.wlan.datastore.exceptions.DsConcurrentModificationException;
import com.telecominfraproject.wlan.datastore.exceptions.DsEntityNotFoundException;
import com.telecominfraproject.wlan.equipment.EquipmentServiceInterface; import com.telecominfraproject.wlan.equipment.EquipmentServiceInterface;
import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration; import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
import com.telecominfraproject.wlan.equipment.models.Equipment; import com.telecominfraproject.wlan.equipment.models.Equipment;
import com.telecominfraproject.wlan.equipment.models.StateSetting; import com.telecominfraproject.wlan.equipment.models.StateSetting;
import com.telecominfraproject.wlan.firmware.FirmwareServiceInterface;
import com.telecominfraproject.wlan.firmware.models.CustomerFirmwareTrackRecord;
import com.telecominfraproject.wlan.firmware.models.CustomerFirmwareTrackSettings;
import com.telecominfraproject.wlan.firmware.models.CustomerFirmwareTrackSettings.TrackFlag;
import com.telecominfraproject.wlan.firmware.models.FirmwareVersion;
import com.telecominfraproject.wlan.location.models.Location; import com.telecominfraproject.wlan.location.models.Location;
import com.telecominfraproject.wlan.location.service.LocationServiceInterface; import com.telecominfraproject.wlan.location.service.LocationServiceInterface;
import com.telecominfraproject.wlan.opensync.external.integration.controller.OpensyncCloudGatewayController; import com.telecominfraproject.wlan.opensync.external.integration.controller.OpensyncCloudGatewayController;
@@ -145,6 +151,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
private StatusServiceInterface statusServiceInterface; private StatusServiceInterface statusServiceInterface;
@Autowired @Autowired
private ClientServiceInterface clientServiceInterface; private ClientServiceInterface clientServiceInterface;
@Autowired
private FirmwareServiceInterface firmwareServiceInterface;
@Autowired @Autowired
private OpensyncCloudGatewayController gatewayController; private OpensyncCloudGatewayController gatewayController;
@@ -159,6 +167,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
private String autoProvisionedSsid; private String autoProvisionedSsid;
@Value("${connectus.ovsdb.isAutoconfigEnabled:true}") @Value("${connectus.ovsdb.isAutoconfigEnabled:true}")
private boolean isAutoconfigEnabled; private boolean isAutoconfigEnabled;
@Value("${connectus.ovsdb.defaultFwVersion:r10947-65030d81f3}")
private String defaultFwVersion;
@Autowired @Autowired
private CacheManager cacheManagerShortLived; private CacheManager cacheManagerShortLived;
@@ -189,7 +199,34 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
@Override @Override
public void apConnected(String apId, ConnectNodeInfo connectNodeInfo) { public void apConnected(String apId, ConnectNodeInfo connectNodeInfo) {
if (isAutoconfigEnabled) { if (isAutoconfigEnabled) {
// default track settings for firmware
CustomerFirmwareTrackSettings trackSettings = firmwareServiceInterface.getDefaultCustomerTrackSetting();
// check for updated/modified track settings for this customer
CustomerFirmwareTrackRecord custFwTrackRecord = firmwareServiceInterface
.getCustomerFirmwareTrackRecord(autoProvisionedCustomerId);
if (custFwTrackRecord != null) {
trackSettings = custFwTrackRecord.getSettings();
}
// determine if AP requires FW upgrade before cloud connection/provision
if (trackSettings.getAutoUpgradeDeprecatedOnBind().equals(TrackFlag.ALWAYS)
|| trackSettings.getAutoUpgradeUnknownOnBind().equals(TrackFlag.ALWAYS)) {
// check the reported fw version for the AP, if it is < than
// the default version for the cloud, then download and
// flash the firmware before proceeding.
// then return;
LOG.debug(
"Automatic firmware upgrade is configured for track {}. Firmware will be flashed to newer version if required.",
trackSettings);
} else {
// auto upgrade not configured for this customer
LOG.debug("Automatic firmware upgrade is not configured for track {}", trackSettings);
}
Equipment ce = getCustomerEquipment(apId); Equipment ce = getCustomerEquipment(apId);
try { try {
@@ -385,6 +422,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
EquipmentUpgradeStatusData statusData = new EquipmentUpgradeStatusData(); EquipmentUpgradeStatusData statusData = new EquipmentUpgradeStatusData();
statusRecord.setDetails(statusData); statusRecord.setDetails(statusData);
} }
EquipmentUpgradeStatusData fwUpgradeStatusData = (EquipmentUpgradeStatusData) statusRecord.getDetails(); EquipmentUpgradeStatusData fwUpgradeStatusData = (EquipmentUpgradeStatusData) statusRecord.getDetails();
fwUpgradeStatusData.setActiveSwVersion(connectNodeInfo.firmwareVersion); fwUpgradeStatusData.setActiveSwVersion(connectNodeInfo.firmwareVersion);
fwUpgradeStatusData.setAlternateSwVersion(connectNodeInfo.firmwareVersion); fwUpgradeStatusData.setAlternateSwVersion(connectNodeInfo.firmwareVersion);