From ffe86a39943b3f2e5a7169b5a00598cf70a4465e Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Thu, 4 Jan 2024 22:37:35 -0800 Subject: [PATCH] https://telecominfraproject.atlassian.net/browse/WIFI-13268 Signed-off-by: stephb9959 --- build | 2 +- src/AP_WS_LookForUpgrade.cpp | 18 ++++++++---------- src/CommandManager.cpp | 1 - 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/build b/build index d1cbcfa54..3d9aebb2c 100644 --- a/build +++ b/build @@ -1 +1 @@ -66 \ No newline at end of file +68 \ No newline at end of file diff --git a/src/AP_WS_LookForUpgrade.cpp b/src/AP_WS_LookForUpgrade.cpp index e5b5191d3..287dc84a0 100644 --- a/src/AP_WS_LookForUpgrade.cpp +++ b/src/AP_WS_LookForUpgrade.cpp @@ -12,7 +12,7 @@ namespace OpenWifi { return false; uint64_t GoodConfig = GetCurrentConfigurationID(SerialNumberInt_); - std::cout << __LINE__ << ": " << SerialNumber_ << " INT:" << SerialNumberInt_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << std::endl; +// std::cout << __LINE__ << ": " << SerialNumber_ << " INT:" << SerialNumberInt_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << std::endl; if (GoodConfig && (GoodConfig == UUID || GoodConfig == State_.PendingUUID)) { UpgradedUUID = UUID; State_.PendingUUID = 0; @@ -24,18 +24,16 @@ namespace OpenWifi { return false; } - - - std::cout << "D.pendingUUID: " << D.pendingUUID << " UUID: " << D.UUID << " SerialNumber: " << D.SerialNumber << std::endl; +// std::cout << "D.pendingUUID: " << D.pendingUUID << " UUID: " << D.UUID << " SerialNumber: " << D.SerialNumber << std::endl; if(State_.PendingUUID!=0 && UUID==State_.PendingUUID) { - std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << std::endl; +// std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << std::endl; // so we sent an upgrade to a device, and now it is completing now... UpgradedUUID = UUID; StorageService()->CompleteDeviceConfigurationChange(Session, SerialNumber_); State_.PendingUUID = 0; return true; } - std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << " Device:" << D.UUID << std::endl; +// std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << " Device:" << D.UUID << std::endl; Config::Config Cfg(D.Configuration); // if this is a broken device (UUID==0) just fix it @@ -52,7 +50,7 @@ namespace OpenWifi { D.pendingConfigurationCmd.clear(); StorageService()->UpdateDevice(Session, D); SetCurrentConfigurationID(SerialNumberInt_, UUID); - std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << std::endl; +// std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << std::endl; return false; } @@ -61,7 +59,7 @@ namespace OpenWifi { // make sure our config is newer. D.UUID = UUID + 2; UpgradedUUID = D.UUID; - std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << std::endl; +// std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << " Pending:" << State_.PendingUUID << std::endl; } Cfg.SetUUID(D.UUID); @@ -103,8 +101,8 @@ namespace OpenWifi { Notification.content.newUUID = UpgradedUUID; GWWebSocketNotifications::DeviceConfigurationChange(Notification); - std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << - " Pending:" << State_.PendingUUID << " Upgraded:" << UpgradedUUID << std::endl; +// std::cout << __LINE__ << ": " << SerialNumber_ << " GoodConfig: " << GoodConfig << " UUID:" << UUID << +// " Pending:" << State_.PendingUUID << " Upgraded:" << UpgradedUUID << std::endl; return true; } diff --git a/src/CommandManager.cpp b/src/CommandManager.cpp index 08e2cc1a5..82ccd3329 100644 --- a/src/CommandManager.cpp +++ b/src/CommandManager.cpp @@ -68,7 +68,6 @@ namespace OpenWifi { CompleteTelemetryCommand(RPC->second, Payload, rpc_execution_time); } else if (RPC->second.Command == APCommands::Commands::configure && RPC->second.rpc_entry==nullptr) { - std::cout << "Complete configure command: " << SerialNumberStr << std::endl; CompleteConfigureCommand(RPC->second, Payload, rpc_execution_time); } else {