Merge branch 'imdm/3-ember-read-attribute' of github.com:andy31415/connectedhomeip into imdm/3-ember-read-attribute

Author: andreilitvin

src/app/codegen-data-model/CodegenDataModel_Read.cpp

@@ -61,14 +61,19 @@ FindAttributeMetadata(const ConcreteAttributePath & aPath)
 {
     for (auto & attr : GlobalAttributesNotInMetadata)
     {
+
         if (attr == aPath.mAttributeId)
         {
             const EmberAfCluster * cluster = emberAfFindServerCluster(aPath.mEndpointId, aPath.mClusterId);
-            ReturnErrorCodeIf(cluster == nullptr, CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute));
+            if (cluster == nullptr)
+            {
+                return (emberAfFindEndpointType(aPath.mEndpointId) == nullptr) ? CHIP_IM_GLOBAL_STATUS(UnsupportedEndpoint)
+                                                                               : CHIP_IM_GLOBAL_STATUS(UnsupportedCluster);
+            }
+
             return cluster;
         }
     }
-
     const EmberAfAttributeMetadata * metadata =
         emberAfLocateAttributeMetadata(aPath.mEndpointId, aPath.mClusterId, aPath.mAttributeId);
 
@@ -123,7 +128,7 @@ std::optional<CHIP_ERROR> TryReadViaAccessInterface(const ConcreteAttributePath
     }
 
     // If the encoder tried to encode, then a value should have been written.
-    //   - if encode, assueme DONE (i.e. FINAL CHIP_NO_ERROR)
+    //   - if encode, assume DONE (i.e. FINAL CHIP_NO_ERROR)
     //   - if no encode, say that processing must continue
     return encoder.TriedEncode() ? std::make_optional(CHIP_NO_ERROR) : std::nullopt;
 }
@@ -290,7 +295,7 @@ CHIP_ERROR EncodeEmberValue(ByteSpan data, const EmberAfAttributeMetadata * meta
 CHIP_ERROR CodegenDataModel::ReadAttribute(const InteractionModel::ReadAttributeRequest & request, AttributeValueEncoder & encoder)
 {
     ChipLogDetail(DataManagement,
-                  "Reading attribute: Cluster=" ChipLogFormatMEI " Endpoint=%x AttributeId=" ChipLogFormatMEI " (expanded=%d)",
+                  "Reading attribute: Cluster=" ChipLogFormatMEI " Endpoint=0x%x AttributeId=" ChipLogFormatMEI " (expanded=%d)",
                   ChipLogValueMEI(request.path.mClusterId), request.path.mEndpointId, ChipLogValueMEI(request.path.mAttributeId),
                   request.path.mExpanded);
 
@@ -340,8 +345,7 @@ CHIP_ERROR CodegenDataModel::ReadAttribute(const InteractionModel::ReadAttribute
     {
         // if we only got a cluster, this was for a global attribute. We cannot read ember attributes
         // at this point, so give up (although GlobalAttributeReader should have returned something here).
-        // Return a permanent failure...
-        return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
+        chipDie();
     }
     const EmberAfAttributeMetadata * attributeMetadata = std::get<const EmberAfAttributeMetadata *>(metadata);
 

src/app/codegen-data-model/tests/TestAttributeReportIBsEncoding.cpp

@@ -43,7 +43,7 @@ CHIP_ERROR DecodeAttributeReportIBs(ByteSpan data, std::vector<DecodedAttributeD
     //     0x01 => Array (i.e. report data ib)
     //       ReportIB*
     //
-    // Overally this is VERY hard to process ...
+    // Generally this is VERY hard to process ...
     //
     TLV::TLVReader reportIBsReader;
     reportIBsReader.Init(data);

src/app/codegen-data-model/tests/TestCodegenModelViaMocks.cpp

@@ -976,6 +976,27 @@ TEST(TestCodegenModelViaMocks, EmberAttributeReadAclDeny)
     ASSERT_EQ(model.ReadAttribute(testRequest.request, *encoder), CHIP_ERROR_ACCESS_DENIED);
 }
 
+TEST(TestCodegenModelViaMocks, ReadForInvalidGlobalAttributePath)
+{
+    UseMockNodeConfig config(gTestNodeConfig);
+    chip::app::CodegenDataModel model;
+    ScopedMockAccessControl accessControl;
+
+    {
+        TestReadRequest testRequest(kAdminSubjectDescriptor,
+                                    ConcreteAttributePath(kEndpointIdThatIsMissing, MockClusterId(1), AttributeList::Id));
+        std::unique_ptr<AttributeValueEncoder> encoder = testRequest.StartEncoding(&model);
+        ASSERT_EQ(model.ReadAttribute(testRequest.request, *encoder), CHIP_IM_GLOBAL_STATUS(UnsupportedEndpoint));
+    }
+
+    {
+        TestReadRequest testRequest(kAdminSubjectDescriptor,
+                                    ConcreteAttributePath(kMockEndpoint1, kInvalidClusterId, AttributeList::Id));
+        std::unique_ptr<AttributeValueEncoder> encoder = testRequest.StartEncoding(&model);
+        ASSERT_EQ(model.ReadAttribute(testRequest.request, *encoder), CHIP_IM_GLOBAL_STATUS(UnsupportedCluster));
+    }
+}
+
 TEST(TestCodegenModelViaMocks, EmberAttributeInvalidRead)
 {
     UseMockNodeConfig config(gTestNodeConfig);