[chip-tool] Allow setting the KeepSubscriptions flag (#16706)

project-chip · Apr 1, 2022 · 37094b5 · 37094b5
1 parent 1ded008
commit 37094b5
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/examples/chip-tool/commands/clusters/ReportCommand.h b/examples/chip-tool/commands/clusters/ReportCommand.h
@@ -215,6 +215,10 @@ class ReportCommand : public ModelCommand, public chip::app::ReadClient::Callbac
         {
             params.mMinIntervalFloorSeconds   = minInterval;
             params.mMaxIntervalCeilingSeconds = maxInterval;
+            if (mKeepSubscriptions.HasValue())
+            {
+                params.mKeepSubscriptions = mKeepSubscriptions.Value();
+            }
         }
 
         mReadClient = std::make_unique<chip::app::ReadClient>(chip::app::InteractionModelEngine::GetInstance(),
@@ -297,6 +301,10 @@ class ReportCommand : public ModelCommand, public chip::app::ReadClient::Callbac
         {
             params.mMinIntervalFloorSeconds   = minInterval;
             params.mMaxIntervalCeilingSeconds = maxInterval;
+            if (mKeepSubscriptions.HasValue())
+            {
+                params.mKeepSubscriptions = mKeepSubscriptions.Value();
+            }
         }
 
         mReadClient = std::make_unique<chip::app::ReadClient>(chip::app::InteractionModelEngine::GetInstance(),
@@ -318,6 +326,9 @@ class ReportCommand : public ModelCommand, public chip::app::ReadClient::Callbac
     // up needing it in our class's shared code.
     chip::Optional<bool> mFabricFiltered;
 
+    // mKeepSubscriptions is really only used by the subscribe commands, but we end
+    // up needing it in our class's shared code.
+    chip::Optional<bool> mKeepSubscriptions;
     chip::Optional<chip::EventNumber> mEventNumber;
 
     CHIP_ERROR mError = CHIP_NO_ERROR;
@@ -380,6 +391,7 @@ class SubscribeAttribute : public ReportCommand
         AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
         AddArgument("data-version", 0, UINT32_MAX, &mDataVersion);
         AddArgument("fabric-filtered", 0, 1, &mFabricFiltered);
+        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
         ReportCommand::AddArguments();
     }
 
@@ -391,6 +403,7 @@ class SubscribeAttribute : public ReportCommand
         AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
         AddArgument("data-version", 0, UINT32_MAX, &mDataVersion);
         AddArgument("fabric-filtered", 0, 1, &mFabricFiltered);
+        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
         ReportCommand::AddArguments();
     }
 
@@ -404,6 +417,7 @@ class SubscribeAttribute : public ReportCommand
         AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
         AddArgument("data-version", 0, UINT32_MAX, &mDataVersion);
         AddArgument("fabric-filtered", 0, 1, &mFabricFiltered);
+        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
         ReportCommand::AddArguments();
     }
 
@@ -495,6 +509,7 @@ class SubscribeEvent : public ReportCommand
         AddArgument("event-id", 0, UINT32_MAX, &mEventIds);
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
         AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
+        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
         AddArgument("event-min", 0, UINT64_MAX, &mEventNumber);
         ReportCommand::AddArguments();
     }
@@ -505,6 +520,7 @@ class SubscribeEvent : public ReportCommand
         AddArgument("event-id", 0, UINT32_MAX, &mEventIds);
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
         AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
+        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
         AddArgument("event-min", 0, UINT64_MAX, &mEventNumber);
         ReportCommand::AddArguments();
     }
@@ -517,6 +533,7 @@ class SubscribeEvent : public ReportCommand
         AddArgument("attr-name", eventName);
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
         AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval);
+        AddArgument("keepSubscriptions", 0, 1, &mKeepSubscriptions);
         AddArgument("event-min", 0, UINT64_MAX, &mEventNumber);
         ReportCommand::AddArguments();
     }