[ICD] Remove key from ICD Management cluster (#29562)
* update cluster
* Update Generated files
* update tests
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 1b65362..635052d 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2408,7 +2408,6 @@
fabric_scoped struct MonitoringRegistrationStruct {
fabric_sensitive node_id checkInNodeID = 1;
fabric_sensitive int64u monitoredSubject = 2;
- fabric_sensitive octet_string<16> key = 3;
fabric_idx fabricIndex = 254;
}
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index faea21a..5b774fe 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -1945,7 +1945,6 @@
fabric_scoped struct MonitoringRegistrationStruct {
fabric_sensitive node_id checkInNodeID = 1;
fabric_sensitive int64u monitoredSubject = 2;
- fabric_sensitive octet_string<16> key = 3;
fabric_idx fabricIndex = 254;
}
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 94fcf03..a9d48da 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -1676,7 +1676,6 @@
fabric_scoped struct MonitoringRegistrationStruct {
fabric_sensitive node_id checkInNodeID = 1;
fabric_sensitive int64u monitoredSubject = 2;
- fabric_sensitive octet_string<16> key = 3;
fabric_idx fabricIndex = 254;
}
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
index 7e98126..6750ae1 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -1558,7 +1558,6 @@
fabric_scoped struct MonitoringRegistrationStruct {
fabric_sensitive node_id checkInNodeID = 1;
fabric_sensitive int64u monitoredSubject = 2;
- fabric_sensitive octet_string<16> key = 3;
fabric_idx fabricIndex = 254;
}
diff --git a/src/app/clusters/icd-management-server/icd-management-server.cpp b/src/app/clusters/icd-management-server/icd-management-server.cpp
index a99cf22..10e92c8 100644
--- a/src/app/clusters/icd-management-server/icd-management-server.cpp
+++ b/src/app/clusters/icd-management-server/icd-management-server.cpp
@@ -126,7 +126,6 @@
Structs::MonitoringRegistrationStruct::Type s{ .checkInNodeID = e.checkInNodeID,
.monitoredSubject = e.monitoredSubject,
- .key = e.key,
.fabricIndex = e.fabricIndex };
ReturnErrorOnFailure(subEncoder.Encode(s));
}
diff --git a/src/app/tests/suites/TestIcdManagementCluster.yaml b/src/app/tests/suites/TestIcdManagementCluster.yaml
index d02a3a6..3b62c68 100644
--- a/src/app/tests/suites/TestIcdManagementCluster.yaml
+++ b/src/app/tests/suites/TestIcdManagementCluster.yaml
@@ -167,17 +167,8 @@
response:
value:
[
- {
- CheckInNodeID: 101,
- MonitoredSubject: 1001,
- Key: "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
- },
- {
- CheckInNodeID: 201,
- MonitoredSubject: 2001,
- Key:
- "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f",
- },
+ { CheckInNodeID: 101, MonitoredSubject: 1001 },
+ { CheckInNodeID: 201, MonitoredSubject: 2001 },
]
- label: "Register 1.1"
@@ -201,17 +192,8 @@
response:
value:
[
- {
- CheckInNodeID: 101,
- MonitoredSubject: 1002,
- Key: "\x01\x11\x21\x31\x41\x51\x61\x71\x81\x91\xa1\xb1\xc1\xd1\xe1\xf1",
- },
- {
- CheckInNodeID: 201,
- MonitoredSubject: 2001,
- Key:
- "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f",
- },
+ { CheckInNodeID: 101, MonitoredSubject: 1002 },
+ { CheckInNodeID: 201, MonitoredSubject: 2001 },
]
- label: "Register 2.2 (wrong verification key)"
@@ -238,16 +220,8 @@
response:
value:
[
- {
- CheckInNodeID: 101,
- MonitoredSubject: 1002,
- Key: "\x01\x11\x21\x31\x41\x51\x61\x71\x81\x91\xa1\xb1\xc1\xd1\xe1\xf1",
- },
- {
- CheckInNodeID: 201,
- MonitoredSubject: 2002,
- Key: "\x02\x12\x22\x32\x42\x52\x62\x72\x82\x92\xa2\xb2\xc2\xd2\xe2\x2f",
- },
+ { CheckInNodeID: 101, MonitoredSubject: 1002 },
+ { CheckInNodeID: 201, MonitoredSubject: 2002 },
]
- label: "Unregister 1.1 (wrong key)"
@@ -263,14 +237,7 @@
command: "readAttribute"
attribute: "RegisteredClients"
response:
- value:
- [
- {
- CheckInNodeID: 201,
- MonitoredSubject: 2002,
- Key: "\x02\x12\x22\x32\x42\x52\x62\x72\x82\x92\xa2\xb2\xc2\xd2\xe2\x2f",
- },
- ]
+ value: [{ CheckInNodeID: 201, MonitoredSubject: 2002 }]
- label: "Unregister 2.1"
command: "UnregisterClient"
diff --git a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
index b16101e..6c0d73d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
@@ -27,7 +27,7 @@
<cluster code="0x0046"/>
<item fieldId="1" name="CheckInNodeID" type="node_id" isFabricSensitive="true"/>
<item fieldId="2" name="MonitoredSubject" type="INT64U" isFabricSensitive="true"/>
- <item fieldId="3" name="Key" type="OCTET_STRING" length="16" isFabricSensitive="true"/>
+ <!-- RESERVED = 0x03 -->
</struct>
<cluster>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 5d9ec2b..e873029 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -2713,7 +2713,6 @@
fabric_scoped struct MonitoringRegistrationStruct {
fabric_sensitive node_id checkInNodeID = 1;
fabric_sensitive int64u monitoredSubject = 2;
- fabric_sensitive octet_string<16> key = 3;
fabric_idx fabricIndex = 254;
}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
index d7b5966..88ff61a 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
@@ -25,14 +25,12 @@
class IcdManagementClusterMonitoringRegistrationStruct(
val checkInNodeID: ULong,
val monitoredSubject: ULong,
- val key: ByteArray,
val fabricIndex: UInt
) {
override fun toString(): String = buildString {
append("IcdManagementClusterMonitoringRegistrationStruct {\n")
append("\tcheckInNodeID : $checkInNodeID\n")
append("\tmonitoredSubject : $monitoredSubject\n")
- append("\tkey : $key\n")
append("\tfabricIndex : $fabricIndex\n")
append("}\n")
}
@@ -42,7 +40,6 @@
startStructure(tlvTag)
put(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D), checkInNodeID)
put(ContextSpecificTag(TAG_MONITORED_SUBJECT), monitoredSubject)
- put(ContextSpecificTag(TAG_KEY), key)
put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
endStructure()
}
@@ -51,7 +48,6 @@
companion object {
private const val TAG_CHECK_IN_NODE_I_D = 1
private const val TAG_MONITORED_SUBJECT = 2
- private const val TAG_KEY = 3
private const val TAG_FABRIC_INDEX = 254
fun fromTlv(
@@ -61,7 +57,6 @@
tlvReader.enterStructure(tlvTag)
val checkInNodeID = tlvReader.getULong(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D))
val monitoredSubject = tlvReader.getULong(ContextSpecificTag(TAG_MONITORED_SUBJECT))
- val key = tlvReader.getByteArray(ContextSpecificTag(TAG_KEY))
val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
tlvReader.exitContainer()
@@ -69,7 +64,6 @@
return IcdManagementClusterMonitoringRegistrationStruct(
checkInNodeID,
monitoredSubject,
- key,
fabricIndex
)
}
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 6faa72d..b223c85 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -12377,11 +12377,6 @@
chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
newElement_0_monitoredSubjectClassName.c_str(), newElement_0_monitoredSubjectCtorSignature.c_str(),
jninewElement_0_monitoredSubject, newElement_0_monitoredSubject);
- jobject newElement_0_key;
- jbyteArray newElement_0_keyByteArray = env->NewByteArray(static_cast<jsize>(entry_0.key.size()));
- env->SetByteArrayRegion(newElement_0_keyByteArray, 0, static_cast<jsize>(entry_0.key.size()),
- reinterpret_cast<const jbyte *>(entry_0.key.data()));
- newElement_0_key = newElement_0_keyByteArray;
jobject newElement_0_fabricIndex;
std::string newElement_0_fabricIndexClassName = "java/lang/Integer";
std::string newElement_0_fabricIndexCtorSignature = "(I)V";
@@ -12399,9 +12394,8 @@
ChipLogError(Zcl, "Could not find class ChipStructs$IcdManagementClusterMonitoringRegistrationStruct");
return nullptr;
}
- jmethodID monitoringRegistrationStructStructCtor_1 =
- env->GetMethodID(monitoringRegistrationStructStructClass_1, "<init>",
- "(Ljava/lang/Long;Ljava/lang/Long;[BLjava/lang/Integer;)V");
+ jmethodID monitoringRegistrationStructStructCtor_1 = env->GetMethodID(
+ monitoringRegistrationStructStructClass_1, "<init>", "(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)V");
if (monitoringRegistrationStructStructCtor_1 == nullptr)
{
ChipLogError(Zcl, "Could not find ChipStructs$IcdManagementClusterMonitoringRegistrationStruct constructor");
@@ -12409,8 +12403,7 @@
}
newElement_0 = env->NewObject(monitoringRegistrationStructStructClass_1, monitoringRegistrationStructStructCtor_1,
- newElement_0_checkInNodeID, newElement_0_monitoredSubject, newElement_0_key,
- newElement_0_fabricIndex);
+ newElement_0_checkInNodeID, newElement_0_monitoredSubject, newElement_0_fabricIndex);
chip::JniReferences::GetInstance().AddToList(value, newElement_0);
}
return value;
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 47ecaa3..6fddee5 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -19170,11 +19170,6 @@
chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
newElement_0_monitoredSubjectClassName.c_str(), newElement_0_monitoredSubjectCtorSignature.c_str(),
jninewElement_0_monitoredSubject, newElement_0_monitoredSubject);
- jobject newElement_0_key;
- jbyteArray newElement_0_keyByteArray = env->NewByteArray(static_cast<jsize>(entry_0.key.size()));
- env->SetByteArrayRegion(newElement_0_keyByteArray, 0, static_cast<jsize>(entry_0.key.size()),
- reinterpret_cast<const jbyte *>(entry_0.key.data()));
- newElement_0_key = newElement_0_keyByteArray;
jobject newElement_0_fabricIndex;
std::string newElement_0_fabricIndexClassName = "java/lang/Integer";
std::string newElement_0_fabricIndexCtorSignature = "(I)V";
@@ -19193,16 +19188,15 @@
return;
}
jmethodID monitoringRegistrationStructStructCtor_1 = env->GetMethodID(
- monitoringRegistrationStructStructClass_1, "<init>", "(Ljava/lang/Long;Ljava/lang/Long;[BLjava/lang/Integer;)V");
+ monitoringRegistrationStructStructClass_1, "<init>", "(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Integer;)V");
if (monitoringRegistrationStructStructCtor_1 == nullptr)
{
ChipLogError(Zcl, "Could not find ChipStructs$IcdManagementClusterMonitoringRegistrationStruct constructor");
return;
}
- newElement_0 =
- env->NewObject(monitoringRegistrationStructStructClass_1, monitoringRegistrationStructStructCtor_1,
- newElement_0_checkInNodeID, newElement_0_monitoredSubject, newElement_0_key, newElement_0_fabricIndex);
+ newElement_0 = env->NewObject(monitoringRegistrationStructStructClass_1, monitoringRegistrationStructStructCtor_1,
+ newElement_0_checkInNodeID, newElement_0_monitoredSubject, newElement_0_fabricIndex);
chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
}
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
index 6907c09..e449549 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
@@ -1545,18 +1545,15 @@
public static class IcdManagementClusterMonitoringRegistrationStruct {
public Long checkInNodeID;
public Long monitoredSubject;
-public byte[] key;
public Integer fabricIndex;
public IcdManagementClusterMonitoringRegistrationStruct(
Long checkInNodeID
, Long monitoredSubject
- , byte[] key
, Integer fabricIndex
) {
this.checkInNodeID = checkInNodeID;
this.monitoredSubject = monitoredSubject;
- this.key = key;
this.fabricIndex = fabricIndex;
}
@@ -1570,9 +1567,6 @@
output.append("\tmonitoredSubject: ");
output.append(monitoredSubject);
output.append("\n");
- output.append("\tkey: ");
- output.append(Arrays.toString(key));
- output.append("\n");
output.append("\tfabricIndex: ");
output.append(fabricIndex);
output.append("\n");
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 39a3294..ccd8eff 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -14674,13 +14674,11 @@
Fields=[
ClusterObjectFieldDescriptor(Label="checkInNodeID", Tag=1, Type=uint),
ClusterObjectFieldDescriptor(Label="monitoredSubject", Tag=2, Type=uint),
- ClusterObjectFieldDescriptor(Label="key", Tag=3, Type=bytes),
ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint),
])
checkInNodeID: 'uint' = 0
monitoredSubject: 'uint' = 0
- key: 'bytes' = b""
fabricIndex: 'uint' = 0
class Commands:
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index 429b109..aa6b075 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -5112,7 +5112,6 @@
newElement_0 = [MTRICDManagementClusterMonitoringRegistrationStruct new];
newElement_0.checkInNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.checkInNodeID];
newElement_0.monitoredSubject = [NSNumber numberWithUnsignedLongLong:entry_0.monitoredSubject];
- newElement_0.key = AsData(entry_0.key);
newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
[array_0 addObject:newElement_0];
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
index 97d481d..cd3d094 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
@@ -8124,7 +8124,6 @@
newElement_0 = [MTRICDManagementClusterMonitoringRegistrationStruct new];
newElement_0.checkInNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.checkInNodeID];
newElement_0.monitoredSubject = [NSNumber numberWithUnsignedLongLong:entry_0.monitoredSubject];
- newElement_0.key = AsData(entry_0.key);
newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex];
[array_0 addObject:newElement_0];
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 8d21c94..b4f24e3 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -773,7 +773,6 @@
@interface MTRICDManagementClusterMonitoringRegistrationStruct : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull checkInNodeID MTR_PROVISIONALLY_AVAILABLE;
@property (nonatomic, copy) NSNumber * _Nonnull monitoredSubject MTR_PROVISIONALLY_AVAILABLE;
-@property (nonatomic, copy) NSData * _Nonnull key MTR_PROVISIONALLY_AVAILABLE;
@property (nonatomic, copy) NSNumber * _Nonnull fabricIndex MTR_PROVISIONALLY_AVAILABLE;
@end
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index 965a1b6..9a4b63d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -2839,8 +2839,6 @@
_monitoredSubject = @(0);
- _key = [NSData data];
-
_fabricIndex = @(0);
}
return self;
@@ -2852,7 +2850,6 @@
other.checkInNodeID = self.checkInNodeID;
other.monitoredSubject = self.monitoredSubject;
- other.key = self.key;
other.fabricIndex = self.fabricIndex;
return other;
@@ -2860,7 +2857,7 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: checkInNodeID:%@; monitoredSubject:%@; key:%@; fabricIndex:%@; >", NSStringFromClass([self class]), _checkInNodeID, _monitoredSubject, [_key base64EncodedStringWithOptions:0], _fabricIndex];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: checkInNodeID:%@; monitoredSubject:%@; fabricIndex:%@; >", NSStringFromClass([self class]), _checkInNodeID, _monitoredSubject, _fabricIndex];
return descriptionString;
}
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index 5f8a0c5..263a23b 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -10356,10 +10356,6 @@
{
ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kMonitoredSubject), monitoredSubject));
}
- if (includeSensitive)
- {
- ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kKey), key));
- }
if (aAccessingFabricIndex.HasValue())
{
ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kFabricIndex), fabricIndex));
@@ -10390,10 +10386,6 @@
{
err = DataModel::Decode(reader, monitoredSubject);
}
- else if (__context_tag == to_underlying(Fields::kKey))
- {
- err = DataModel::Decode(reader, key);
- }
else if (__context_tag == to_underlying(Fields::kFabricIndex))
{
err = DataModel::Decode(reader, fabricIndex);
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index a10542a..ca41b4b 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -13806,16 +13806,14 @@
{
kCheckInNodeID = 1,
kMonitoredSubject = 2,
- kKey = 3,
kFabricIndex = 254,
};
struct Type
{
public:
- chip::NodeId checkInNodeID = static_cast<chip::NodeId>(0);
- uint64_t monitoredSubject = static_cast<uint64_t>(0);
- chip::ByteSpan key;
+ chip::NodeId checkInNodeID = static_cast<chip::NodeId>(0);
+ uint64_t monitoredSubject = static_cast<uint64_t>(0);
chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index c72ad1d..e0c1360 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -1980,8 +1980,6 @@
value.isMember("checkInNodeID")));
ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MonitoringRegistrationStruct.monitoredSubject",
"monitoredSubject", value.isMember("monitoredSubject")));
- ReturnErrorOnFailure(
- ComplexArgumentParser::EnsureMemberExist("MonitoringRegistrationStruct.key", "key", value.isMember("key")));
char labelWithMember[kMaxLabelLength];
snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "checkInNodeID");
@@ -1992,10 +1990,6 @@
ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.monitoredSubject, value["monitoredSubject"]));
valueCopy.removeMember("monitoredSubject");
- snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "key");
- ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.key, value["key"]));
- valueCopy.removeMember("key");
-
if (value.isMember("fabricIndex"))
{
snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex");
@@ -2010,7 +2004,6 @@
{
ComplexArgumentParser::Finalize(request.checkInNodeID);
ComplexArgumentParser::Finalize(request.monitoredSubject);
- ComplexArgumentParser::Finalize(request.key);
ComplexArgumentParser::Finalize(request.fabricIndex);
}
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 14f8816..5fe79f4 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -1790,14 +1790,6 @@
}
}
{
- CHIP_ERROR err = LogValue("Key", indent + 1, value.key);
- if (err != CHIP_NO_ERROR)
- {
- DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Key'");
- return err;
- }
- }
- {
CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex);
if (err != CHIP_NO_ERROR)
{
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 07b07ac..60974f5 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -41256,10 +41256,8 @@
VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(2)));
VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 101ULL));
VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 1001ULL));
- VerifyOrReturn(CheckValueAsString("Key", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).key, [[NSData alloc] initWithBytes:"\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" length:16]));
VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).checkInNodeID, 201ULL));
VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).monitoredSubject, 2001ULL));
- VerifyOrReturn(CheckValueAsString("Key", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).key, [[NSData alloc] initWithBytes:" !\042#$%&'()*+,-./" length:16]));
}
NextTest();
@@ -41318,10 +41316,8 @@
VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(2)));
VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 101ULL));
VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 1002ULL));
- VerifyOrReturn(CheckValueAsString("Key", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).key, [[NSData alloc] initWithBytes:"\001\021!1AQaq\201\221\241\261\301\321\341\361" length:16]));
VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).checkInNodeID, 201ULL));
VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).monitoredSubject, 2001ULL));
- VerifyOrReturn(CheckValueAsString("Key", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).key, [[NSData alloc] initWithBytes:" !\042#$%&'()*+,-./" length:16]));
}
NextTest();
@@ -41382,10 +41378,8 @@
VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(2)));
VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 101ULL));
VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 1002ULL));
- VerifyOrReturn(CheckValueAsString("Key", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).key, [[NSData alloc] initWithBytes:"\001\021!1AQaq\201\221\241\261\301\321\341\361" length:16]));
VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).checkInNodeID, 201ULL));
VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).monitoredSubject, 2002ULL));
- VerifyOrReturn(CheckValueAsString("Key", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[1]).key, [[NSData alloc] initWithBytes:"\002\022\0422BRbr\202\222\242\262\302\322\342/" length:16]));
}
NextTest();
@@ -41437,7 +41431,6 @@
VerifyOrReturn(CheckValue("RegisteredClients", [actualValue count], static_cast<uint32_t>(1)));
VerifyOrReturn(CheckValue("CheckInNodeID", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).checkInNodeID, 201ULL));
VerifyOrReturn(CheckValue("MonitoredSubject", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).monitoredSubject, 2002ULL));
- VerifyOrReturn(CheckValueAsString("Key", ((MTRICDManagementClusterMonitoringRegistrationStruct *) actualValue[0]).key, [[NSData alloc] initWithBytes:"\002\022\0422BRbr\202\222\242\262\302\322\342/" length:16]));
}
NextTest();
