Return InvalidCommand instead of UnsupportedCluster if the command is…

… not handled in CHI
project-chip · Jan 23, 2025 · 5c36f8c · 5c36f8c
1 parent 47a95b9
commit 5c36f8c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/data-model-providers/codegen/CodegenDataModelProvider.cpp b/src/data-model-providers/codegen/CodegenDataModelProvider.cpp
@@ -343,6 +343,13 @@ std::optional<DataModel::ActionReturnStatus> CodegenDataModelProvider::Invoke(co
         {
             return std::nullopt;
         }
+        else
+        {
+            // If we reach here, it means this particular CommandHandlerInterface recognized the cluster but the command is invalid
+            // or cannot be processed.
+            handler->AddStatus(request.path, Protocols::InteractionModel::Status::InvalidCommand);
+            return std::nullopt;
+        }
     }
 
     // Ember always sets the return in the handler