From 4323356c114601fff5b7787482234daee3455854 Mon Sep 17 00:00:00 2001
From: "Irene Siu (Apple)" <irene_siu@apple.com>
Date: Mon, 14 Mar 2022 14:58:50 -0700
Subject: [PATCH] Change CLI option behavior for OTA-R and OTA-P to revert back
 to the success case after using the CLI supplied values (#16095)

* Issue #15656 [ota-provider-app] Add counters for various QueryImageResponse and ApplyImageResponse commands

- For OTA-P, make -q, -a, and -u be applied just once and then revert back to the success case.

* - Remove debug logs
- Remove counters and just revert behavior to success case after first use
- Fix userConsentState ignore once case

* - Update ReadMes and CLI comments.

* - Remove debug code.
- Remove count variables.

* scripts/helpers/restyle-diff.sh

* Resolve spellcheck errors.

* Code review changes.

- Update comments.

* scripts/helpers/restyle-diff.sh

* Code review changes.

- Split -t command line arg into -t and -p.

* scripts/helpers/restyle-diff.sh

* Code review changes.

- Update readme and CLI info texts.
---
 .github/.wordlist.txt                         |  3 +-
 .../esp32/main/OTAProviderCommands.cpp        |  3 +-
 examples/ota-provider-app/linux/README.md     | 27 ++++-----
 examples/ota-provider-app/linux/main.cpp      | 56 ++++++++++++-------
 .../DefaultUserConsentProvider.cpp            |  5 +-
 .../OTAProviderExample.cpp                    | 23 ++++++--
 .../ota-provider-common/OTAProviderExample.h  |  6 +-
 examples/ota-requestor-app/linux/README.md    | 11 ++--
 examples/ota-requestor-app/linux/main.cpp     |  2 +
 .../DefaultOTARequestorUserConsentProvider.h  |  6 +-
 10 files changed, 92 insertions(+), 50 deletions(-)

diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
index ef7265d8085079..c9d72a3179beee 100644
--- a/.github/.wordlist.txt
+++ b/.github/.wordlist.txt
@@ -326,7 +326,8 @@ DefaultSuccess
 definedValue
 DehumidificationControl
 DelayedActionTime
-delayedActionTimeSec
+delayedApplyActionTimeSec
+delayedQueryActionTimeSec
 delayQuery
 demangle
 deployable
diff --git a/examples/ota-provider-app/esp32/main/OTAProviderCommands.cpp b/examples/ota-provider-app/esp32/main/OTAProviderCommands.cpp
index 58bf1ee1320f16..695e9518e699a0 100644
--- a/examples/ota-provider-app/esp32/main/OTAProviderCommands.cpp
+++ b/examples/ota-provider-app/esp32/main/OTAProviderCommands.cpp
@@ -34,7 +34,8 @@ CHIP_ERROR DelayedActionTimeHandler(int argc, char ** argv)
     VerifyOrReturnError(exampleOTAProvider != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
     const uint32_t delay = strtoul(argv[0], nullptr, 10);
-    exampleOTAProvider->SetDelayedActionTimeSec(delay);
+    exampleOTAProvider->SetDelayedQueryActionTimeSec(delay);
+    exampleOTAProvider->SetDelayedApplyActionTimeSec(delay);
     return CHIP_NO_ERROR;
 }
 
diff --git a/examples/ota-provider-app/linux/README.md b/examples/ota-provider-app/linux/README.md
index 2de22c0ef6deec..b9693154bc1305 100644
--- a/examples/ota-provider-app/linux/README.md
+++ b/examples/ota-provider-app/linux/README.md
@@ -13,19 +13,20 @@ scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug c
 
 ## Usage
 
-| Command Line Options                                                  | Description                                                                                                                                                                                                                                                                                                                                                                           |
-| --------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| -f/--filepath <file>                                                  | Path to a file containing an OTA image                                                                                                                                                                                                                                                                                                                                                |
-| -o/--otaImageList <file>                                              | Path to a file containing a list of OTA images                                                                                                                                                                                                                                                                                                                                        |
-| -q/--queryImageStatus <updateAvailable \| busy \| updateNotAvailable> | Value for the Status field in the QueryImageResponse                                                                                                                                                                                                                                                                                                                                  |
-| -x/--ignoreQueryImage <num_times_to_ignore>                           | The number of times to ignore the QueryImage Command and not send a response                                                                                                                                                                                                                                                                                                          |  |
-| -y/--ignoreApplyUpdate <num_times_to_ignore>                          | The number of times to ignore the ApplyUpdate Request and not send a response                                                                                                                                                                                                                                                                                                         |
-| -a/--applyUpdateAction <proceed \| awaitNextAction \| discontinue>    | Value for the Action field in the ApplyUpdateResponse                                                                                                                                                                                                                                                                                                                                 |
-| -t/--delayedActionTimeSec <time>                                      | Value in seconds for the DelayedActionTime field in the QueryImageResponse and ApplyUpdateResponse                                                                                                                                                                                                                                                                                    |
-| -u/--userConsentState <granted \| denied \| deferred>                 | Current user consent state which results in various values for Status field in QueryImageResponse <br> Note that -q/--queryImageStatus overrides this option <li> granted: Status field in QueryImageResponse is set to updateAvailable <li> denied: Status field in QueryImageResponse is set to updateNotAvailable <li> deferred: Status field in QueryImageResponse is set to busy |
-| -s/--softwareVersion <version>                                        | Value for the SoftwareVersion field in the QueryImageResponse <br> Note that -o/--otaImageList overrides this option                                                                                                                                                                                                                                                                  |
-| -S/--softwareVersionStr <version string>                              | Value for the SoftwareVersionString field in the QueryImageResponse <br> Note that -o/--otaImageList overrides this option                                                                                                                                                                                                                                                            |
-| -c/--UserConsentNeeded                                                | If provided, and value of RequestorCanConsent field in QueryImage Command is true, <br> then value of UserConsentNeeded field in the QueryImageResponse is set to true. <br> Else, value of UserConsentNeeded is false.                                                                                                                                                               |
+| Command Line Options                                                  | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| --------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| -f/--filepath <file>                                                  | Path to a file containing an OTA image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| -o/--otaImageList <file>                                              | Path to a file containing a list of OTA images                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| -q/--queryImageStatus <updateAvailable \| busy \| updateNotAvailable> | Value for the Status field in the first QueryImageResponse. <br> For all subsequent responses, the value of updateAvailable will be used.                                                                                                                                                                                                                                                                                                                                                                                  |
+| -x/--ignoreQueryImage <num_times_to_ignore>                           | The number of times to ignore the QueryImage Command and not send a response                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| -y/--ignoreApplyUpdate <num_times_to_ignore>                          | The number of times to ignore the ApplyUpdate Request and not send a response                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| -a/--applyUpdateAction <proceed \| awaitNextAction \| discontinue>    | Value for the Action field in the first ApplyUpdateResponse. <br> For all subsequent responses, the value of proceed will be used.                                                                                                                                                                                                                                                                                                                                                                                         |
+| -t/--delayedQueryActionTimeSec <time>                                 | Value in seconds for the DelayedActionTime field in the first QueryImageResponse. <br> Value will revert back to 0 seconds on subsequent QueryImage Responses.                                                                                                                                                                                                                                                                                                                                                             |
+| -p/--delayedApplyActionTimeSec <time>                                 | Value in seconds for the DelayedActionTime field in the first ApplyUpdateResponse. <br> Value will revert back to 0 seconds on subsequent ApplyUpdate Responses.                                                                                                                                                                                                                                                                                                                                                           |
+| -u/--userConsentState <granted \| denied \| deferred>                 | The user consent state for the first QueryImageResponse. For all subsequent responses, the value of granted state will be used. <br> Current user consent state which results in various values for Status field in QueryImageResponse <br> Note that -q/--queryImageStatus overrides this option <li> granted: Status field in QueryImageResponse is set to updateAvailable <li> denied: Status field in QueryImageResponse is set to updateNotAvailable <li> deferred: Status field in QueryImageResponse is set to busy |
+| -s/--softwareVersion <version>                                        | Value for the SoftwareVersion field in the QueryImageResponse <br> Note that -o/--otaImageList overrides this option                                                                                                                                                                                                                                                                                                                                                                                                       |
+| -S/--softwareVersionStr <version string>                              | Value for the SoftwareVersionString field in the QueryImageResponse <br> Note that -o/--otaImageList overrides this option                                                                                                                                                                                                                                                                                                                                                                                                 |
+| -c/--UserConsentNeeded                                                | If provided, and value of RequestorCanConsent field in QueryImage Command is true, <br> then value of UserConsentNeeded field in the QueryImageResponse is set to true. <br> Else, value of UserConsentNeeded is false.                                                                                                                                                                                                                                                                                                    |
 
 **Using `--filepath` and `--otaImageList`**
 
diff --git a/examples/ota-provider-app/linux/main.cpp b/examples/ota-provider-app/linux/main.cpp
index fd4f9faf42f747..cf2de8a415cc03 100644
--- a/examples/ota-provider-app/linux/main.cpp
+++ b/examples/ota-provider-app/linux/main.cpp
@@ -43,17 +43,18 @@ using namespace chip::app::Clusters::OtaSoftwareUpdateProvider;
 // TODO: this should probably be done dynamically
 constexpr chip::EndpointId kOtaProviderEndpoint = 0;
 
-constexpr uint16_t kOptionFilepath             = 'f';
-constexpr uint16_t kOptionOtaImageList         = 'o';
-constexpr uint16_t kOptionQueryImageStatus     = 'q';
-constexpr uint16_t kOptionIgnoreQueryImage     = 'x';
-constexpr uint16_t kOptionIgnoreApplyUpdate    = 'y';
-constexpr uint16_t kOptionUserConsentState     = 'u';
-constexpr uint16_t kOptionUpdateAction         = 'a';
-constexpr uint16_t kOptionDelayedActionTimeSec = 't';
-constexpr uint16_t kOptionSoftwareVersion      = 's';
-constexpr uint16_t kOptionSoftwareVersionStr   = 'S';
-constexpr uint16_t kOptionUserConsentNeeded    = 'c';
+constexpr uint16_t kOptionFilepath                  = 'f';
+constexpr uint16_t kOptionOtaImageList              = 'o';
+constexpr uint16_t kOptionQueryImageStatus          = 'q';
+constexpr uint16_t kOptionIgnoreQueryImage          = 'x';
+constexpr uint16_t kOptionIgnoreApplyUpdate         = 'y';
+constexpr uint16_t kOptionUserConsentState          = 'u';
+constexpr uint16_t kOptionUpdateAction              = 'a';
+constexpr uint16_t kOptionDelayedQueryActionTimeSec = 't';
+constexpr uint16_t kOptionDelayedApplyActionTimeSec = 'p';
+constexpr uint16_t kOptionSoftwareVersion           = 's';
+constexpr uint16_t kOptionSoftwareVersionStr        = 'S';
+constexpr uint16_t kOptionUserConsentNeeded         = 'c';
 
 OTAProviderExample gOtaProvider;
 chip::ota::DefaultUserConsentProvider gUserConsentProvider;
@@ -61,7 +62,8 @@ chip::ota::DefaultUserConsentProvider gUserConsentProvider;
 // Global variables used for passing the CLI arguments to the OTAProviderExample object
 static OTAProviderExample::QueryImageBehaviorType gQueryImageBehavior = OTAProviderExample::kRespondWithUnknown;
 static OTAApplyUpdateAction gOptionUpdateAction                       = OTAApplyUpdateAction::kProceed;
-static uint32_t gDelayedActionTimeSec                                 = 0;
+static uint32_t gDelayedQueryActionTimeSec                            = 0;
+static uint32_t gDelayedApplyActionTimeSec                            = 0;
 static const char * gOtaFilepath                                      = nullptr;
 static const char * gOtaImageListFilepath                             = nullptr;
 static chip::ota::UserConsentState gUserConsentState                  = chip::ota::UserConsentState::kUnknown;
@@ -220,8 +222,11 @@ bool HandleOptions(const char * aProgram, OptionSet * aOptions, int aIdentifier,
             retval = false;
         }
         break;
-    case kOptionDelayedActionTimeSec:
-        gDelayedActionTimeSec = static_cast<uint32_t>(strtoul(aValue, NULL, 0));
+    case kOptionDelayedQueryActionTimeSec:
+        gDelayedQueryActionTimeSec = static_cast<uint32_t>(strtoul(aValue, NULL, 0));
+        break;
+    case kOptionDelayedApplyActionTimeSec:
+        gDelayedApplyActionTimeSec = static_cast<uint32_t>(strtoul(aValue, NULL, 0));
         break;
     case kOptionUserConsentState:
         if (aValue == NULL)
@@ -285,7 +290,8 @@ OptionDef cmdLineOptionsDef[] = {
     { "ignoreQueryImage", chip::ArgParser::kArgumentRequired, kOptionIgnoreQueryImage },
     { "ignoreApplyUpdate", chip::ArgParser::kArgumentRequired, kOptionIgnoreApplyUpdate },
     { "applyUpdateAction", chip::ArgParser::kArgumentRequired, kOptionUpdateAction },
-    { "delayedActionTimeSec", chip::ArgParser::kArgumentRequired, kOptionDelayedActionTimeSec },
+    { "delayedQueryActionTimeSec", chip::ArgParser::kArgumentRequired, kOptionDelayedQueryActionTimeSec },
+    { "delayedApplyActionTimeSec", chip::ArgParser::kArgumentRequired, kOptionDelayedApplyActionTimeSec },
     { "userConsentState", chip::ArgParser::kArgumentRequired, kOptionUserConsentState },
     { "softwareVersion", chip::ArgParser::kArgumentRequired, kOptionSoftwareVersion },
     { "softwareVersionStr", chip::ArgParser::kArgumentRequired, kOptionSoftwareVersionStr },
@@ -299,17 +305,24 @@ OptionSet cmdLineOptions = { HandleOptions, cmdLineOptionsDef, "PROGRAM OPTIONS"
                              "  -o/--otaImageList <file>\n"
                              "        Path to a file containing a list of OTA images\n"
                              "  -q/--queryImageStatus <updateAvailable | busy | updateNotAvailable>\n"
-                             "        Value for the Status field in the QueryImageResponse\n"
+                             "        Value for the Status field in the first QueryImageResponse.\n"
+                             "        For all subsequent responses, the value of updateAvailable will be used.\n"
                              "  -x/--ignoreQueryImage <num_times_to_ignore>\n"
                              "        The number of times to ignore the QueryImage Command and not send a response.\n"
                              "  -y/--ignoreApplyUpdate <num_times_to_ignore>\n"
                              "        The number of times to ignore the ApplyUpdate Request and not send a response.\n"
                              "  -a/--applyUpdateAction <proceed | awaitNextAction | discontinue>\n"
-                             "        Value for the Action field in the ApplyUpdateResponse\n"
-                             "  -t/--delayedActionTimeSec <time>\n"
-                             "        Value in seconds for the DelayedActionTime field in the QueryImageResponse\n"
-                             "        and ApplyUpdateResponse\n"
+                             "        Value for the Action field in the first ApplyUpdateResponse.\n"
+                             "        For all subsequent responses, the value of proceed will be used.\n"
+                             "  -t/--delayedQueryActionTimeSec <time>\n"
+                             "        Value in seconds for the first DelayedActionTime field in the QueryImageResponse.\n"
+                             "        Value will revert back to 0 seconds on subsequent QueryImageResponses.\n"
+                             "  -p/--delayedApplyActionTimeSec <time>\n"
+                             "        Value in seconds for the first DelayedActionTime field in the ApplyUpdateResponse.\n"
+                             "        Value will revert back to 0 seconds on subsequent ApplyUpdateResponses.\n"
                              "  -u/--userConsentState <granted | denied | deferred>\n"
+                             "        The user consent state for the first QueryImageResponse. For all subsequent\n"
+                             "        responses, the value of granted state will be used.\n"
                              "        granted: Status field in QueryImageResponse is set to updateAvailable\n"
                              "        denied: Status field in QueryImageResponse is set to updateNotAvailable\n"
                              "        deferred: Status field in QueryImageResponse is set to busy\n"
@@ -352,7 +365,8 @@ void ApplicationInit()
     gOtaProvider.SetIgnoreQueryImageCount(gIgnoreQueryImageCount);
     gOtaProvider.SetIgnoreApplyUpdateCount(gIgnoreApplyUpdateCount);
     gOtaProvider.SetApplyUpdateAction(gOptionUpdateAction);
-    gOtaProvider.SetDelayedActionTimeSec(gDelayedActionTimeSec);
+    gOtaProvider.SetDelayedQueryActionTimeSec(gDelayedQueryActionTimeSec);
+    gOtaProvider.SetDelayedApplyActionTimeSec(gDelayedApplyActionTimeSec);
     if (gSoftwareVersion.HasValue())
     {
         gOtaProvider.SetSoftwareVersion(gSoftwareVersion.Value());
diff --git a/examples/ota-provider-app/ota-provider-common/DefaultUserConsentProvider.cpp b/examples/ota-provider-app/ota-provider-common/DefaultUserConsentProvider.cpp
index 5e0066c50fe55f..2c9d676147d342 100644
--- a/examples/ota-provider-app/ota-provider-common/DefaultUserConsentProvider.cpp
+++ b/examples/ota-provider-app/ota-provider-common/DefaultUserConsentProvider.cpp
@@ -26,7 +26,10 @@ UserConsentState DefaultUserConsentProvider::GetUserConsentState(const UserConse
 
     if (mUseGlobalConsent)
     {
-        return mGlobalConsentState;
+        // Reset mGlobalConsentState to success case after returning other possible values once.
+        UserConsentState curGlobalConsentState = mGlobalConsentState;
+        mGlobalConsentState                    = UserConsentState::kGranted;
+        return curGlobalConsentState;
     }
 
     return UserConsentState::kGranted;
diff --git a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp
index 79dd79b275d1b6..a85b7918c90442 100644
--- a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp
+++ b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp
@@ -78,8 +78,9 @@ void GenerateUpdateToken(uint8_t * buf, size_t bufSize)
 OTAProviderExample::OTAProviderExample()
 {
     memset(mOTAFilePath, 0, kFilepathBufLen);
-    mQueryImageBehavior   = kRespondWithNotAvailable;
-    mDelayedActionTimeSec = 0;
+    mQueryImageBehavior        = kRespondWithNotAvailable;
+    mDelayedQueryActionTimeSec = 0;
+    mDelayedApplyActionTimeSec = 0;
     mCandidates.clear();
 }
 
@@ -158,7 +159,7 @@ EmberAfStatus OTAProviderExample::HandleQueryImage(chip::app::CommandHandler * c
     uint8_t updateToken[kUpdateTokenLen]  = { 0 };
     char strBuf[kUpdateTokenStrLen]       = { 0 };
     char uriBuf[kUriMaxLen]               = { 0 };
-    uint32_t delayedActionTimeSec         = mDelayedActionTimeSec;
+    uint32_t delayedQueryActionTimeSec    = mDelayedQueryActionTimeSec;
     bool requestorCanConsent              = commandData.requestorCanConsent.ValueOr(false);
     QueryImageResponse::Type response;
 
@@ -246,6 +247,9 @@ EmberAfStatus OTAProviderExample::HandleQueryImage(chip::app::CommandHandler * c
         break;
     }
 
+    // Reset with default success behavior
+    mQueryImageBehavior = OTAProviderExample::kRespondWithUpdateAvailable;
+
     if (queryStatus == OTAQueryStatus::kUpdateAvailable)
     {
         GenerateUpdateToken(updateToken, kUpdateTokenLen);
@@ -281,7 +285,7 @@ EmberAfStatus OTAProviderExample::HandleQueryImage(chip::app::CommandHandler * c
     }
 
     response.status = queryStatus;
-    response.delayedActionTime.Emplace(delayedActionTimeSec);
+    response.delayedActionTime.Emplace(delayedQueryActionTimeSec);
     if (mUserConsentNeeded && requestorCanConsent)
     {
         response.userConsentNeeded.Emplace(true);
@@ -296,6 +300,9 @@ EmberAfStatus OTAProviderExample::HandleQueryImage(chip::app::CommandHandler * c
         response.metadataForRequestor.Emplace(chip::ByteSpan());
     }
 
+    // Reset delay back to 0 for subsequent uses
+    mDelayedQueryActionTimeSec = 0;
+
     VerifyOrReturnError(commandObj->AddResponseData(commandPath, response) == CHIP_NO_ERROR, EMBER_ZCL_STATUS_FAILURE);
 
     return EMBER_ZCL_STATUS_SUCCESS;
@@ -323,7 +330,13 @@ EmberAfStatus OTAProviderExample::HandleApplyUpdateRequest(chip::app::CommandHan
 
     ApplyUpdateResponse::Type response;
     response.action            = mUpdateAction;
-    response.delayedActionTime = mDelayedActionTimeSec;
+    response.delayedActionTime = mDelayedApplyActionTimeSec;
+
+    // Reset delay back to 0 for subsequent uses
+    mDelayedApplyActionTimeSec = 0;
+    // Reset back to success case for subsequent uses
+    mUpdateAction = OTAApplyUpdateAction::kProceed;
+
     VerifyOrReturnError(commandObj->AddResponseData(commandPath, response) == CHIP_NO_ERROR, EMBER_ZCL_STATUS_FAILURE);
 
     return EMBER_ZCL_STATUS_SUCCESS;
diff --git a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.h b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.h
index d49732ad6bec35..9e1200cd81d239 100644
--- a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.h
+++ b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.h
@@ -76,7 +76,8 @@ class OTAProviderExample : public chip::app::Clusters::OTAProviderDelegate
     {
         mUpdateAction = action;
     }
-    void SetDelayedActionTimeSec(uint32_t time) { mDelayedActionTimeSec = time; }
+    void SetDelayedQueryActionTimeSec(uint32_t time) { mDelayedQueryActionTimeSec = time; }
+    void SetDelayedApplyActionTimeSec(uint32_t time) { mDelayedApplyActionTimeSec = time; }
     void SetUserConsentDelegate(chip::ota::UserConsentDelegate * delegate) { mUserConsentDelegate = delegate; }
     void SetSoftwareVersion(uint32_t softwareVersion) { mSoftwareVersion.SetValue(softwareVersion); }
     void SetSoftwareVersionString(const char * versionString) { mSoftwareVersionString = versionString; }
@@ -91,7 +92,8 @@ class OTAProviderExample : public chip::app::Clusters::OTAProviderDelegate
     uint32_t mIgnoreQueryImageCount  = 0;
     uint32_t mIgnoreApplyUpdateCount = 0;
     chip::app::Clusters::OtaSoftwareUpdateProvider::OTAApplyUpdateAction mUpdateAction;
-    uint32_t mDelayedActionTimeSec;
+    uint32_t mDelayedApplyActionTimeSec = 0;
+    uint32_t mDelayedQueryActionTimeSec = 0;
     bool SelectOTACandidate(const uint16_t requestorVendorID, const uint16_t requestorProductID,
                             const uint32_t requestorSoftwareVersion,
                             OTAProviderExample::DeviceSoftwareVersionModel & finalCandidate);
diff --git a/examples/ota-requestor-app/linux/README.md b/examples/ota-requestor-app/linux/README.md
index 88b1ae729d5d3f..f192d94c54b74f 100644
--- a/examples/ota-requestor-app/linux/README.md
+++ b/examples/ota-requestor-app/linux/README.md
@@ -17,11 +17,12 @@ scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux out/debug
 In addition to the general options available to all Linux applications, the
 following command line options are available for the OTA Requestor application.
 
-| Directory                                   | Description                                                                                                                                 |
-| ------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| -p/--periodicQueryTimeout <Time in seconds> | Periodic timeout for querying providers in the default OTA provider list. If none or zero is supplied the timeout is set to every 24 hours. |
-| -c/--requestorCanConsent                    | If supplied, the RequestorCanConsent field of the QueryImage command is set to true. Otherwise, the value is determined by the driver.      |
-| -f/--otaDownloadPath <file path>            | If supplied, the OTA image is downloaded to the given fully-qualified file-path. Otherwise, the value defaults to /tmp/test.bin.            |
+| Directory                                             | Description                                                                                                                                                                                                                                                                                    |
+| ----------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| -p/--periodicQueryTimeout <Time in seconds>           | Periodic timeout for querying providers in the default OTA provider list. If none or zero is supplied the timeout is set to every 24 hours.                                                                                                                                                    |
+| -c/--requestorCanConsent                              | If supplied, the RequestorCanConsent field of the QueryImage command is set to true. Otherwise, the value is determined by the driver.                                                                                                                                                         |
+| -f/--otaDownloadPath <file path>                      | If supplied, the OTA image is downloaded to the given fully-qualified file-path. Otherwise, the value defaults to /tmp/test.bin.                                                                                                                                                               |
+| -u/--userConsentState <granted \| denied \| deferred> | The user consent state for the first QueryImage command. For all subsequent commands, the value of granted will be used. <li> granted: Authorize OTA requestor to download an OTA image <li> denied: Forbid OTA requestor to download an OTA image <li> deferred: Defer obtaining user consent |
 
 ## Software Image Header
 
diff --git a/examples/ota-requestor-app/linux/main.cpp b/examples/ota-requestor-app/linux/main.cpp
index 520c30a099542c..454db06ddecb04 100644
--- a/examples/ota-requestor-app/linux/main.cpp
+++ b/examples/ota-requestor-app/linux/main.cpp
@@ -93,6 +93,8 @@ OptionSet cmdLineOptions = { HandleOptions, cmdLineOptionsDef, "PROGRAM OPTIONS"
                              "        If supplied, the OTA image is downloaded to the given fully-qualified file-path.\n"
                              "        Otherwise, the value defaults to /tmp/test.bin.\n "
                              "  -u/--userConsentState <granted | denied | deferred>\n"
+                             "        The user consent state for the first QueryImage command. For all\n"
+                             "        subsequent commands, the value of granted will be used.\n"
                              "        granted: Authorize OTA requestor to download an OTA image\n"
                              "        denied: Forbid OTA requestor to download an OTA image\n"
                              "        deferred: Defer obtaining user consent \n" };
diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestorUserConsentProvider.h b/src/app/clusters/ota-requestor/DefaultOTARequestorUserConsentProvider.h
index 59ed20d95ded1b..d75d6a5c957b23 100644
--- a/src/app/clusters/ota-requestor/DefaultOTARequestorUserConsentProvider.h
+++ b/src/app/clusters/ota-requestor/DefaultOTARequestorUserConsentProvider.h
@@ -33,8 +33,12 @@ class DefaultOTARequestorUserConsentProvider : public OTARequestorUserConsentDel
     // This method returns kGranted unless explicitly set by the user by calling SetUserConsentState()
     UserConsentState GetUserConsentState(const UserConsentSubject & subject) override
     {
+        UserConsentState curUserConsentState = mUserConsentState;
+
         subject.Log();
-        return mUserConsentState;
+        mUserConsentState = chip::ota::UserConsentState::kGranted;
+
+        return curUserConsentState;
     }
 
     UserConsentState CheckDeferredUserConsentState() override { return mUserConsentState; }