From 8110f796c94ca3a33d849d5fb4aec98a9da8b8b9 Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Wed, 4 Aug 2021 16:03:51 -0400 Subject: [PATCH] [WIFI-3345] If DATE from version_matrix does not contain year, upgrade to firmware specified in the track version Signed-off-by: Mike Hansen --- .../integration/OpensyncExternalIntegrationCloud.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java index 1b7a830..f980a10 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java @@ -7,6 +7,9 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.time.Instant; +import java.time.temporal.ChronoField; +import java.time.temporal.TemporalField; import java.util.ArrayList; import java.util.Date; import java.util.EnumMap; @@ -428,7 +431,10 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_INACTIVE_KEY), date.getTime(), connectNodeInfo.model, connectNodeInfo.firmwareVersion); } catch (java.text.ParseException p) { - LOG.error("Could not parse release date {} from AP fw, no automatic firmware upgrade possible for this node.", dateString, p); + LOG.info("Could not parse release date {} from AP fw, set date to EPOCH start value.", dateString, Instant.EPOCH); + reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY), + connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_INACTIVE_KEY), Instant.EPOCH.getLong(ChronoField.INSTANT_SECONDS), connectNodeInfo.model, + connectNodeInfo.firmwareVersion); } } else { LOG.info("Cloud based firmware upgrade is not supported for this AP");