From 86ae34cd42e827c01d573acf97ce4b3fbfc659a9 Mon Sep 17 00:00:00 2001
From: Song Guo <songguo@google.com>
Date: Wed, 12 Jan 2022 15:01:40 +0800
Subject: [PATCH] Address comments

---
 .../all-clusters-app/all-clusters-common/all-clusters-app.zap  | 2 +-
 src/app/clusters/test-cluster-server/test-cluster-server.cpp   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index c505794a79f9b4..b58f1250ad2da6 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -16363,7 +16363,7 @@
               "mfgCode": null,
               "side": "server",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
index 43aac822fce3ef..31172c8c08ace7 100644
--- a/src/app/clusters/test-cluster-server/test-cluster-server.cpp
+++ b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
@@ -412,7 +412,6 @@ CHIP_ERROR TestAttrAccess::WriteStructAttribute(AttributeValueDecoder & aDecoder
 CHIP_ERROR TestAttrAccess::ReadListFabricScopedAttribute(AttributeValueEncoder & aEncoder)
 {
     return aEncoder.EncodeList([](const auto & encoder) -> CHIP_ERROR {
-        // Just encode our one struct for now.
         auto fabricTable = Server::GetInstance().GetFabricTable();
 
         chip::app::Clusters::TestCluster::Structs::TestFabricScoped::Type val;
@@ -424,7 +423,7 @@ CHIP_ERROR TestAttrAccess::ReadListFabricScopedAttribute(AttributeValueEncoder &
         }
 
         // Always append a fake fabric index so we can test fabric filter even when there is only one fabric provisioned.
-        val.fabricIndex = 0xFF;
+        val.fabricIndex = kUndefinedFabricIndex;
         ReturnErrorOnFailure(encoder.Encode(val));
         return CHIP_NO_ERROR;
     });