[OPSTATE] fix: Transition error in the Paused Command (#28187)

* fix:when in a Stopped State, will transition to the Paused State on reception of a Pause command. * Fix CI error in TestRVCOperationalState.yaml * zap regen all for test plan
project-chip · Jul 22, 2023 · 8949209 · 8949209
1 parent 8f7dd90
commit 8949209
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/src/app/clusters/operational-state-server/operational-state-server.cpp b/src/app/clusters/operational-state-server/operational-state-server.cpp
@@ -113,7 +113,11 @@ void OperationalStateServer::HandlePauseState(HandlerContext & ctx, const Comman
     VerifyOrReturn(delegate != nullptr, ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::Failure));
     uint8_t opState = delegate->GetCurrentOperationalState();
 
-    if (opState != to_underlying(OperationalStateEnum::kPaused))
+    if (opState != to_underlying(OperationalStateEnum::kPaused) && opState != to_underlying(OperationalStateEnum::kRunning))
+    {
+        err.Set(to_underlying(ErrorStateEnum::kCommandInvalidInState));
+    }
+    else if (opState != to_underlying(OperationalStateEnum::kPaused))
     {
         delegate->HandlePauseStateCallback(err);
     }

diff --git a/src/app/tests/suites/TestRVCOperationalState.yaml b/src/app/tests/suites/TestRVCOperationalState.yaml
@@ -89,26 +89,26 @@ tests:
       response:
           values:
               - name: "CommandResponseState"
-                value: { ErrorStateID: 0 }
+                value: { ErrorStateID: 3 }
 
     - label: "Read current Operational State"
       command: "readAttribute"
       attribute: "OperationalState"
       response:
-          value: 2
+          value: 0
 
     - label: "Resume Command"
       command: "Resume"
       response:
           values:
               - name: "CommandResponseState"
-                value: { ErrorStateID: 0 }
+                value: { ErrorStateID: 3 }
 
     - label: "Read current Operational State"
       command: "readAttribute"
       attribute: "OperationalState"
       response:
-          value: 1
+          value: 0
 
     - label: "Stop Command"
       command: "Stop"
@@ -119,4 +119,4 @@ tests:
       command: "readAttribute"
       attribute: "OperationalState"
       response:
-          value: 1
+          value: 0
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h