Update to spec change for unsupported event errors.

project-chip · Jun 7, 2023 · 7a90143 · 7a90143
1 parent 09dab68
commit 7a90143
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/app/reporting/Engine.cpp b/src/app/reporting/Engine.cpp
@@ -311,7 +311,6 @@ CHIP_ERROR Engine::CheckAccessDeniedEventPaths(TLV::TLVWriter & aWriter, bool &
         if (status != Status::Success)
         {
             TLV::TLVWriter checkpoint = aWriter;
-            // For events, spec says to use UNSUPPORTED_EVENT
             err = EventReportIB::ConstructEventStatusIB(aWriter, path, StatusIB(status));
             if (err != CHIP_NO_ERROR)
             {

diff --git a/src/app/tests/TestAclAttribute.cpp b/src/app/tests/TestAclAttribute.cpp
@@ -146,7 +146,7 @@ Protocols::InteractionModel::Status CheckEventSupportStatus(const ConcreteEventP
 {
     if (aPath.mClusterId == kTestDeniedClusterId1)
     {
-        return Protocols::InteractionModel::Status::UnsupportedEvent;
+        return Protocols::InteractionModel::Status::UnsupportedCluster;
     }
 
     return Protocols::InteractionModel::Status::Success;

diff --git a/src/app/tests/suites/TestEvents.yaml b/src/app/tests/suites/TestEvents.yaml
@@ -38,7 +38,7 @@ tests:
       event: "TestEvent"
       endpoint: 0
       response:
-          error: UNSUPPORTED_EVENT
+          error: UNSUPPORTED_CLUSTER
 
     - label: "Generate an event on the accessory"
       command: "TestEmitTestEventRequest"

diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp
@@ -1074,14 +1074,20 @@ bool IsDeviceTypeOnEndpoint(DeviceTypeId deviceType, EndpointId endpoint)
 Protocols::InteractionModel::Status CheckEventSupportStatus(const ConcreteEventPath & aPath)
 {
     using Protocols::InteractionModel::Status;
-#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
-    auto * cluster = emberAfFindServerCluster(aPath.mEndpointId, aPath.mClusterId);
+
+    const EmberAfEndpointType * type = emberAfFindEndpointType(aPath.mEndpointId);
+    if (type == nullptr)
+    {
+        return Status::UnsupportedEndpoint;
+    }
+
+    const EmberAfCluster * cluster = emberAfFindClusterInType(type, aPath.mClusterId, CLUSTER_MASK_SERVER);
     if (cluster == nullptr)
     {
-        // Spec seems to say UNSUPPORTED_EVENT for this situation.
-        return Status::UnsupportedEvent;
+        return Status::UnsupportedCluster;
     }
 
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
     for (size_t i = 0; i < cluster->eventCount; ++i)
     {
         if (cluster->eventList[i] == aPath.mEventId)

diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h