From 8cb1bda3e84b10f820b5e67de358380710841ffb Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 29 Sep 2023 13:05:46 -0400 Subject: [PATCH 01/10] Remove top-level struct and enum support from IDL processing (#29511) * Start removing enums and structs from top level definitions in the parser * Remove top level structs from matter idl auto-generation * Fix generator type logic * Update test inputs to move global structs * Fix unit tests * Restyle * Remove unused import --------- Co-authored-by: Andrei Litvin --- .../air-quality-sensor-app.matter | 32 ----- .../all-clusters-app.matter | 32 ----- .../all-clusters-minimal-app.matter | 32 ----- .../bridge-common/bridge-app.matter | 32 ----- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 32 ----- ...umiditysensor_thermostat_56de3d5f45.matter | 32 ----- ...ootnode_airqualitysensor_e63187f6c9.matter | 32 ----- ...ootnode_basicvideoplayer_0ff86e943b.matter | 32 ----- ...de_colortemperaturelight_hbUnzYVeyn.matter | 32 ----- .../rootnode_contactsensor_lFAGG1bfRO.matter | 32 ----- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 32 ----- .../rootnode_dishwasher_cc105034fe.matter | 32 ----- .../rootnode_doorlock_aNKYAreMXE.matter | 32 ----- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 32 ----- .../devices/rootnode_fan_7N2TobIlOX.matter | 32 ----- .../rootnode_flowsensor_1zVxHedlaV.matter | 32 ----- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 32 ----- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 32 ----- .../rootnode_laundrywasher_fb10d238c8.matter | 32 ----- .../rootnode_lightsensor_lZQycTFcJK.matter | 32 ----- ...rootnode_occupancysensor_iHyVgifZuo.matter | 32 ----- .../rootnode_onofflight_bbs1b7IaOV.matter | 32 ----- .../rootnode_onofflight_samplemei.matter | 32 ----- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 32 ----- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 32 ----- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 32 ----- .../devices/rootnode_pump_5f904818cc.matter | 32 ----- .../devices/rootnode_pump_a811bb33a0.matter | 32 ----- ...eraturecontrolledcabinet_ffdb696680.matter | 32 ----- ...ode_roboticvacuumcleaner_1807ff0c49.matter | 32 ----- ...tnode_roomairconditioner_9cf3607804.matter | 32 ----- .../rootnode_smokecoalarm_686fe0dcb8.matter | 32 ----- .../rootnode_speaker_RpzeXdimqA.matter | 32 ----- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 32 ----- .../rootnode_thermostat_bm3fb8dhYi.matter | 32 ----- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 32 ----- .../contact-sensor-app.matter | 32 ----- .../dishwasher-common/dishwasher-app.matter | 32 ----- .../light-switch-app.matter | 32 ----- .../data_model/lighting-app-ethernet.matter | 32 ----- .../data_model/lighting-app-thread.matter | 32 ----- .../data_model/lighting-app-wifi.matter | 32 ----- .../lighting-common/lighting-app.matter | 32 ----- .../nxp/zap/lighting-on-off.matter | 32 ----- examples/lighting-app/qpg/zap/light.matter | 32 ----- .../data_model/lighting-thread-app.matter | 32 ----- .../data_model/lighting-wifi-app.matter | 32 ----- examples/lock-app/lock-common/lock-app.matter | 32 ----- examples/lock-app/nxp/zap/lock-app.matter | 32 ----- examples/lock-app/qpg/zap/lock.matter | 32 ----- .../log-source-common/log-source-app.matter | 32 ----- .../ota-provider-app.matter | 32 ----- .../ota-requestor-app.matter | 32 ----- .../placeholder/linux/apps/app1/config.matter | 32 ----- .../placeholder/linux/apps/app2/config.matter | 32 ----- examples/pump-app/pump-common/pump-app.matter | 32 ----- .../silabs/data_model/pump-thread-app.matter | 32 ----- .../silabs/data_model/pump-wifi-app.matter | 32 ----- .../pump-controller-app.matter | 32 ----- .../refrigerator-app.matter | 32 ----- .../resource-monitoring-app.matter | 32 ----- examples/rvc-app/rvc-common/rvc-app.matter | 32 ----- .../smoke-co-alarm-app.matter | 32 ----- .../temperature-measurement.matter | 32 ----- .../thermostat-common/thermostat.matter | 32 ----- examples/tv-app/tv-common/tv-app.matter | 32 ----- .../tv-casting-common/tv-casting-app.matter | 32 ----- .../virtual-device-app.matter | 32 ----- examples/window-app/common/window-app.matter | 32 ----- .../matter_idl/backwards_compatibility.py | 113 ++++++++++++------ .../matter_idl/generators/types.py | 18 ++- .../matter_idl/matter_grammar.lark | 2 +- .../matter_idl/matter_idl_parser.py | 15 +-- .../matter_idl/matter_idl_types.py | 3 - .../test_backwards_compatibility.py | 62 ++++------ .../matter_idl/test_matter_idl_parser.py | 67 +---------- .../matter_idl/test_xml_parser.py | 14 --- .../inputs/global_struct_attribute.matter | 10 +- .../inputs/large_all_clusters_app.matter | 14 ++- .../tests/inputs/large_lighting_app.matter | 15 ++- .../matter_idl/zapxml/handlers/handlers.py | 52 ++++---- .../templates/app/MatterIDL_Client.zapt | 6 - .../templates/app/MatterIDL_Server.zapt | 6 - .../data_model/controller-clusters.matter | 32 ----- 84 files changed, 163 insertions(+), 2474 deletions(-) diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index aed1407429aacc..b32bc2f642afd5 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { 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 99f4e03632f489..4b5bef308bf47c 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 @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index e6858070f9c11e..29b2c68c9592ca 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 5111e370e1a985..71b7791d3c4a01 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 05dc8ef9696a65..f560c771f59393 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index d047d19cf62177..6635935a84d117 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter index 935fe575f95dd9..ae21196a30953f 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index 6cb07c0bc2364f..76afa694bb33fb 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { enum DelayedAllOffEffectVariantEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 0bb886f9804e4a..1bc3ed413ecda7 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index dfdf48097d8871..25402566d5e360 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 6f350800db93f9..222682b18b083c 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter index 9b34dea09793a6..b752b02d5769c6 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 54584bea85dfe8..f48f36451129eb 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 738dffa4521ed6..a97091df8dc683 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 8b17e4eb415bf6..2749f6b4423392 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index fc2d8466dac9d4..3425f449179ad8 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index d140d844339064..b5491547cf79aa 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 78a6e2871e3e20..1a59a41d817ff4 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter index 1683218696d69e..8a66414808175d 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 4284111ef34f11..ac2cd94a298b9b 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index b4d210ca10357f..b2204465318bf0 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 4397a34688c88e..0613fc37f755ad 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter index 0ea88c693193ac..420e328187f2a8 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 6b2dcdab7f8581..df9db80c1080c7 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index c607ab395a9581..49df479ae9653b 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index afe7fc7aed327f..d41712e737ee06 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter index 9b474971040bae..fcb40893dd7e3e 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.matter +++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index ed927511f501a9..c4022bb1a01e54 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter index 23069ca02f6a43..2303aa4c0c70a1 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index be757b542b1c20..2945ee6e8c58dc 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index f9ccfdc9f07097..7fc13a5a1aa413 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter index 7f841620035687..a197a0af47133b 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index eb67e68af1954c..f835984d9cf5ef 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index f9519fee3c5b46..5234c44c59d173 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index a68e13deb32468..464bc8a3905235 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 20aedc8f59562a..444e7a12872270 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index 3a3d89a3d60f10..a3c80032573b25 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 5374c1f6f53af2..45543e7c7fb677 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { 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 5bc18df102f218..faea21aea6a5fc 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 @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ client cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index 3c9d19ebb931fa..0a5e4b343560da 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index cf72c88dfbd1e8..ee7b61209d19af 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index 82bf340ab3ff40..99edc71fdff2a2 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 0a5a81e6156137..dd21ff69f24b6b 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 26175dc20230e7..7b773be3ddf524 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index e6fff86a3fc409..3118ca16d5dbdf 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index aa115f0d2f7f4a..227c72d986bf53 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index b4d06928893147..2d6ba3b041704c 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 51d3ca92d6df48..94fcf03083ef2c 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index ab94389c823e9a..b0937e65bc771b 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 66432c88ff824a..0a3cd720726449 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index 5f58a971cb2ac8..2602033540ac6a 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** The Access Control Cluster exposes a data model view of a Node's Access Control List (ACL), which codifies the rules used to manage and enforce Access Control for the Node's endpoints and their associated diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 8a57b436acf377..8b234b1f09991e 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { bitmap Feature : BITMAP32 { diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 44664ec830b86d..f3f0d45332b626 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index e0c658d8c7f27d..e47fdb1cb39a1e 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ client cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 6b12e603a9780d..002a70ca922eca 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ client cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index b1a6ba1c9fe095..d272e6d299d5d6 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index 3c87212a10cd6a..9d6e0ac97c4dfd 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index 3c87212a10cd6a..9d6e0ac97c4dfd 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index c94f2234a4a9a2..6d3bd4bc983153 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter index 06ea2bbd2c184c..e23f1f5572c1e8 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { bitmap Feature : BITMAP32 { diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index 60ebc011244e03..40769a4e8623ae 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter index a337abfc3f47f2..a0dd73982acf36 100644 --- a/examples/rvc-app/rvc-common/rvc-app.matter +++ b/examples/rvc-app/rvc-common/rvc-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { 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 4ad4b30b4c9b89..7e9812625b7fbe 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 @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter index e0e990bbe3e8da..fa0943bb98bf71 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */ server cluster Descriptor = 29 { bitmap Feature : BITMAP32 { diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index e48a17032a5491..2cf173233532b6 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ client cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 7ab6da7482e14c..a3d2f0a8901e91 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { enum DelayedAllOffEffectVariantEnum : ENUM8 { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index e4b0b8b25d0d42..66280a2817fde8 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index 78ca16545266ff..b531606023c6aa 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 83a0cb11131a9f..91ba6208dd6b53 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ server cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { diff --git a/scripts/py_matter_idl/matter_idl/backwards_compatibility.py b/scripts/py_matter_idl/matter_idl/backwards_compatibility.py index 8ecf45afc26eb8..36898f1029849b 100644 --- a/scripts/py_matter_idl/matter_idl/backwards_compatibility.py +++ b/scripts/py_matter_idl/matter_idl/backwards_compatibility.py @@ -97,7 +97,8 @@ def _check_field_lists_are_the_same(self, location: str, original: List[Field], def _check_enum_compatible(self, cluster_name: str, original: Enum, updated: Optional[Enum]): if not updated: - self._mark_incompatible(f"Enumeration {cluster_name}::{original.name} was deleted") + self._mark_incompatible( + f"Enumeration {cluster_name}::{original.name} was deleted") return if original.base_type != updated.base_type: @@ -107,16 +108,19 @@ def _check_enum_compatible(self, cluster_name: str, original: Enum, updated: Opt # Validate that all old entries exist for entry in original.entries: # old entry must exist and have identical code - existing = [item for item in updated.entries if item.name == entry.name] + existing = [ + item for item in updated.entries if item.name == entry.name] if len(existing) == 0: - self._mark_incompatible(f"Enumeration {cluster_name}::{original.name} removed entry {entry.name}") + self._mark_incompatible( + f"Enumeration {cluster_name}::{original.name} removed entry {entry.name}") elif existing[0].code != entry.code: self._mark_incompatible( f"Enumeration {cluster_name}::{original.name} changed code for entry {entry.name} from {entry.code} to {existing[0].code}") def _check_bitmap_compatible(self, cluster_name: str, original: Bitmap, updated: Optional[Bitmap]): if not updated: - self._mark_incompatible(f"Bitmap {cluster_name}::{original.name} was deleted") + self._mark_incompatible( + f"Bitmap {cluster_name}::{original.name} was deleted") return if original.base_type != updated.base_type: @@ -126,27 +130,33 @@ def _check_bitmap_compatible(self, cluster_name: str, original: Bitmap, updated: # Validate that all old entries exist for entry in original.entries: # old entry must exist and have identical code - existing = [item for item in updated.entries if item.name == entry.name] + existing = [ + item for item in updated.entries if item.name == entry.name] if len(existing) == 0: - self._mark_incompatible(f"Bitmap {original.name} removed entry {entry.name}") + self._mark_incompatible( + f"Bitmap {original.name} removed entry {entry.name}") elif existing[0].code != entry.code: self._mark_incompatible( f"Bitmap {original.name} changed code for entry {entry.name} from {entry.code} to {existing[0].code}") def _check_event_compatible(self, cluster_name: str, event: Event, updated_event: Optional[Event]): if not updated_event: - self._mark_incompatible(f"Event {cluster_name}::{event.name} was removed") + self._mark_incompatible( + f"Event {cluster_name}::{event.name} was removed") return if event.code != updated_event.code: - self._mark_incompatible(f"Event {cluster_name}::{event.name} code changed from {event.code} to {updated_event.code}") + self._mark_incompatible( + f"Event {cluster_name}::{event.name} code changed from {event.code} to {updated_event.code}") - self._check_field_lists_are_the_same(f"Event {cluster_name}::{event.name}", event.fields, updated_event.fields) + self._check_field_lists_are_the_same( + f"Event {cluster_name}::{event.name}", event.fields, updated_event.fields) def _check_command_compatible(self, cluster_name: str, command: Command, updated_command: Optional[Command]): self.logger.debug(f" Checking command {cluster_name}::{command.name}") if not updated_command: - self._mark_incompatible(f"Command {cluster_name}::{command.name} was removed") + self._mark_incompatible( + f"Command {cluster_name}::{command.name} was removed") return if command.code != updated_command.code: @@ -168,49 +178,62 @@ def _check_command_compatible(self, cluster_name: str, command: Command, updated def _check_struct_compatible(self, cluster_name: str, original: Struct, updated: Optional[Struct]): self.logger.debug(f" Checking struct {original.name}") if not updated: - self._mark_incompatible(f"Struct {cluster_name}::{original.name} has been deleted.") + self._mark_incompatible( + f"Struct {cluster_name}::{original.name} has been deleted.") return - self._check_field_lists_are_the_same(f"Struct {cluster_name}::{original.name}", original.fields, updated.fields) + self._check_field_lists_are_the_same( + f"Struct {cluster_name}::{original.name}", original.fields, updated.fields) if original.tag != updated.tag: - self._mark_incompatible(f"Struct {cluster_name}::{original.name} has modified tags") + self._mark_incompatible( + f"Struct {cluster_name}::{original.name} has modified tags") if original.code != updated.code: - self._mark_incompatible(f"Struct {cluster_name}::{original.name} has modified code (likely resnopse difference)") + self._mark_incompatible( + f"Struct {cluster_name}::{original.name} has modified code (likely resnopse difference)") if original.qualities != updated.qualities: - self._mark_incompatible(f"Struct {cluster_name}::{original.name} has modified qualities") + self._mark_incompatible( + f"Struct {cluster_name}::{original.name} has modified qualities") def _check_attribute_compatible(self, cluster_name: str, original: Attribute, updated: Optional[Attribute]): - self.logger.debug(f" Checking attribute {cluster_name}::{original.definition.name}") + self.logger.debug( + f" Checking attribute {cluster_name}::{original.definition.name}") if not updated: - self._mark_incompatible(f"Attribute {cluster_name}::{original.definition.name} has been deleted.") + self._mark_incompatible( + f"Attribute {cluster_name}::{original.definition.name} has been deleted.") return if original.definition.code != updated.definition.code: - self._mark_incompatible(f"Attribute {cluster_name}::{original.definition.name} changed its code.") + self._mark_incompatible( + f"Attribute {cluster_name}::{original.definition.name} changed its code.") if original.definition.data_type != updated.definition.data_type: - self._mark_incompatible(f"Attribute {cluster_name}::{original.definition.name} changed its data type.") + self._mark_incompatible( + f"Attribute {cluster_name}::{original.definition.name} changed its data type.") if original.definition.is_list != updated.definition.is_list: - self._mark_incompatible(f"Attribute {cluster_name}::{original.definition.name} changed its list status.") + self._mark_incompatible( + f"Attribute {cluster_name}::{original.definition.name} changed its list status.") if original.definition.qualities != updated.definition.qualities: # optional/nullable - self._mark_incompatible(f"Attribute {cluster_name}::{original.definition.name} changed its data type qualities.") + self._mark_incompatible( + f"Attribute {cluster_name}::{original.definition.name} changed its data type qualities.") if original.qualities != updated.qualities: # read/write/subscribe/timed status - self._mark_incompatible(f"Attribute {cluster_name}::{original.definition.name} changed its qualities.") + self._mark_incompatible( + f"Attribute {cluster_name}::{original.definition.name} changed its qualities.") def _check_enum_list_compatible(self, cluster_name: str, original: List[Enum], updated: List[Enum]): updated_enums = group_list_by_name(updated) for original_enum in original: updated_enum = updated_enums.get(original_enum.name) - self._check_enum_compatible(cluster_name, original_enum, updated_enum) + self._check_enum_compatible( + cluster_name, original_enum, updated_enum) def _check_bitmap_list_compatible(self, cluster_name: str, original: List[Bitmap], updated: List[Bitmap]): updated_bitmaps = {} @@ -219,20 +242,23 @@ def _check_bitmap_list_compatible(self, cluster_name: str, original: List[Bitmap for original_bitmap in original: updated_bitmap = updated_bitmaps.get(original_bitmap.name) - self._check_bitmap_compatible(cluster_name, original_bitmap, updated_bitmap) + self._check_bitmap_compatible( + cluster_name, original_bitmap, updated_bitmap) def _check_struct_list_compatible(self, cluster_name: str, original: List[Struct], updated: List[Struct]): updated_structs = group_list_by_name(updated) for struct in original: - self._check_struct_compatible(cluster_name, struct, updated_structs.get(struct.name)) + self._check_struct_compatible( + cluster_name, struct, updated_structs.get(struct.name)) def _check_command_list_compatible(self, cluster_name: str, original: List[Command], updated: List[Command]): updated_commands = group_list_by_name(updated) for command in original: updated_command = updated_commands.get(command.name) - self._check_command_compatible(cluster_name, command, updated_command) + self._check_command_compatible( + cluster_name, command, updated_command) def _check_event_list_compatible(self, cluster_name: str, original: List[Event], updated: List[Event]): updated_events = group_list_by_name(updated) @@ -245,39 +271,48 @@ def _check_attribute_list_compatible(self, cluster_name: str, original: List[Att updated_attributes = group_list(updated, attribute_name) for attribute in original: - self._check_attribute_compatible(cluster_name, attribute, updated_attributes.get(attribute_name(attribute))) + self._check_attribute_compatible( + cluster_name, attribute, updated_attributes.get(attribute_name(attribute))) def _check_cluster_list_compatible(self, original: List[Cluster], updated: List[Cluster]): updated_clusters = group_list(updated, full_cluster_name) for original_cluster in original: - updated_cluster = updated_clusters.get(full_cluster_name(original_cluster)) + updated_cluster = updated_clusters.get( + full_cluster_name(original_cluster)) self._check_cluster_compatible(original_cluster, updated_cluster) def _check_cluster_compatible(self, original_cluster: Cluster, updated_cluster: Optional[Cluster]): - self.logger.debug(f"Checking cluster {full_cluster_name(original_cluster)}") + self.logger.debug( + f"Checking cluster {full_cluster_name(original_cluster)}") if not updated_cluster: - self._mark_incompatible(f"Cluster {full_cluster_name(original_cluster)} was deleted") + self._mark_incompatible( + f"Cluster {full_cluster_name(original_cluster)} was deleted") return if original_cluster.code != updated_cluster.code: self._mark_incompatible( f"Cluster {full_cluster_name(original_cluster)} has different codes {original_cluster.code} != {updated_cluster.code}") - self._check_enum_list_compatible(original_cluster.name, original_cluster.enums, updated_cluster.enums) - self._check_struct_list_compatible(original_cluster.name, original_cluster.structs, updated_cluster.structs) - self._check_bitmap_list_compatible(original_cluster.name, original_cluster.bitmaps, updated_cluster.bitmaps) - self._check_command_list_compatible(original_cluster.name, original_cluster.commands, updated_cluster.commands) - self._check_event_list_compatible(original_cluster.name, original_cluster.events, updated_cluster.events) - self._check_attribute_list_compatible(original_cluster.name, original_cluster.attributes, updated_cluster.attributes) + self._check_enum_list_compatible( + original_cluster.name, original_cluster.enums, updated_cluster.enums) + self._check_struct_list_compatible( + original_cluster.name, original_cluster.structs, updated_cluster.structs) + self._check_bitmap_list_compatible( + original_cluster.name, original_cluster.bitmaps, updated_cluster.bitmaps) + self._check_command_list_compatible( + original_cluster.name, original_cluster.commands, updated_cluster.commands) + self._check_event_list_compatible( + original_cluster.name, original_cluster.events, updated_cluster.events) + self._check_attribute_list_compatible( + original_cluster.name, original_cluster.attributes, updated_cluster.attributes) def check(self): # assume ok, and then validate self.compatible = Compatibility.COMPATIBLE - self._check_enum_list_compatible("", self._original_idl.enums, self._updated_idl.enums) - self._check_struct_list_compatible("", self._original_idl.structs, self._updated_idl.structs) - self._check_cluster_list_compatible(self._original_idl.clusters, self._updated_idl.clusters) + self._check_cluster_list_compatible( + self._original_idl.clusters, self._updated_idl.clusters) return self.compatible diff --git a/scripts/py_matter_idl/matter_idl/generators/types.py b/scripts/py_matter_idl/matter_idl/generators/types.py index c5428a92ff6636..29d496b48315bb 100644 --- a/scripts/py_matter_idl/matter_idl/generators/types.py +++ b/scripts/py_matter_idl/matter_idl/generators/types.py @@ -295,16 +295,14 @@ def find_bitmap(self, name) -> Optional[matter_idl_types.Bitmap]: @property def all_enums(self): """ - All enumerations, ordered by lookup priority. + All enumerations defined within this lookup context. - If an enum A is defined both in the cluster and globally, this WILL - return both instances, however it will return the cluster version first. + enums are only defined at cluster level. If lookup context does not + include a cluster, the enum list will be empty. """ if self.cluster: for e in self.cluster.enums: yield e - for e in self.idl.enums: - yield e @property def all_bitmaps(self): @@ -312,7 +310,7 @@ def all_bitmaps(self): All bitmaps defined within this lookup context. bitmaps are only defined at cluster level. If lookup context does not - include a cluster, the bitmal list will be empty. + include a cluster, the bitmap list will be empty. """ if self.cluster: for b in self.cluster.bitmaps: @@ -320,16 +318,14 @@ def all_bitmaps(self): @property def all_structs(self): - """All structs, ordered by lookup prioroty. + """All structs defined within this lookup context. - If a struct A is defined both in the cluster and globally, this WILL - return both instances, however it will return the cluster version first. + structs are only defined at cluster level. If lookup context does not + include a cluster, the struct list will be empty. """ if self.cluster: for e in self.cluster.structs: yield e - for e in self.idl.structs: - yield e def is_enum_type(self, name: str): """ diff --git a/scripts/py_matter_idl/matter_idl/matter_grammar.lark b/scripts/py_matter_idl/matter_idl/matter_grammar.lark index 6116e7cbf08071..03f17472f4c077 100644 --- a/scripts/py_matter_idl/matter_idl/matter_grammar.lark +++ b/scripts/py_matter_idl/matter_idl/matter_grammar.lark @@ -102,7 +102,7 @@ POSITIVE_INTEGER: /\d+/ HEX_INTEGER: /0x[A-Fa-f0-9]+/ ID: /[a-zA-Z_][a-zA-Z0-9_]*/ -idl: (struct|enum|cluster|endpoint)* +idl: (cluster|endpoint)* %import common.ESCAPED_STRING %import common.WS diff --git a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py index f4ba7059bf605d..45e180c65c5a88 100755 --- a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py +++ b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py @@ -474,21 +474,18 @@ def cluster(self, meta, side, name, code, *content): return result def idl(self, items): - idl = Idl() + clusters = [] + endpoints = [] for item in items: - if type(item) == Enum: - idl.enums.append(item) - elif type(item) == Struct: - idl.structs.append(item) - elif type(item) == Cluster: - idl.clusters.append(item) + if type(item) == Cluster: + clusters.append(item) elif type(item) == Endpoint: - idl.endpoints.append(item) + endpoints.append(item) else: raise Exception("UNKNOWN idl content item: %r" % item) - return idl + return Idl(clusters=clusters, endpoints=endpoints) def prefix_doc_comment(self): print("TODO: prefix") diff --git a/scripts/py_matter_idl/matter_idl/matter_idl_types.py b/scripts/py_matter_idl/matter_idl/matter_idl_types.py index 3a680058c5e24d..56886abb91d903 100644 --- a/scripts/py_matter_idl/matter_idl/matter_idl_types.py +++ b/scripts/py_matter_idl/matter_idl/matter_idl_types.py @@ -266,9 +266,6 @@ class Endpoint: @dataclass class Idl: - # Enums and structs represent globally used items - enums: List[Enum] = field(default_factory=list) - structs: List[Struct] = field(default_factory=list) clusters: List[Cluster] = field(default_factory=list) endpoints: List[Endpoint] = field(default_factory=list) diff --git a/scripts/py_matter_idl/matter_idl/test_backwards_compatibility.py b/scripts/py_matter_idl/matter_idl/test_backwards_compatibility.py index f50c4f06b03684..0c002410fd1261 100755 --- a/scripts/py_matter_idl/matter_idl/test_backwards_compatibility.py +++ b/scripts/py_matter_idl/matter_idl/test_backwards_compatibility.py @@ -77,10 +77,12 @@ def ValidateUpdate(self, name: str, old: str, new: str, flags: Compatibility): with self.subTest(validate=name): # Validate compatibility and that no changes are always compatible with self.subTest(direction="Forward"): - self._AssumeCompatiblity(old, new, old_idl, new_idl, Compatibility.FORWARD_FAIL not in flags) + self._AssumeCompatiblity( + old, new, old_idl, new_idl, Compatibility.FORWARD_FAIL not in flags) with self.subTest(direction="Backward"): - self._AssumeCompatiblity(new, old, new_idl, old_idl, Compatibility.BACKWARD_FAIL not in flags) + self._AssumeCompatiblity( + new, old, new_idl, old_idl, Compatibility.BACKWARD_FAIL not in flags) with self.subTest(direction="NEW-to-NEW"): self._AssumeCompatiblity(new, new, new_idl, new_idl, True) @@ -88,54 +90,40 @@ def ValidateUpdate(self, name: str, old: str, new: str, flags: Compatibility): with self.subTest(direction="OLD-to-OLD"): self._AssumeCompatiblity(old, old, old_idl, old_idl, True) - def test_top_level_enums_delete(self): - self.ValidateUpdate( - "delete a top level enum", - "enum A: ENUM8{} enum B: ENUM8{}", - "enum A: ENUM8{}", - Compatibility.FORWARD_FAIL) - - def test_top_level_enums_change(self): + def test_basic_clusters_enum(self): self.ValidateUpdate( - "change an enum type", - "enum A: ENUM8{}", - "enum A: ENUM16{}", - Compatibility.FORWARD_FAIL | Compatibility.BACKWARD_FAIL) + "Adding an enum is ok. Also validates code formatting", + "server cluster A = 16 {}", + "server cluster A = 0x10 { enum X : ENUM8 {} }", + Compatibility.BACKWARD_FAIL) - def test_top_level_enums_add_remove(self): + def test_clusters_enum_add_remove(self): self.ValidateUpdate( - "Adding enum values is ok, removing values is not", - "enum A: ENUM8 {A = 1; B = 2;}", - "enum A: ENUM8 {A = 1; }", + "Adding an enum is ok. Also validates code formatting", + "server cluster A = 16 { enum X : ENUM8 { A = 1; B = 2; }}", + "server cluster A = 16 { enum X : ENUM8 { A = 1; }}", Compatibility.FORWARD_FAIL) - def test_top_level_enums_code(self): - self.ValidateUpdate( - "Switching enum codes is never ok", - "enum A: ENUM8 {A = 1; B = 2; }", - "enum A: ENUM8 {A = 1; B = 3; }", - Compatibility.FORWARD_FAIL | Compatibility.BACKWARD_FAIL) - - def test_basic_clusters_code(self): + def test_clusters_enum_code(self): self.ValidateUpdate( - "Switching cluster codes is never ok", - "client cluster A = 1 {}", - "client cluster A = 2 {}", + "Adding an enum is ok. Also validates code formatting", + "server cluster A = 16 { enum X : ENUM8 { A = 1; B = 2; }}", + "server cluster A = 16 { enum X : ENUM8 { A = 1; B = 3; }}", Compatibility.FORWARD_FAIL | Compatibility.BACKWARD_FAIL) - def test_basic_clusters_remove(self): + def test_clusters_enum_delete(self): self.ValidateUpdate( - "Removing a cluster is not ok", - "client cluster A = 1 {} client cluster B = 2 {}", - "client cluster A = 1 {}", + "Adding an enum is ok. Also validates code formatting", + "server cluster A = 16 { enum X : ENUM8 {}}", + "server cluster A = 16 { }", Compatibility.FORWARD_FAIL) - def test_basic_clusters_enum(self): + def test_clusters_enum_change(self): self.ValidateUpdate( "Adding an enum is ok. Also validates code formatting", - "server cluster A = 16 {}", - "server cluster A = 0x10 { enum X : ENUM8 {} }", - Compatibility.BACKWARD_FAIL) + "server cluster A = 16 { enum X : ENUM16 {}}", + "server cluster A = 16 { enum X : ENUM8 {}}", + Compatibility.FORWARD_FAIL | Compatibility.BACKWARD_FAIL) def test_basic_clusters_side(self): self.ValidateUpdate( diff --git a/scripts/py_matter_idl/matter_idl/test_matter_idl_parser.py b/scripts/py_matter_idl/matter_idl/test_matter_idl_parser.py index 2a3cfea87e76b1..0cabc435d54f37 100755 --- a/scripts/py_matter_idl/matter_idl/test_matter_idl_parser.py +++ b/scripts/py_matter_idl/matter_idl/test_matter_idl_parser.py @@ -29,7 +29,7 @@ from matter_idl.matter_idl_types import (AccessPrivilege, Attribute, AttributeInstantiation, AttributeQuality, AttributeStorage, Bitmap, Cluster, ClusterSide, Command, CommandQuality, ConstantEntry, DataType, DeviceType, Endpoint, Enum, Event, EventPriority, EventQuality, Field, FieldQuality, Idl, - ParseMetaData, ServerClusterInstantiation, Struct, StructQuality, StructTag) + ParseMetaData, ServerClusterInstantiation, Struct, StructTag) def parseText(txt, skip_meta=True): @@ -51,71 +51,6 @@ def test_skips_comments(self): self.assertEqual(actual, expected) - def test_global_enum(self): - actual = parseText(""" - enum GlobalEnum : ENUM8 { - kValue1 = 1; - kOther = 0x12; /* hex numbers tested sporadically */ - } - """) - - expected = Idl(enums=[ - Enum(name='GlobalEnum', base_type='ENUM8', - entries=[ - ConstantEntry(name="kValue1", code=1), - ConstantEntry(name="kOther", code=0x12), - ])] - ) - self.assertEqual(actual, expected) - - def test_global_struct(self): - actual = parseText(""" - struct Something { - CHAR_STRING astring = 1; - optional CLUSTER_ID idlist[] = 2; - nullable int valueThatIsNullable = 0x123; - char_string<123> sized_string = 222; - } - """) - - expected = Idl(structs=[ - Struct(name='Something', - fields=[ - Field( - data_type=DataType(name="CHAR_STRING"), code=1, name="astring", ), - Field(data_type=DataType(name="CLUSTER_ID"), code=2, name="idlist", - is_list=True, qualities=FieldQuality.OPTIONAL), - Field(data_type=DataType(name="int"), code=0x123, - name="valueThatIsNullable", qualities=FieldQuality.NULLABLE), - Field(data_type=DataType(name="char_string", max_length=123), - code=222, name="sized_string"), - ])] - ) - self.assertEqual(actual, expected) - - def test_fabric_scoped_struct(self): - actual = parseText(""" - fabric_scoped struct FabricStruct { - CHAR_STRING astring = 1; - optional CLUSTER_ID idlist[] = 2; - nullable fabric_sensitive int nullablesensitive = 0x123; - } - """) - - expected = Idl(structs=[ - Struct(name='FabricStruct', - qualities=StructQuality.FABRIC_SCOPED, - fields=[ - Field( - data_type=DataType(name="CHAR_STRING"), code=1, name="astring", ), - Field(data_type=DataType(name="CLUSTER_ID"), code=2, name="idlist", - is_list=True, qualities=FieldQuality.OPTIONAL), - Field(data_type=DataType(name="int"), code=0x123, name="nullablesensitive", - qualities=FieldQuality.NULLABLE | FieldQuality.FABRIC_SENSITIVE), - ])] - ) - self.assertEqual(actual, expected) - def test_cluster_attribute(self): actual = parseText(""" server cluster MyCluster = 0x321 { diff --git a/scripts/py_matter_idl/matter_idl/test_xml_parser.py b/scripts/py_matter_idl/matter_idl/test_xml_parser.py index 6f42ca3c71d6b7..8a845a05e42216 100755 --- a/scripts/py_matter_idl/matter_idl/test_xml_parser.py +++ b/scripts/py_matter_idl/matter_idl/test_xml_parser.py @@ -244,11 +244,6 @@ def testEnum(self): Test110 Test220 - - - - - @@ -262,14 +257,6 @@ def testEnum(self): ''') - e1 = Enum( - name='GlobalEnum', - base_type="ENUM8", - entries=[ - ConstantEntry(name="First", code=0), - ConstantEntry(name="Second", code=1), - ] - ) e2 = Enum( name='OneCluster', base_type="ENUM8", @@ -291,7 +278,6 @@ def testEnum(self): name='Test1', code=10, enums=[e2, e3]), Cluster(side=ClusterSide.CLIENT, name='Test2', code=20, enums=[e3])], - enums=[e1], )) def testStruct(self): diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/global_struct_attribute.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/global_struct_attribute.matter index bb325d28501d67..447a49a362e1ca 100644 --- a/scripts/py_matter_idl/matter_idl/tests/inputs/global_struct_attribute.matter +++ b/scripts/py_matter_idl/matter_idl/tests/inputs/global_struct_attribute.matter @@ -1,9 +1,9 @@ -struct LabelStruct { - CHAR_STRING<16> label = 0; - CHAR_STRING<16> value = 1; -} - client cluster DemoCluster = 0x12 { + struct LabelStruct { + CHAR_STRING<16> label = 0; + CHAR_STRING<16> value = 1; + } + attribute LabelStruct singleLabel = 0x20; attribute LabelStruct someLabels[] = 0x21; } diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter index bd73950bd94dcc..6687139a8cf557 100644 --- a/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter +++ b/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter @@ -1,11 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - server cluster Identify = 3 { enum IdentifyEffectIdentifier : ENUM8 { kBlink = 0; @@ -1730,12 +1725,21 @@ server cluster GroupKeyManagement = 63 { } server cluster FixedLabel = 64 { + struct LabelStruct { + CHAR_STRING<16> label = 0; + CHAR_STRING<16> value = 1; + } readonly attribute LabelStruct labelList[] = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; } server cluster UserLabel = 65 { + struct LabelStruct { + CHAR_STRING<16> label = 0; + CHAR_STRING<16> value = 1; + } + attribute access(write: manage) LabelStruct labelList[] = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter index c0c8391d6a93c8..4fae3caa9e0aa3 100644 --- a/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter +++ b/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter @@ -1,11 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - server cluster Identify = 3 { enum IdentifyEffectIdentifier : ENUM8 { kBlink = 0; @@ -1418,12 +1413,22 @@ server cluster GroupKeyManagement = 63 { } server cluster FixedLabel = 64 { + struct LabelStruct { + CHAR_STRING<16> label = 0; + CHAR_STRING<16> value = 1; + } + readonly attribute LabelStruct labelList[] = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; } server cluster UserLabel = 65 { + struct LabelStruct { + CHAR_STRING<16> label = 0; + CHAR_STRING<16> value = 1; + } + attribute access(write: manage) LabelStruct labelList[] = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/scripts/py_matter_idl/matter_idl/zapxml/handlers/handlers.py b/scripts/py_matter_idl/matter_idl/zapxml/handlers/handlers.py index 8150924efe1c4c..477d7f2ff330fa 100644 --- a/scripts/py_matter_idl/matter_idl/zapxml/handlers/handlers.py +++ b/scripts/py_matter_idl/matter_idl/zapxml/handlers/handlers.py @@ -225,19 +225,20 @@ def FinalizeProcessing(self, idl: Idl): # We have two choices of adding a struct: # - inside a cluster if a code exists # - inside top level if no codes were associated - if self._cluster_codes: - for code in self._cluster_codes: - found = False - for c in idl.clusters: - if c.code == code: - c.structs.append(self._struct) - found = True - - if not found: - LOGGER.error('Enum %s could not find cluster (code %d/0x%X)' % - (self._struct.name, code, code)) - else: - idl.structs.append(self._struct) + if not self._cluster_codes: + LOGGER.error('Struct %s has no cluster codes' % self._struct.name) + return + + for code in self._cluster_codes: + found = False + for c in idl.clusters: + if c.code == code: + c.structs.append(self._struct) + found = True + + if not found: + LOGGER.error('Struct %s could not find cluster (code %d/0x%X)' % + (self._struct.name, code, code)) def EndProcessing(self): self.context.AddIdlPostProcessor(self) @@ -269,22 +270,19 @@ def GetNextProcessor(self, name, attrs): return BaseHandler(self.context) def FinalizeProcessing(self, idl: Idl): - # We have two choices of adding an enum: - # - inside a cluster if a code exists - # - inside top level if a code does not exist - if not self._cluster_codes: - idl.enums.append(self._enum) - else: - found = set() - for c in idl.clusters: - if c.code in self._cluster_codes: - c.enums.append(self._enum) - found.add(c.code) + LOGGER.error("Found enum without a cluster code: %s" % + (self._enum.name)) + return + found = set() + for c in idl.clusters: + if c.code in self._cluster_codes: + c.enums.append(self._enum) + found.add(c.code) - if found != self._cluster_codes: - LOGGER.error('Enum %s could not find its clusters (codes: %r)' % - (self._enum.name, self._cluster_codes - found)) + if found != self._cluster_codes: + LOGGER.error('Enum %s could not find its clusters (codes: %r)' % + (self._enum.name, self._cluster_codes - found)) def EndProcessing(self): self.context.AddIdlPostProcessor(self) diff --git a/src/app/zap-templates/templates/app/MatterIDL_Client.zapt b/src/app/zap-templates/templates/app/MatterIDL_Client.zapt index 50d59f4fc2f38e..6902609e2f76bd 100644 --- a/src/app/zap-templates/templates/app/MatterIDL_Client.zapt +++ b/src/app/zap-templates/templates/app/MatterIDL_Client.zapt @@ -1,12 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -{{#zcl_structs}} -{{#if has_more_than_one_cluster}} -{{>idl_structure_definition extraIndent=0}} - -{{/if}} -{{/zcl_structs}} {{#zcl_clusters~}} {{>idl_cluster_definition generateClientCluster=1}} {{/zcl_clusters}} diff --git a/src/app/zap-templates/templates/app/MatterIDL_Server.zapt b/src/app/zap-templates/templates/app/MatterIDL_Server.zapt index 02e857d8c43f08..0e36361bef1a5f 100644 --- a/src/app/zap-templates/templates/app/MatterIDL_Server.zapt +++ b/src/app/zap-templates/templates/app/MatterIDL_Server.zapt @@ -1,12 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -{{#zcl_structs}} -{{#if has_more_than_one_cluster}} -{{>idl_structure_definition extraIndent=0}} - -{{/if}} -{{/zcl_structs}} {{#all_user_clusters~}} {{#if (is_client side)~}} {{>idl_cluster_definition generateClientCluster=1}} diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 06f81c08a52b23..5d9ec2b27415b7 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1,38 +1,6 @@ // This IDL was generated automatically by ZAP. // It is for view/code review purposes only. -struct ModeTagStruct { - optional vendor_id mfgCode = 0; - enum16 value = 1; -} - -struct ModeOptionStruct { - char_string<64> label = 0; - int8u mode = 1; - ModeTagStruct modeTags[] = 2; -} - -struct ApplicationStruct { - int16u catalogVendorID = 0; - char_string applicationID = 1; -} - -struct ErrorStateStruct { - enum8 errorStateID = 0; - optional char_string<64> errorStateLabel = 1; - optional char_string<64> errorStateDetails = 2; -} - -struct LabelStruct { - char_string<16> label = 0; - char_string<16> value = 1; -} - -struct OperationalStateStruct { - enum8 operationalStateID = 0; - optional char_string<64> operationalStateLabel = 1; -} - /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */ client cluster Identify = 3 { enum EffectIdentifierEnum : ENUM8 { From 48d4d432c292726d73318592f2ce1a9dfb2d218e Mon Sep 17 00:00:00 2001 From: jrhees-cae <61466710+jrhees-cae@users.noreply.github.com> Date: Fri, 29 Sep 2023 20:38:22 +0200 Subject: [PATCH 02/10] [TC-DRLK-2.4] Handle DUT's that do not support USR & PIN features (#29372) * [TC-DRLK-2.4] Handle DUT's that do not support USR & PIN features Fixes https://github.com/CHIP-Specifications/chip-test-plans/issues/3461 * Zap regen * Restyled by prettier-yaml --------- Co-authored-by: Restyled.io --- .../certification/Test_TC_DRLK_2_4.yaml | 23 ++++- .../zap-generated/test/Commands.h | 91 +++++++++++++++---- 2 files changed, 93 insertions(+), 21 deletions(-) diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml index bd593dadbf973c..bece149e34ed32 100644 --- a/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml @@ -35,6 +35,7 @@ tests: - label: "Create new user" command: "SetUser" + PICS: DRLK.S.F08 && DRLK.S.F00 timedInteractionTimeoutMs: 1000 arguments: values: @@ -55,6 +56,7 @@ tests: - label: "Read the user back and verify its fields" command: "GetUser" + PICS: DRLK.S.F08 && DRLK.S.F00 arguments: values: - name: "UserIndex" @@ -84,6 +86,7 @@ tests: - label: "Create new PIN credential and lock/unlock user" command: "SetCredential" + PICS: DRLK.S.F08 && DRLK.S.F00 timedInteractionTimeoutMs: 1000 arguments: values: @@ -109,6 +112,7 @@ tests: value: 2 - label: "Verify created PIN credential" + PICS: DRLK.S.F08 && DRLK.S.F00 command: "GetCredentialStatus" arguments: values: @@ -183,7 +187,8 @@ tests: - label: "Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds" - PICS: DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP + PICS: + " DRLK.S.F08 && DRLK.S.F00 && DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP " command: "UnlockWithTimeout" timedInteractionTimeoutMs: 1000 arguments: @@ -193,6 +198,19 @@ tests: - name: "PINCode" value: "123456" + - label: + "Step 2b: TH sends the Unlock with Timeout argument value as 60 + seconds" + PICS: + " (!DRLK.S.F08 || !DRLK.S.F00) && DRLK.S.C03.Rsp && + PICS_SKIP_SAMPLE_APP " + command: "UnlockWithTimeout" + timedInteractionTimeoutMs: 1000 + arguments: + values: + - name: "Timeout" + value: 60 + - label: "Wait for AutoRelockTime Expires" cluster: "DelayCommands" command: "WaitForMs" @@ -221,6 +239,7 @@ tests: - label: "Cleanup the created user" command: "ClearUser" + PICS: DRLK.S.F08 && DRLK.S.F00 timedInteractionTimeoutMs: 1000 arguments: values: @@ -228,7 +247,7 @@ tests: value: 1 - label: "Clean the created credential" - PICS: DRLK.S.C26.Rsp + PICS: DRLK.S.F08 && DRLK.S.F00 && DRLK.S.C26.Rsp command: "ClearCredential" timedInteractionTimeoutMs: 1000 arguments: 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 86364eaf8b3ff3..7640dd8634e296 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -165417,18 +165417,34 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { break; case 1: ChipLogProgress(chipTool, " ***** Test Step 1 : Create new user\n"); + if (ShouldSkip("DRLK.S.F08 && DRLK.S.F00")) { + NextTest(); + return; + } err = TestCreateNewUser_1(); break; case 2: ChipLogProgress(chipTool, " ***** Test Step 2 : Read the user back and verify its fields\n"); + if (ShouldSkip("DRLK.S.F08 && DRLK.S.F00")) { + NextTest(); + return; + } err = TestReadTheUserBackAndVerifyItsFields_2(); break; case 3: ChipLogProgress(chipTool, " ***** Test Step 3 : Create new PIN credential and lock/unlock user\n"); + if (ShouldSkip("DRLK.S.F08 && DRLK.S.F00")) { + NextTest(); + return; + } err = TestCreateNewPinCredentialAndLockUnlockUser_3(); break; case 4: ChipLogProgress(chipTool, " ***** Test Step 4 : Verify created PIN credential\n"); + if (ShouldSkip("DRLK.S.F08 && DRLK.S.F00")) { + NextTest(); + return; + } err = TestVerifyCreatedPinCredential_4(); break; case 5: @@ -165473,47 +165489,59 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { break; case 10: ChipLogProgress(chipTool, " ***** Test Step 10 : Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds\n"); - if (ShouldSkip("DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP")) { + if (ShouldSkip(" DRLK.S.F08 && DRLK.S.F00 && DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP ")) { NextTest(); return; } err = TestStep2bThSendsTheUnlockWithTimeoutArgumentValueAs60Seconds_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : Wait for AutoRelockTime Expires\n"); - if (ShouldSkip("DRLK.S.C03.Rsp && PICS_SDK_CI_ONLY")) { + ChipLogProgress(chipTool, " ***** Test Step 11 : Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds\n"); + if (ShouldSkip(" (!DRLK.S.F08 || !DRLK.S.F00) && DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP ")) { NextTest(); return; } - err = TestWaitForAutoRelockTimeExpires_11(); + err = TestStep2bThSendsTheUnlockWithTimeoutArgumentValueAs60Seconds_11(); break; case 12: ChipLogProgress(chipTool, " ***** Test Step 12 : Wait for AutoRelockTime Expires\n"); - if (ShouldSkip("DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP")) { + if (ShouldSkip("DRLK.S.C03.Rsp && PICS_SDK_CI_ONLY")) { NextTest(); return; } err = TestWaitForAutoRelockTimeExpires_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : Step 2c: TH reads LockState attribute\n"); - if (ShouldSkip("DRLK.S.A0000 && DRLK.S.C03.Rsp")) { + ChipLogProgress(chipTool, " ***** Test Step 13 : Wait for AutoRelockTime Expires\n"); + if (ShouldSkip("DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP")) { NextTest(); return; } - err = TestStep2cThReadsLockStateAttribute_13(); + err = TestWaitForAutoRelockTimeExpires_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : Cleanup the created user\n"); - err = TestCleanupTheCreatedUser_14(); + ChipLogProgress(chipTool, " ***** Test Step 14 : Step 2c: TH reads LockState attribute\n"); + if (ShouldSkip("DRLK.S.A0000 && DRLK.S.C03.Rsp")) { + NextTest(); + return; + } + err = TestStep2cThReadsLockStateAttribute_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : Clean the created credential\n"); - if (ShouldSkip("DRLK.S.C26.Rsp")) { + ChipLogProgress(chipTool, " ***** Test Step 15 : Cleanup the created user\n"); + if (ShouldSkip("DRLK.S.F08 && DRLK.S.F00")) { + NextTest(); + return; + } + err = TestCleanupTheCreatedUser_15(); + break; + case 16: + ChipLogProgress(chipTool, " ***** Test Step 16 : Clean the created credential\n"); + if (ShouldSkip("DRLK.S.F08 && DRLK.S.F00 && DRLK.S.C26.Rsp")) { NextTest(); return; } - err = TestCleanTheCreatedCredential_15(); + err = TestCleanTheCreatedCredential_16(); break; } @@ -165574,6 +165602,9 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 16: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -165584,7 +165615,7 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 16; + const uint16_t mTestCount = 17; chip::Optional mNodeId; chip::Optional mCluster; @@ -165946,7 +165977,29 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWaitForAutoRelockTimeExpires_11() + CHIP_ERROR TestStep2bThSendsTheUnlockWithTimeoutArgumentValueAs60Seconds_11() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRDoorLockClusterUnlockWithTimeoutParams alloc] init]; + params.timeout = + [NSNumber numberWithUnsignedShort:60U]; + [cluster unlockWithTimeoutWithParams:params completion: + ^(NSError * _Nullable err) { + NSLog(@"Step 2b: TH sends the Unlock with Timeout argument value as 60 seconds Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestWaitForAutoRelockTimeExpires_12() { chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; @@ -165954,7 +166007,7 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { return WaitForMs("alpha", value); } - CHIP_ERROR TestWaitForAutoRelockTimeExpires_12() + CHIP_ERROR TestWaitForAutoRelockTimeExpires_13() { chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; @@ -165962,7 +166015,7 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { return WaitForMs("alpha", value); } - CHIP_ERROR TestStep2cThReadsLockStateAttribute_13() + CHIP_ERROR TestStep2cThReadsLockStateAttribute_14() { MTRBaseDevice * device = GetDevice("alpha"); @@ -165986,7 +166039,7 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCleanupTheCreatedUser_14() + CHIP_ERROR TestCleanupTheCreatedUser_15() { MTRBaseDevice * device = GetDevice("alpha"); @@ -166008,7 +166061,7 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCleanTheCreatedCredential_15() + CHIP_ERROR TestCleanTheCreatedCredential_16() { MTRBaseDevice * device = GetDevice("alpha"); From cd6f5b0d88e097dc573ed54f14c8629eaedcf29b Mon Sep 17 00:00:00 2001 From: yunhanw-google Date: Sat, 30 Sep 2023 09:24:20 -0700 Subject: [PATCH 03/10] correctly clean output from android build (#29516) --- .github/workflows/full-android.yaml | 12 ++++++------ .github/workflows/smoketest-android.yaml | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 0597a844badf92..35b5628351b8e6 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -64,31 +64,31 @@ jobs: ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py --target android-arm-chip-tool build" - name: Clean out build output - run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* + run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar - name: Build Android arm-tv-casting-app run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py --target android-arm-tv-casting-app build" - name: Clean out build output - run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* + run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar - name: Build Android arm-tv-server run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py --target android-arm-tv-server build" - name: Clean out build output - run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* + run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar - name: Build Android arm64-tv-casting-app run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py --target android-arm64-tv-casting-app build" - name: Clean out build output - run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* + run: rm -rf ./out examples/tv-casting-app/android/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar - name: Build Android arm64-tv-server run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py --target android-arm64-tv-server build" - name: Clean out build output - run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* + run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar - name: Build Android arm64-chip-tool run: | ./scripts/run_in_build_env.sh \ @@ -98,7 +98,7 @@ jobs: ./scripts/run_in_build_env.sh \ "ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test" - name: Clean out build output - run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* + run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar # - name: Build Android Studio build (arm64 only) # run: | # ./scripts/run_in_build_env.sh \ diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 189d91b2197546..7dca5c975bb36e 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -58,12 +58,16 @@ jobs: ./scripts/run_in_build_env.sh \ "ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test" - name: Clean out build output - run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* + run: rm -rf ./out examples/android/CHIPTool/app/libs/jniLibs/* examples/android/CHIPTool/app/libs/*.jar - name: Build Android arm64-tv-casting-app run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py --target android-arm64-tv-casting-app build" + - name: Clean out build output + run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar - name: Build Android arm64-tv-server run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py --target android-arm64-tv-server build" + - name: Clean out build output + run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar From a40b53c8be1c9ed2acec0f8c4a19f0e87bd711ec Mon Sep 17 00:00:00 2001 From: manjunath-grl <102359958+manjunath-grl@users.noreply.github.com> Date: Sat, 30 Sep 2023 23:21:00 +0530 Subject: [PATCH 04/10] Fix YAML script issues (#29339) * Fix script issue: 649, 650, 651, 652, 653, 654, Modified tests: TC_ACL_2_10 TC_ACL_2_7 TC_ACL_2_8 TC_DGWIFI_3_2_Simulated TC_FLW_2_1 TC_LUNIT_3_1 TC_RH_2_1 TC_SC_4_1 Automated test: TC_RVCCLEANM_3_3 Semi-automated tests: TC_REFALM_2_1 Fixes issue: 29331 * Auto generated files * The following YAMLs are removed since there are Python script for the testcases. TC-DT-1.1 TC-IDM-10.1 TC-IDM-11.1 TC-SM-1.1 TC-SM-1.2 * Fixes issue: 656 & 658 Modified tests: TC-GRPKEY-2.1 Removed test: TC-LVL-2.3_Simulated * Modified testcase TC-SC-5.1 * Fixes issue: 655, 660 Modified tests: TC-ACL-2.4 TC-ACL-2.5 TC-ACL-2.6 TC-ACL-2.7 TC-SC-5.2 Revert back the DGGEN-2.1 testcase * Modified test FLW-2.1 * Fixes YAML script issue: 664, 668, 671, 672, 673 TC-DGGEN-2.1 TC-TSTAT-1.1 TC-TSUIC-1.1 TC-TSTAT-2.1 TC-WNCV-3.4 TC-WNCV-3.5 Manual tests: TC-REFALM-2.2 TC-REFALM-2.3 * Restyled by whitespace * Fixes issue 984 TC-TCTL-1.1 * Reverted back changes for tests: TC-DGGEN-2.1 TC-REFALM-2.1 TC-RVCCLEANM-3.3 * Modify ciTest.json file * Fix type --------- Co-authored-by: Restyled.io --- .../templates/tests/ciTests.json | 5 +- .../placeholder/linux/apps/app1/ciTests.json | 1 - scripts/tests/chiptest/__init__.py | 1 + src/app/tests/suites/certification/PICS.yaml | 120 +--- .../certification/Test_TC_ACL_2_10.yaml | 12 +- .../suites/certification/Test_TC_ACL_2_4.yaml | 409 ++++++----- .../suites/certification/Test_TC_ACL_2_5.yaml | 26 +- .../suites/certification/Test_TC_ACL_2_6.yaml | 32 +- .../suites/certification/Test_TC_ACL_2_7.yaml | 30 +- .../Test_TC_DGWIFI_3_2_Simulated.yaml | 2 +- .../suites/certification/Test_TC_DT_1_1.yaml | 142 ---- .../suites/certification/Test_TC_FLW_2_1.yaml | 2 +- .../certification/Test_TC_GRPKEY_2_1.yaml | 2 +- .../certification/Test_TC_IDM_11_1.yaml | 81 --- .../certification/Test_TC_LUNIT_3_1.yaml | 13 +- .../Test_TC_LVL_2_3_Simulated.yaml | 584 ---------------- .../certification/Test_TC_REFALM_2_1.yaml | 9 +- .../certification/Test_TC_REFALM_2_2.yaml | 5 + .../certification/Test_TC_REFALM_2_3.yaml | 55 +- .../suites/certification/Test_TC_RH_2_1.yaml | 2 +- .../certification/Test_TC_RVCCLEANM_3_3.yaml | 4 +- .../suites/certification/Test_TC_SC_4_1.yaml | 9 +- .../suites/certification/Test_TC_SC_5_1.yaml | 12 +- .../suites/certification/Test_TC_SC_5_2.yaml | 7 +- .../suites/certification/Test_TC_SM_1_1.yaml | 220 ------ .../suites/certification/Test_TC_SM_1_2.yaml | 132 ---- .../certification/Test_TC_TCCM_1_1.yaml | 2 +- .../certification/Test_TC_TCTL_1_1.yaml | 2 +- .../certification/Test_TC_TSTAT_1_1.yaml | 16 +- .../certification/Test_TC_TSTAT_2_2.yaml | 44 +- .../certification/Test_TC_TSUIC_1_1.yaml | 27 +- .../certification/Test_TC_WNCV_3_4.yaml | 2 +- .../certification/Test_TC_WNCV_3_5.yaml | 2 +- .../tests/suites/certification/ci-pics-values | 29 +- src/app/tests/suites/manualTests.json | 4 +- .../zap-generated/test/Commands.h | 651 ++++-------------- .../app1/zap-generated/test/Commands.h | 189 +---- .../app2/zap-generated/test/Commands.h | 189 +---- 38 files changed, 594 insertions(+), 2480 deletions(-) delete mode 100755 src/app/tests/suites/certification/Test_TC_DT_1_1.yaml delete mode 100644 src/app/tests/suites/certification/Test_TC_IDM_11_1.yaml delete mode 100644 src/app/tests/suites/certification/Test_TC_LVL_2_3_Simulated.yaml delete mode 100755 src/app/tests/suites/certification/Test_TC_SM_1_1.yaml delete mode 100755 src/app/tests/suites/certification/Test_TC_SM_1_2.yaml diff --git a/examples/darwin-framework-tool/templates/tests/ciTests.json b/examples/darwin-framework-tool/templates/tests/ciTests.json index 3d53b4ac173568..d3d9dcb2f04581 100644 --- a/examples/darwin-framework-tool/templates/tests/ciTests.json +++ b/examples/darwin-framework-tool/templates/tests/ciTests.json @@ -53,6 +53,9 @@ "Test_AddNewFabricFromExistingFabric", "Disabled because darwin-framework-tool does not support EqualityCommands pseudo-cluster", "Test_TC_TCCM_3_1", - "Test_TC_TCTL_2_1" + "Test_TC_TCTL_2_1", + "Disabled because darwin-framework-tool does not support constraints arithmetic operations", + "Test_TC_FLW_2_1", + "Test_TC_RH_2_1" ] } diff --git a/examples/placeholder/linux/apps/app1/ciTests.json b/examples/placeholder/linux/apps/app1/ciTests.json index 66abad400a442f..63ba1ad875563c 100644 --- a/examples/placeholder/linux/apps/app1/ciTests.json +++ b/examples/placeholder/linux/apps/app1/ciTests.json @@ -14,7 +14,6 @@ "Test_TC_CC_7_5_Simulated", "Test_TC_CC_9_4_Simulated", "Test_TC_DGTHREAD_3_4_Simulated", - "Test_TC_LVL_2_3_Simulated", "Test_TC_OO_3_2_Simulated" ], "collection": ["Test"] diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py index 3bee9a23d046a0..457ebb1d969c91 100644 --- a/scripts/tests/chiptest/__init__.py +++ b/scripts/tests/chiptest/__init__.py @@ -195,6 +195,7 @@ def _GetChipReplUnsupportedTests() -> Set[str]: "TestClusterMultiFabric.yaml", "Test_TC_ACL_2_5.yaml", # chip-repl does not support LastReceivedEventNumber : https://github.com/project-chip/connectedhomeip/issues/28884 "Test_TC_ACL_2_6.yaml", # chip-repl does not support LastReceivedEventNumber : https://github.com/project-chip/connectedhomeip/issues/28884 + "Test_TC_RVCCLEANM_3_3.yaml", # chip-repl does not support EqualityCommands pseudo-cluster } diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml index 646a9aaaa47043..db68712796d160 100644 --- a/src/app/tests/suites/certification/PICS.yaml +++ b/src/app/tests/suites/certification/PICS.yaml @@ -7156,51 +7156,13 @@ PICS: # server / manually # - label: "Does the device support the TemperatureUnit Fahrenheit ?" - id: LUNIT.TempUnit.Fahrenheit + id: LUNIT.S.M.Fahrenheit - label: "Does the device support the TemperatureUnit Celsius ?" - id: LUNIT.TempUnit.Celsius + id: LUNIT.S.M.Celsius - label: "Does the device support the TemperatureUnit Kelvin ?" - id: LUNIT.TempUnit.Kelvin - - # - # client / attributes - # - - label: - "Does the DUT(client) have access privileges for the TemperatureUnit - attribute implemented on the server ?" - id: LUNIT.C.A0000 - - - label: - "Does the DUT(client) have access privileges for the (0xFFF8) - GeneratedCommandList attribute implemented on the server ?" - id: LUNIT.C.Afff8 - - - label: - "Does the DUT(client) have access privileges for the (0xFFF9) - AcceptedCommandList attribute implemented on the server ?" - id: LUNIT.C.Afff9 - - - label: - "Does the DUT(client) have access privileges for the (0xFFFA) - EventList attribute implemented on the server ?" - id: LUNIT.C.Afffa - - - label: - "Does the DUT(client) have access privileges for the (0xFFFB) - AttributeList attribute implemented on the server ?" - id: LUNIT.C.Afffb - - - label: - "Does the DUT(client) have access privileges for the (0xFFFC) - FeatureMap attribute implemented on the server ?" - id: LUNIT.C.Afffc - - - label: - "Does the DUT(client) have access privileges for the (0xFFFD) - ClusterRevision attribute implemented on the server ?" - id: LUNIT.C.Afffd + id: LUNIT.S.M.Kelvin # User Label Cluster Test Plan - label: "Does the device implement the User Label cluster as a server?" @@ -7342,74 +7304,6 @@ PICS: of packets on the ethernet interface." id: DGWIFI.S.F01 - # - # client / attributes - # - - label: - "Does the DUT(client) have access privileges for the BSSID attribute - implemented on the server?" - id: DGWIFI.C.A0000 - - - label: - "Does the DUT(client) have access privileges for the SecurityType - attribute implemented on the server?" - id: DGWIFI.C.A0001 - - - label: - "Does the DUT(client) have access privileges for the WiFiVersion - attribute implemented on the server?" - id: DGWIFI.C.A0002 - - - label: - "Does the DUT(client) have access privileges for the ChannelNumber - attribute implemented on the server?" - id: DGWIFI.C.A0003 - - - label: - "Does the DUT(client) have access privileges for the RSSI attribute - implemented on the server?" - id: DGWIFI.C.A0004 - - - label: - "Does the DUT(client) have access privileges for the BeaconLostCount - attribute implemented on the server?" - id: DGWIFI.C.A0005 - - - label: - "Does the DUT(client) have access privileges for the BeaconRxCount - attribute implemented on the server?" - id: DGWIFI.C.A0006 - - - label: - "Does the DUT(client) have access privileges for the - PacketMulticastRxCount attribute implemented on the server?" - id: DGWIFI.C.A0007 - - - label: - "Does the DUT(client) have access privileges for the - PacketMulticastTxCount attribute implemented on the server?" - id: DGWIFI.C.A0008 - - - label: - "Does the DUT(client) have access privileges for the - PacketUnicastRxCount attribute implemented on the server?" - id: DGWIFI.C.A0009 - - - label: - "Does the DUT(client) have access privileges for the - PacketUnicastTxCount attribute implemented on the server?" - id: DGWIFI.C.A000a - - - label: - "Does the DUT(client) have access privileges for the CurrentMaxRate - attribute implemented on the server?" - id: DGWIFI.C.A000b - - - label: - "Does the DUT(client) have access privileges for the OverrunCount - attribute implemented on the server?" - id: DGWIFI.C.A000c - # # client / commandsGenerated # @@ -7417,13 +7311,7 @@ PICS: "Reset the following attributes to 0; BeaconLostCount, BeaconRxCount, PacketMulticastRxCount, PacketMulticastTxCount, PacketUnicastRxCount, PacketUnicastTxCount" - id: DGWIFI.C.C00.Tx - - # - # client / manually - # - - label: "" - id: DGWIFI.C.A + id: DGWIFI.S.C00.Tx # Window Covering Cluster Test Plan - label: diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml index baa544bca18818..2dac5acd518d17 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml @@ -457,11 +457,11 @@ tests: value: "y" - label: - "Step 10:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute" + "Step 10:TH1 reads DUT Endpoint 0 AccessControl cluster ACL attribute" PICS: ACL.S.A0000 - command: "writeAttribute" + command: "readAttribute" attribute: "ACL" - arguments: + response: value: [ { @@ -639,11 +639,11 @@ tests: value: "y" - label: - "Step 16:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute" + "Step 16:TH1 reads DUT Endpoint 0 AccessControl cluster ACL attribute" PICS: ACL.S.A0000 - command: "writeAttribute" + command: "readAttribute" attribute: "ACL" - arguments: + response: value: [ { diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml index c08bba0b65f47f..bd173e7eb81427 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml @@ -773,82 +773,68 @@ tests: TARGETS)" PICS: ACL.S.A0000 && PICS_SKIP_SAMPLE_APP verification: | - ./chip-tool accesscontrol write acl '[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, { "privilege": 3, "authMode": 2, "subjects": null, "targets":[{ "cluster": 40, "endpoint": null, "deviceType": null },{ "cluster": 28, "endpoint": null, "deviceType": null }]}]' 1 0 + ./chip-tool accesscontrol write acl '[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, { "privilege": 3, "authMode": 2, "subjects": null, "targets":[{ "cluster": 40, "endpoint": null, "deviceType": null },{ "cluster": 28, "endpoint": null, "deviceType": null },{ "cluster": 30, "endpoint": null, "deviceType": null }]}]' 1 0 - On TH1(Chiptool), Verify that the status is success when writing the AccessControl cluster ACL attribute with a value is list of AccessControlEntryStruct containing 2 elements with Subjects as null and and Target as TARGETS + Via the TH (chip-tool), Verify that the status is success when writing the AccessControl cluster ACL attribute with a value is list of AccessControlEntryStruct containing 2 elements. - [1657542520.140869][3499:3504] CHIP:DMG: { - [1657542520.140922][3499:3504] CHIP:DMG: AttributeStatusIBs = - [1657542520.140966][3499:3504] CHIP:DMG: [ - [1657542520.140999][3499:3504] CHIP:DMG: AttributeStatusIB = - [1657542520.141036][3499:3504] CHIP:DMG: { - [1657542520.141077][3499:3504] CHIP:DMG: AttributePathIB = - [1657542520.141119][3499:3504] CHIP:DMG: { - [1657542520.141163][3499:3504] CHIP:DMG: Endpoint = 0x0, - [1657542520.141207][3499:3504] CHIP:DMG: Cluster = 0x1f, - [1657542520.141255][3499:3504] CHIP:DMG: Attribute = 0x0000_0000, - [1657542520.141300][3499:3504] CHIP:DMG: } - [1657542520.141346][3499:3504] CHIP:DMG: - [1657542520.141385][3499:3504] CHIP:DMG: StatusIB = - [1657542520.141426][3499:3504] CHIP:DMG: { - [1657542520.141468][3499:3504] CHIP:DMG: status = 0x00 (SUCCESS), - [1657542520.141509][3499:3504] CHIP:DMG: }, - [1657542520.141550][3499:3504] CHIP:DMG: - [1657542520.141584][3499:3504] CHIP:DMG: }, - [1657542520.141630][3499:3504] CHIP:DMG: - [1657542520.141663][3499:3504] CHIP:DMG: AttributeStatusIB = - [1657542520.141697][3499:3504] CHIP:DMG: { - [1657542520.141731][3499:3504] CHIP:DMG: AttributePathIB = - [1657542520.141770][3499:3504] CHIP:DMG: { - [1657542520.141811][3499:3504] CHIP:DMG: Endpoint = 0x0, - [1657542520.141855][3499:3504] CHIP:DMG: Cluster = 0x1f, - [1657542520.141940][3499:3504] CHIP:DMG: Attribute = 0x0000_0000, - [1657542520.142024][3499:3504] CHIP:DMG: ListIndex = Null, - [1657542520.142106][3499:3504] CHIP:DMG: } - [1662015973.912273][3126:3132] CHIP:DMG: { - [1662015973.912301][3126:3132] CHIP:DMG: AttributeStatusIBs = - [1662015973.912375][3126:3132] CHIP:DMG: [ - [1662015973.912409][3126:3132] CHIP:DMG: AttributeStatusIB = - [1662015973.912452][3126:3132] CHIP:DMG: { - [1662015973.912488][3126:3132] CHIP:DMG: AttributePathIB = - [1662015973.912534][3126:3132] CHIP:DMG: { - [1662015973.912577][3126:3132] CHIP:DMG: Endpoint = 0x0, - [1662015973.912640][3126:3132] CHIP:DMG: Cluster = 0x1f, - [1662015973.912687][3126:3132] CHIP:DMG: Attribute = 0x0000_0000, - [1662015973.912743][3126:3132] CHIP:DMG: } - [1662015973.912792][3126:3132] CHIP:DMG: - [1662015973.912849][3126:3132] CHIP:DMG: StatusIB = - [1662015973.912893][3126:3132] CHIP:DMG: { - [1662015973.912948][3126:3132] CHIP:DMG: status = 0x00 (SUCCESS), - [1662015973.912992][3126:3132] CHIP:DMG: }, - [1662015973.913046][3126:3132] CHIP:DMG: - [1662015973.913082][3126:3132] CHIP:DMG: }, - [1662015973.913142][3126:3132] CHIP:DMG: - [1662015973.913173][3126:3132] CHIP:DMG: AttributeStatusIB = - [1662015973.913225][3126:3132] CHIP:DMG: { - [1662015973.913260][3126:3132] CHIP:DMG: AttributePathIB = - [1662015973.913315][3126:3132] CHIP:DMG: { - [1662015973.913360][3126:3132] CHIP:DMG: Endpoint = 0x0, - [1662015973.913421][3126:3132] CHIP:DMG: Cluster = 0x1f, - [1662015973.913465][3126:3132] CHIP:DMG: Attribute = 0x0000_0000, - [1662015973.913518][3126:3132] CHIP:DMG: ListIndex = Null, - [1662015973.913561][3126:3132] CHIP:DMG: } - [1662015973.913622][3126:3132] CHIP:DMG: - [1662015973.913662][3126:3132] CHIP:DMG: StatusIB = - [1662015973.913716][3126:3132] CHIP:DMG: { - [1662015973.913759][3126:3132] CHIP:DMG: status = 0x00 (SUCCESS), - [1662015973.913814][3126:3132] CHIP:DMG: }, - [1662015973.913855][3126:3132] CHIP:DMG: - [1662015973.913902][3126:3132] CHIP:DMG: }, - [1662015973.913952][3126:3132] CHIP:DMG: - [1662015973.913983][3126:3132] CHIP:DMG: AttributeStatusIB = - [1662015973.914021][3126:3132] CHIP:DMG: { - [1662015973.914056][3126:3132] CHIP:DMG: AttributePathIB = - [1662015973.914095][3126:3132] CHIP:DMG: { - [1662015973.914139][3126:3132] CHIP:DMG: Endpoint = 0x0, - [1662015973.914183][3126:3132] CHIP:DMG: Cluster = 0x1f, - [1662015973.914228][3126:3132] CHIP:DMG: Attribute = 0x0000_0000, - [1662015973.914270][3126:3132] CHIP:DMG: ListIndex = Null, + [1686292221.429177][33589:33591] CHIP:DMG: WriteResponseMessage = + [1686292221.429234][33589:33591] CHIP:DMG: { + [1686292221.429283][33589:33591] CHIP:DMG: AttributeStatusIBs = + [1686292221.429355][33589:33591] CHIP:DMG: [ + [1686292221.429411][33589:33591] CHIP:DMG: AttributeStatusIB = + [1686292221.429475][33589:33591] CHIP:DMG: { + [1686292221.429534][33589:33591] CHIP:DMG: AttributePathIB = + [1686292221.429691][33589:33591] CHIP:DMG: { + [1686292221.429771][33589:33591] CHIP:DMG: Endpoint = 0x0, + [1686292221.429847][33589:33591] CHIP:DMG: Cluster = 0x1f, + [1686292221.429923][33589:33591] CHIP:DMG: Attribute = 0x0000_0000, + [1686292221.429989][33589:33591] CHIP:DMG: } + [1686292221.430067][33589:33591] CHIP:DMG: + [1686292221.430136][33589:33591] CHIP:DMG: StatusIB = + [1686292221.430206][33589:33591] CHIP:DMG: { + [1686292221.430277][33589:33591] CHIP:DMG: status = 0x00 (SUCCESS), + [1686292221.430346][33589:33591] CHIP:DMG: }, + [1686292221.430415][33589:33591] CHIP:DMG: + [1686292221.430474][33589:33591] CHIP:DMG: }, + [1686292221.430558][33589:33591] CHIP:DMG: + [1686292221.430614][33589:33591] CHIP:DMG: AttributeStatusIB = + [1686292221.430675][33589:33591] CHIP:DMG: { + [1686292221.430734][33589:33591] CHIP:DMG: AttributePathIB = + [1686292221.430801][33589:33591] CHIP:DMG: { + [1686292221.430870][33589:33591] CHIP:DMG: Endpoint = 0x0, + [1686292221.430944][33589:33591] CHIP:DMG: Cluster = 0x1f, + [1686292221.431020][33589:33591] CHIP:DMG: Attribute = 0x0000_0000, + [1686292221.431263][33589:33591] CHIP:DMG: ListIndex = Null, + [1686292221.431342][33589:33591] CHIP:DMG: } + [1686292221.431419][33589:33591] CHIP:DMG: + [1686292221.431486][33589:33591] CHIP:DMG: StatusIB = + [1686292221.431554][33589:33591] CHIP:DMG: { + [1686292221.431635][33589:33591] CHIP:DMG: status = 0x00 (SUCCESS), + [1686292221.431705][33589:33591] CHIP:DMG: }, + [1686292221.431774][33589:33591] CHIP:DMG: + [1686292221.431833][33589:33591] CHIP:DMG: }, + [1686292221.431918][33589:33591] CHIP:DMG: + [1686292221.431973][33589:33591] CHIP:DMG: AttributeStatusIB = + [1686292221.432035][33589:33591] CHIP:DMG: { + [1686292221.432093][33589:33591] CHIP:DMG: AttributePathIB = + [1686292221.432161][33589:33591] CHIP:DMG: { + [1686292221.432231][33589:33591] CHIP:DMG: Endpoint = 0x0, + [1686292221.432305][33589:33591] CHIP:DMG: Cluster = 0x1f, + [1686292221.432381][33589:33591] CHIP:DMG: Attribute = 0x0000_0000, + [1686292221.432453][33589:33591] CHIP:DMG: ListIndex = Null, + [1686292221.432523][33589:33591] CHIP:DMG: } + [1686292221.432600][33589:33591] CHIP:DMG: + [1686292221.432666][33589:33591] CHIP:DMG: StatusIB = + [1686292221.432734][33589:33591] CHIP:DMG: { + [1686292221.432803][33589:33591] CHIP:DMG: status = 0x00 (SUCCESS), + [1686292221.432873][33589:33591] CHIP:DMG: }, + [1686292221.432949][33589:33591] CHIP:DMG: + [1686292221.433008][33589:33591] CHIP:DMG: }, + [1686292221.433077][33589:33591] CHIP:DMG: + [1686292221.433132][33589:33591] CHIP:DMG: ], + [1686292221.433218][33589:33591] CHIP:DMG: + [1686292221.433273][33589:33591] CHIP:DMG: InteractionModelRevision = 1 + [1686292221.433327][33589:33591] CHIP:DMG: } cluster: "LogCommands" command: "UserPrompt" arguments: @@ -863,33 +849,41 @@ tests: PICS: ACL.S.A0000 && PICS_SKIP_SAMPLE_APP verification: | ./chip-tool accesscontrol read acl 1 0 - On TH1(Chiptool) , Verify that the AccessControlEntryStruct contains 2 elements with Subjects as null and and Target as TARGETS - [1662016086.501582][3138:3143] CHIP:TOO: ACL: 2 entries - [1662016086.501643][3138:3143] CHIP:TOO: [1]: { - [1662016086.501673][3138:3143] CHIP:TOO: Privilege: 5 - [1662016086.501698][3138:3143] CHIP:TOO: AuthMode: 2 - [1662016086.501727][3138:3143] CHIP:TOO: Subjects: 1 entries - [1662016086.501758][3138:3143] CHIP:TOO: [1]: 112233 - [1662016086.501786][3138:3143] CHIP:TOO: Targets: null - [1662016086.501811][3138:3143] CHIP:TOO: FabricIndex: 1 - [1662016086.501835][3138:3143] CHIP:TOO: } - [1662016086.501873][3138:3143] CHIP:TOO: [2]: { - [1662016086.501899][3138:3143] CHIP:TOO: Privilege: 3 - [1662016086.501924][3138:3143] CHIP:TOO: AuthMode: 2 - [1662016086.501948][3138:3143] CHIP:TOO: Subjects: null - [1662016086.501979][3138:3143] CHIP:TOO: Targets: 2 entries - [1662016086.502016][3138:3143] CHIP:TOO: [1]: { - [1662016086.502043][3138:3143] CHIP:TOO: Cluster: 40 - [1662016086.502069][3138:3143] CHIP:TOO: Endpoint: null - [1662016086.502094][3138:3143] CHIP:TOO: DeviceType: null - [1662016086.502117][3138:3143] CHIP:TOO: } - [1662016086.502148][3138:3143] CHIP:TOO: [2]: { - [1662016086.502174][3138:3143] CHIP:TOO: Cluster: 28 - [1662016086.502198][3138:3143] CHIP:TOO: Endpoint: null - [1662016086.502223][3138:3143] CHIP:TOO: DeviceType: null - [1662016086.502247][3138:3143] CHIP:TOO: } - [1662016086.502273][3138:3143] CHIP:TOO: FabricIndex: 1 + Via the TH (chip-tool), Verify that the AccessControlEntryStruct contains 4 elements. + + [1686292292.890253][33601:33603] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 2420291518 + [1686292292.890488][33601:33603] CHIP:TOO: ACL: 2 entries + [1686292292.890620][33601:33603] CHIP:TOO: [1]: { + [1686292292.890708][33601:33603] CHIP:TOO: Privilege: 5 + [1686292292.890762][33601:33603] CHIP:TOO: AuthMode: 2 + [1686292292.890850][33601:33603] CHIP:TOO: Subjects: 1 entries + [1686292292.890918][33601:33603] CHIP:TOO: [1]: 112233 + [1686292292.890976][33601:33603] CHIP:TOO: Targets: null + [1686292292.891028][33601:33603] CHIP:TOO: FabricIndex: 1 + [1686292292.891078][33601:33603] CHIP:TOO: } + [1686292292.891170][33601:33603] CHIP:TOO: [2]: { + [1686292292.891220][33601:33603] CHIP:TOO: Privilege: 3 + [1686292292.891272][33601:33603] CHIP:TOO: AuthMode: 2 + [1686292292.891324][33601:33603] CHIP:TOO: Subjects: null + [1686292292.891397][33601:33603] CHIP:TOO: Targets: 3 entries + [1686292292.891480][33601:33603] CHIP:TOO: [1]: { + [1686292292.891536][33601:33603] CHIP:TOO: Cluster: 40 + [1686292292.891590][33601:33603] CHIP:TOO: Endpoint: null + [1686292292.891642][33601:33603] CHIP:TOO: DeviceType: null + [1686292292.891692][33601:33603] CHIP:TOO: } + [1686292292.891760][33601:33603] CHIP:TOO: [2]: { + [1686292292.891815][33601:33603] CHIP:TOO: Cluster: 28 + [1686292292.891866][33601:33603] CHIP:TOO: Endpoint: null + [1686292292.891916][33601:33603] CHIP:TOO: DeviceType: null + [1686292292.891966][33601:33603] CHIP:TOO: } + [1686292292.892032][33601:33603] CHIP:TOO: [3]: { + [1686292292.892087][33601:33603] CHIP:TOO: Cluster: 30 + [1686292292.892138][33601:33603] CHIP:TOO: Endpoint: null + [1686292292.892188][33601:33603] CHIP:TOO: DeviceType: null + [1686292292.892238][33601:33603] CHIP:TOO: } + [1686292292.892293][33601:33603] CHIP:TOO: FabricIndex: 1 + [1686292292.892345][33601:33603] CHIP:TOO: } cluster: "LogCommands" command: "UserPrompt" arguments: @@ -908,6 +902,7 @@ tests: response: saveAs: MAXENTRIES + #Made following steps as prompt, As at the moment YAML doesn't support sending the elements based on the MAXENTRIES from the previous steps. - label: "Step 27:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing @@ -915,64 +910,160 @@ tests: field: CASE (2) Subjects field: [N1] Targets field: null 2.struct Privilege field: Operate (3) AuthMode field: CASE (2) Subjects field: null Targets field: null subsequent elements same as second element" - PICS: ACL.S.A0000 - command: "writeAttribute" - attribute: "ACL" + PICS: ACL.S.A0000 && PICS_SKIP_SAMPLE_APP + verification: | + ./chip-tool accesscontrol write acl '[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, { "privilege": 3, "authMode": 2, "subjects": null, "targets":null}, { "privilege": 3, "authMode": 2, "subjects": null, "targets":null},{ "privilege": 3, "authMode": 2, "subjects": null, "targets":null}]' 1 0 + + Via the TH (chip-tool), Verify that the status is success when writing the AccessControl cluster ACL attribute with a value is list of AccessControlEntryStruct containing MAXENTRIES elements. + + [1686292560.130383][33642:33644] CHIP:DMG: WriteClient moving to [ResponseRe] + [1686292560.130530][33642:33644] CHIP:DMG: WriteResponseMessage = + [1686292560.130588][33642:33644] CHIP:DMG: { + [1686292560.130671][33642:33644] CHIP:DMG: AttributeStatusIBs = + [1686292560.130749][33642:33644] CHIP:DMG: [ + [1686292560.130807][33642:33644] CHIP:DMG: AttributeStatusIB = + [1686292560.130893][33642:33644] CHIP:DMG: { + [1686292560.130955][33642:33644] CHIP:DMG: AttributePathIB = + [1686292560.131045][33642:33644] CHIP:DMG: { + [1686292560.131119][33642:33644] CHIP:DMG: Endpoint = 0x0, + [1686292560.131216][33642:33644] CHIP:DMG: Cluster = 0x1f, + [1686292560.131293][33642:33644] CHIP:DMG: Attribute = 0x0000_0000, + [1686292560.131387][33642:33644] CHIP:DMG: } + [1686292560.131469][33642:33644] CHIP:DMG: + [1686292560.131535][33642:33644] CHIP:DMG: StatusIB = + [1686292560.131628][33642:33644] CHIP:DMG: { + [1686292560.131702][33642:33644] CHIP:DMG: status = 0x00 (SUCCESS), + [1686292560.131793][33642:33644] CHIP:DMG: }, + [1686292560.131865][33642:33644] CHIP:DMG: + [1686292560.131947][33642:33644] CHIP:DMG: }, + [1686292560.132033][33642:33644] CHIP:DMG: + [1686292560.132107][33642:33644] CHIP:DMG: AttributeStatusIB = + [1686292560.132181][33642:33644] CHIP:DMG: { + [1686292560.132241][33642:33644] CHIP:DMG: AttributePathIB = + [1686292560.132330][33642:33644] CHIP:DMG: { + [1686292560.132400][33642:33644] CHIP:DMG: Endpoint = 0x0, + [1686292560.132497][33642:33644] CHIP:DMG: Cluster = 0x1f, + [1686292560.132573][33642:33644] CHIP:DMG: Attribute = 0x0000_0000, + [1686292560.132666][33642:33644] CHIP:DMG: ListIndex = Null, + [1686292560.132738][33642:33644] CHIP:DMG: } + [1686292560.132843][33642:33644] CHIP:DMG: + [1686292560.132911][33642:33644] CHIP:DMG: StatusIB = + [1686292560.132979][33642:33644] CHIP:DMG: { + [1686292560.133074][33642:33644] CHIP:DMG: status = 0x00 (SUCCESS), + [1686292560.133146][33642:33644] CHIP:DMG: }, + [1686292560.133237][33642:33644] CHIP:DMG: + [1686292560.133297][33642:33644] CHIP:DMG: }, + [1686292560.133402][33642:33644] CHIP:DMG: + [1686292560.133461][33642:33644] CHIP:DMG: AttributeStatusIB = + [1686292560.133522][33642:33644] CHIP:DMG: { + [1686292560.133708][33642:33644] CHIP:DMG: AttributePathIB = + [1686292560.133801][33642:33644] CHIP:DMG: { + [1686292560.133873][33642:33644] CHIP:DMG: Endpoint = 0x0, + [1686292560.133947][33642:33644] CHIP:DMG: Cluster = 0x1f, + [1686292560.134046][33642:33644] CHIP:DMG: Attribute = 0x0000_0000, + [1686292560.134119][33642:33644] CHIP:DMG: ListIndex = Null, + [1686292560.134210][33642:33644] CHIP:DMG: } + [1686292560.134288][33642:33644] CHIP:DMG: + [1686292560.134372][33642:33644] CHIP:DMG: StatusIB = + [1686292560.134440][33642:33644] CHIP:DMG: { + [1686292560.134531][33642:33644] CHIP:DMG: status = 0x00 (SUCCESS), + [1686292560.134601][33642:33644] CHIP:DMG: }, + [1686292560.134690][33642:33644] CHIP:DMG: + [1686292560.134751][33642:33644] CHIP:DMG: }, + [1686292560.134837][33642:33644] CHIP:DMG: + [1686292560.134914][33642:33644] CHIP:DMG: AttributeStatusIB = + [1686292560.134976][33642:33644] CHIP:DMG: { + [1686292560.135063][33642:33644] CHIP:DMG: AttributePathIB = + [1686292560.135132][33642:33644] CHIP:DMG: { + [1686292560.135221][33642:33644] CHIP:DMG: Endpoint = 0x0, + [1686292560.135297][33642:33644] CHIP:DMG: Cluster = 0x1f, + [1686292560.135372][33642:33644] CHIP:DMG: Attribute = 0x0000_0000, + [1686292560.135466][33642:33644] CHIP:DMG: ListIndex = Null, + [1686292560.135537][33642:33644] CHIP:DMG: } + [1686292560.135634][33642:33644] CHIP:DMG: + [1686292560.135701][33642:33644] CHIP:DMG: StatusIB = + [1686292560.135789][33642:33644] CHIP:DMG: { + [1686292560.135859][33642:33644] CHIP:DMG: status = 0x00 (SUCCESS), + [1686292560.135967][33642:33644] CHIP:DMG: }, + [1686292560.136043][33642:33644] CHIP:DMG: + [1686292560.136102][33642:33644] CHIP:DMG: }, + [1686292560.136210][33642:33644] CHIP:DMG: + [1686292560.136266][33642:33644] CHIP:DMG: AttributeStatusIB = + [1686292560.136349][33642:33644] CHIP:DMG: { + [1686292560.136409][33642:33644] CHIP:DMG: AttributePathIB = + [1686292560.136496][33642:33644] CHIP:DMG: { + [1686292560.136567][33642:33644] CHIP:DMG: Endpoint = 0x0, + [1686292560.136642][33642:33644] CHIP:DMG: Cluster = 0x1f, + [1686292560.136739][33642:33644] CHIP:DMG: Attribute = 0x0000_0000, + [1686292560.136811][33642:33644] CHIP:DMG: ListIndex = Null, + [1686292560.136900][33642:33644] CHIP:DMG: } + [1686292560.136979][33642:33644] CHIP:DMG: + [1686292560.137065][33642:33644] CHIP:DMG: StatusIB = + [1686292560.137134][33642:33644] CHIP:DMG: { + [1686292560.137201][33642:33644] CHIP:DMG: status = 0x00 (SUCCESS), + [1686292560.137295][33642:33644] CHIP:DMG: }, + [1686292560.137366][33642:33644] CHIP:DMG: + [1686292560.137451][33642:33644] CHIP:DMG: }, + [1686292560.137522][33642:33644] CHIP:DMG: + [1686292560.137630][33642:33644] CHIP:DMG: ], + [1686292560.137740][33642:33644] CHIP:DMG: + [1686292560.137816][33642:33644] CHIP:DMG: InteractionModelRevision = 1 + [1686292560.137873][33642:33644] CHIP:DMG: } + cluster: "LogCommands" + command: "UserPrompt" arguments: - value: - [ - { - Privilege: 5, - AuthMode: 2, - Subjects: [CommissionerNodeId], - Targets: null, - FabricIndex: CurrentFabricIndexValue, - }, - { - Privilege: 3, - AuthMode: 2, - Subjects: null, - Targets: null, - FabricIndex: CurrentFabricIndexValue, - }, - { - Privilege: 3, - AuthMode: 2, - Subjects: null, - Targets: null, - FabricIndex: CurrentFabricIndexValue, - }, - ] + values: + - name: "message" + value: "Enter 'y' after success" + - name: "expectedValue" + value: "y" - label: "Step 28:TH1 reads AccessControl cluster ACL attribute" - PICS: ACL.S.A0000 - command: "readAttribute" - attribute: "ACL" - response: - value: - [ - { - Privilege: 5, - AuthMode: 2, - Subjects: [CommissionerNodeId], - Targets: null, - FabricIndex: CurrentFabricIndexValue, - }, - { - Privilege: 3, - AuthMode: 2, - Subjects: null, - Targets: null, - FabricIndex: CurrentFabricIndexValue, - }, - { - Privilege: 3, - AuthMode: 2, - Subjects: null, - Targets: null, - FabricIndex: CurrentFabricIndexValue, - }, - ] + PICS: ACL.S.A0000 && PICS_SKIP_SAMPLE_APP + verification: | + ./chip-tool accesscontrol read acl 1 0 + + Via the TH (chip-tool), Verify that the AccessControlEntryStruct containing MAXENTRIES elements. + + [1686292633.355733][33659:33661] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 2420291523 + [1686292633.355957][33659:33661] CHIP:TOO: ACL: 4 entries + [1686292633.356089][33659:33661] CHIP:TOO: [1]: { + [1686292633.356177][33659:33661] CHIP:TOO: Privilege: 5 + [1686292633.356262][33659:33661] CHIP:TOO: AuthMode: 2 + [1686292633.356356][33659:33661] CHIP:TOO: Subjects: 1 entries + [1686292633.356450][33659:33661] CHIP:TOO: [1]: 112233 + [1686292633.356510][33659:33661] CHIP:TOO: Targets: null + [1686292633.356599][33659:33661] CHIP:TOO: FabricIndex: 1 + [1686292633.356652][33659:33661] CHIP:TOO: } + [1686292633.356726][33659:33661] CHIP:TOO: [2]: { + [1686292633.356803][33659:33661] CHIP:TOO: Privilege: 3 + [1686292633.356855][33659:33661] CHIP:TOO: AuthMode: 2 + [1686292633.356905][33659:33661] CHIP:TOO: Subjects: null + [1686292633.356977][33659:33661] CHIP:TOO: Targets: null + [1686292633.357024][33659:33661] CHIP:TOO: FabricIndex: 1 + [1686292633.357073][33659:33661] CHIP:TOO: } + [1686292633.357166][33659:33661] CHIP:TOO: [3]: { + [1686292633.357221][33659:33661] CHIP:TOO: Privilege: 3 + [1686292633.357272][33659:33661] CHIP:TOO: AuthMode: 2 + [1686292633.357345][33659:33661] CHIP:TOO: Subjects: null + [1686292633.357395][33659:33661] CHIP:TOO: Targets: null + [1686292633.357446][33659:33661] CHIP:TOO: FabricIndex: 1 + [1686292633.357513][33659:33661] CHIP:TOO: } + [1686292633.357659][33659:33661] CHIP:TOO: [4]: { + [1686292633.357717][33659:33661] CHIP:TOO: Privilege: 3 + [1686292633.357793][33659:33661] CHIP:TOO: AuthMode: 2 + [1686292633.357845][33659:33661] CHIP:TOO: Subjects: null + [1686292633.357895][33659:33661] CHIP:TOO: Targets: null + [1686292633.357963][33659:33661] CHIP:TOO: FabricIndex: 1 + [1686292633.358021][33659:33661] CHIP:TOO: } + cluster: "LogCommands" + command: "UserPrompt" + arguments: + values: + - name: "message" + value: "Enter 'y' after success" + - name: "expectedValue" + value: "y" - label: "Step 29:TH1 writes DUT Endpoint 0 AccessControl cluster ACL @@ -1073,8 +1164,8 @@ tests: FabricIndex: CurrentFabricIndexValue, }, { - Privilege: "6", - AuthMode: 3, + Privilege: 6, + AuthMode: 2, Subjects: null, Targets: null, FabricIndex: CurrentFabricIndexValue, @@ -1100,8 +1191,8 @@ tests: FabricIndex: CurrentFabricIndexValue, }, { - Privilege: "6", - AuthMode: "4", + Privilege: 3, + AuthMode: 4, Subjects: null, Targets: null, FabricIndex: CurrentFabricIndexValue, diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml index 981ebc8c5d30d6..e9a8bfc830c999 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml @@ -33,7 +33,7 @@ config: defaultValue: "hex:17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018" tests: - - label: "Step 1: TH commissions DUT using admin node ID N1" + - label: "Step 1: TH1 commissions DUT using admin node ID N1" cluster: "DelayCommands" command: "WaitForCommissionee" arguments: @@ -50,7 +50,7 @@ tests: saveAs: CommissionerNodeId - label: - "Step 2: TH reads DUT Endpoint 0 OperationalCredentials cluster + "Step 2: TH1 reads DUT Endpoint 0 OperationalCredentials cluster CurrentFabricIndex attribute" command: "readAttribute" cluster: "Operational Credentials" @@ -60,7 +60,7 @@ tests: #Issue: https://github.com/project-chip/connectedhomeip/issues/24081 - label: - "Step 3: TH reads DUT Endpoint 0 AccessControl cluster + "Step 3: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlExtensionChanged event" verification: | ./chip-tool accesscontrol read-event access-control-extension-changed 1 0 @@ -87,7 +87,7 @@ tests: value: "y" - label: - "Step 4: TH writes DUT Endpoint 0 AccessControl cluster Extension + "Step 4: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element struct Data field: D_OK_EMPTY" PICS: ACL.S.A0001 @@ -97,7 +97,7 @@ tests: value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndexValue }] - label: - "Step 5: TH reads DUT Endpoint 0 AccessControl cluster + "Step 5: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlExtensionChanged event" PICS: ACL.S.E01 command: "readEvent" @@ -118,7 +118,7 @@ tests: } - label: - "Step 6: TH writes DUT Endpoint 0 AccessControl cluster Extension + "Step 6: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element struct Data field: D_OK_SINGLE" PICS: ACL.S.A0001 @@ -128,7 +128,7 @@ tests: value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndexValue }] - label: - "Step 7: TH reads DUT Endpoint 0 AccessControl cluster + "Step 7: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlExtensionChanged event" PICS: ACL.S.E01 command: "readEvent" @@ -163,7 +163,7 @@ tests: } - label: - "Step 8: TH writes DUT Endpoint 0 AccessControl cluster Extension + "Step 8: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element struct Data field: D_BAD_LENGTH" PICS: ACL.S.A0001 @@ -175,7 +175,7 @@ tests: error: CONSTRAINT_ERROR - label: - "Step 9: TH reads DUT Endpoint 0 AccessControl cluster + "Step 9: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlExtensionChanged event" PICS: ACL.S.E01 command: "readEvent" @@ -196,7 +196,7 @@ tests: } - label: - "Step 10: TH writes DUT Endpoint 0 AccessControl cluster Extension + "Step 10: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements struct Data field: D_OK_EMPTY struct Data field: D_OK_SINGLE" PICS: ACL.S.A0001 @@ -212,7 +212,7 @@ tests: error: CONSTRAINT_ERROR - label: - "Step 11: TH reads DUT Endpoint 0 AccessControl cluster + "Step 11: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlExtensionChanged event" PICS: ACL.S.E01 command: "readEvent" @@ -233,7 +233,7 @@ tests: } - label: - "Step 12: TH writes DUT Endpoint 0 AccessControl cluster Extension + "Step 12: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is an empty list" PICS: ACL.S.A0001 command: "writeAttribute" @@ -242,7 +242,7 @@ tests: value: [] - label: - "Step 13: TH reads DUT Endpoint 0 AccessControl cluster + "Step 13: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlExtensionChanged event" PICS: ACL.S.E01 command: "readEvent" diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml index 946c1e0fdeda1b..d5cc1c31b30101 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml @@ -23,7 +23,7 @@ config: endpoint: 0 tests: - - label: "Step 1: TH commissions DUT using admin node ID N1" + - label: "Step 1: TH1 commissions DUT using admin node ID N1" cluster: "DelayCommands" command: "WaitForCommissionee" arguments: @@ -40,7 +40,7 @@ tests: saveAs: CommissionerNodeId - label: - "Step 2: TH reads DUT Endpoint 0 OperationalCredentials cluster + "Step 2: TH1 reads DUT Endpoint 0 OperationalCredentials cluster CurrentFabricIndex attribute" command: "readAttribute" cluster: "Operational Credentials" @@ -49,7 +49,7 @@ tests: saveAs: CurrentFabricIndexValue - label: - "Step 3: TH reads DUT Endpoint 0 AccessControl cluster + "Step 3: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlEntryChanged event" PICS: ACL.S.E00 command: "readEvent" @@ -73,10 +73,10 @@ tests: } - label: - "Step 4: TH writes DUT Endpoint 0 AccessControl cluster ACL attribute, - value is list of AccessControlEntryStruct containing 2 elements - 1.struct Privilege field: Administer (5) AuthMode field: CASE (2) - Subjects field: [N1] Targets field: null 2struct Privilege field: + "Step 4: TH1 writes DUT Endpoint 0 AccessControl cluster ACL + attribute, value is list of AccessControlEntryStruct containing 2 + elements 1.struct Privilege field: Administer (5) AuthMode field: CASE + (2) Subjects field: [N1] Targets field: null 2struct Privilege field: Operate (3) AuthMode field: Group (3) Subjects field: null Targets field: null" PICS: ACL.S.E00 @@ -102,7 +102,7 @@ tests: ] - label: - "Step 5: TH reads DUT Endpoint 0 AccessControl cluster + "Step 5: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlEntryChanged event" PICS: ACL.S.E00 command: "readEvent" @@ -159,13 +159,13 @@ tests: } - label: - "Step 6: TH writes DUT Endpoint 0 AccessControl cluster ACL attribute, - value is list of AccessControlEntryStruct containing 2 elements. The - first item is valid, the second item is invalid due to group ID 0 - being used, which is illegal. 1.struct Privilege field: Administer (5) - AuthMode field: CASE (2) Subjects field: [N1] Targets field: null - 2.struct Privilege field: Operate (3) AuthMode field: Group (3) - Subjects field: [0] Targets field: null" + "Step 6: TH1 writes DUT Endpoint 0 AccessControl cluster ACL + attribute, value is list of AccessControlEntryStruct containing 2 + elements. The first item is valid, the second item is invalid due to + group ID 0 being used, which is illegal. 1.struct Privilege field: + Administer (5) AuthMode field: CASE (2) Subjects field: [N1] Targets + field: null 2.struct Privilege field: Operate (3) AuthMode field: + Group (3) Subjects field: [0] Targets field: null" PICS: ACL.S.E00 command: "writeAttribute" attribute: "ACL" @@ -191,7 +191,7 @@ tests: error: CONSTRAINT_ERROR - label: - "Step 7: TH reads DUT Endpoint 0 AccessControl cluster + "Step 7: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlEntryChanged event" PICS: ACL.S.E00 command: "readEvent" diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml index 195e2fbf5c5d51..949d2f3831e884 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml @@ -45,7 +45,7 @@ config: defaultValue: "hex:17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018" tests: - - label: "Step 1:Wait for the commissioned device to be retrieved" + - label: "Step 1: TH1 commissions DUT using admin node ID N1" cluster: "DelayCommands" command: "WaitForCommissionee" arguments: @@ -62,7 +62,7 @@ tests: saveAs: TH1CommissionerNodeId - label: - "Step 2:TH1 reads OperationalCredentials cluster CurrentFabricIndex + "Step 2: TH1 reads OperationalCredentials cluster CurrentFabricIndex attribute" command: "readAttribute" cluster: "Operational Credentials" @@ -70,7 +70,7 @@ tests: response: saveAs: TH1FabricIndex - - label: "Step 3:TH1 puts DUT into commissioning mode" + - label: "Step 3a: TH1 puts DUT into commissioning mode" cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 @@ -128,7 +128,7 @@ tests: - name: "ms" value: waitAfterCommissioning - - label: "Step 4:TH2 starts a commissioning process with DUT" + - label: "Step 3b:TH2 starts a commissioning process with DUT" identity: "beta" PICS: PICS_SDK_CI_ONLY cluster: "CommissionerCommands" @@ -161,7 +161,7 @@ tests: saveAs: TH2CommissionerNodeId - label: - "Step 5:TH2 reads OperationalCredentials cluster CurrentFabricIndex + "Step 4: TH2 reads OperationalCredentials cluster CurrentFabricIndex attribute" identity: "beta" PICS: PICS_SDK_CI_ONLY @@ -172,7 +172,7 @@ tests: saveAs: TH2FabricIndex - label: - "Step 5:TH2 reads OperationalCredentials cluster CurrentFabricIndex + "Step 4: TH2 reads OperationalCredentials cluster CurrentFabricIndex attribute" verification: | ./chip-tool operationalcredentials read current-fabric-index 2 0 --commissioner-name beta --commissioner-nodeid 223344 @@ -191,7 +191,7 @@ tests: value: "y" - label: - "Step 6:TH1 writes DUT Endpoint 0 AccessControl cluster Extension + "Step 5: TH1 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element" PICS: ACL.S.A0001 @@ -201,7 +201,7 @@ tests: value: [{ Data: D_OK_EMPTY, FabricIndex: TH1FabricIndex }] - label: - "Step 7:TH2 writes DUT Endpoint 0 AccessControl cluster Extension + "Step 6: TH2 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element" PICS: ACL.S.A0001 && PICS_SDK_CI_ONLY @@ -213,7 +213,7 @@ tests: #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768 - label: - "Step 7:TH2 writes DUT Endpoint 0 AccessControl cluster Extension + "Step 6: TH2 writes DUT Endpoint 0 AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element" verification: | @@ -272,14 +272,14 @@ tests: - name: "expectedValue" value: "y" - - label: "Step 8:TH1 reads AccessControl cluster Extension attribute" + - label: "Step 7: TH1 reads AccessControl cluster Extension attribute" PICS: ACL.S.A0001 command: "readAttribute" attribute: "Extension" response: value: [{ Data: D_OK_EMPTY, FabricIndex: TH1FabricIndex }] - - label: "Step 9:TH2 reads AccessControl cluster Extension attribute" + - label: "Step 8: TH2 reads AccessControl cluster Extension attribute" PICS: ACL.S.A0001 && PICS_SDK_CI_ONLY identity: "beta" command: "readAttribute" @@ -288,7 +288,7 @@ tests: value: [{ Data: D_OK_SINGLE, FabricIndex: TH2FabricIndex }] #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768 - - label: "Step 9:TH2 reads AccessControl cluster Extension attribute" + - label: "Step 8: TH2 reads AccessControl cluster Extension attribute" verification: | ./chip-tool accesscontrol read extension 2 0 --commissioner-name beta --commissioner-nodeid 223344 @@ -310,7 +310,7 @@ tests: value: "y" - label: - "Step 10:TH1 reads DUT Endpoint 0 AccessControl cluster + "Step 9: TH1 reads DUT Endpoint 0 AccessControl cluster AccessControlExtensionChanged event" PICS: ACL.S.E01 command: "readEvent" @@ -327,7 +327,7 @@ tests: } - label: - "Step 11:TH2 reads DUT Endpoint 0 AccessControl cluster + "Step 10: TH2 reads DUT Endpoint 0 AccessControl cluster AccessControlExtensionChanged event" PICS: ACL.S.E01 && PICS_SDK_CI_ONLY identity: "beta" @@ -346,7 +346,7 @@ tests: #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768 - label: - "Step 11:TH2 reads DUT Endpoint 0 AccessControl cluster + "Step 10: TH2 reads DUT Endpoint 0 AccessControl cluster AccessControlExtensionChanged event" verification: | ./chip-tool accesscontrol read-event access-control-extension-changed 2 0 --commissioner-name beta --commissioner-nodeid 223344 diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml index bc14534503a9c1..905d7f1b03f3ad 100644 --- a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml @@ -28,5 +28,5 @@ tests: # command: "WaitForCommissioning" - label: "DUT sends ResetCounts command to TH" - PICS: DGTHREAD.C.C00.Tx + PICS: DGWIFI.S.C00.Tx wait: "ResetCounts" diff --git a/src/app/tests/suites/certification/Test_TC_DT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DT_1_1.yaml deleted file mode 100755 index a3b051b576e571..00000000000000 --- a/src/app/tests/suites/certification/Test_TC_DT_1_1.yaml +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright (c) 2023 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default - -name: 57.1.1. [TC-DT-1.1] Base Device Type [DUT as Server] - -PICS: - - MCORE.DT.S - -config: - nodeId: 0x12344321 - cluster: "Basic Information" - endpoint: 0 - -tests: - - label: - "Step 1: TH performs a wildcard read of all attributes and endpoints" - verification: | - TH(chip-tool) sends the wildcard read command to read all attributes and endpoints from DUT(Reference app/all-clusters-app) - ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF - disabled: true - - - label: "Step 2: Verify that each endpoint includes a Descriptor cluster" - verification: | - On TH(chip-tool), Verify that the ReportDataMessage with each endpoint(endpoint 0, endpoint 1 and endpoint 2) includes a Descriptor cluster( Cluster: 0x0000_001D) - below is the sample log provided for the raspi platform: - - [1690185276.189270][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 1390630643 - [1690185276.189273][40055:40057] CHIP:TOO: ClientList: 1 entries - [1690185276.189275][40055:40057] CHIP:TOO: [1]: 41 - [1690185276.189286][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1390630643 - [1690185276.189290][40055:40057] CHIP:TOO: PartsList: 2 entries - [1690185276.189293][40055:40057] CHIP:TOO: [1]: 1 - [1690185276.189295][40055:40057] CHIP:TOO: [2]: 2 - [1690185276.189298][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFC DataVersion: 1390630643 - [1690185276.189300][40055:40057] CHIP:TOO: FeatureMap: 0 - [1690185276.189309][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFD DataVersion: 1390630643 - [1690185276.189311][40055:40057] CHIP:TOO: ClusterRevision: 1 - [1690185276.189326][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFF8 DataVersion: 1390630643 - [1690185276.189329][40055:40057] CHIP:TOO: GeneratedCommandList: 0 entries - [1690185276.189339][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFF9 DataVersion: 1390630643 - [1690185276.189341][40055:40057] CHIP:TOO: AcceptedCommandList: 0 entries - [1690185276.189353][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFA DataVersion: 1390630643 - [1690185276.189356][40055:40057] CHIP:TOO: EventList: 0 entries - [1690185276.189374][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFB DataVersion: 1390630643 - [1690185276.189378][40055:40057] CHIP:TOO: AttributeList: 10 entries - [1690185276.189380][40055:40057] CHIP:TOO: [1]: 0 - [1690185276.189382][40055:40057] CHIP:TOO: [2]: 1 - [1690185276.189384][40055:40057] CHIP:TOO: [3]: 2 - [1690185276.189386][40055:40057] CHIP:TOO: [4]: 3 - [1690185276.189388][40055:40057] CHIP:TOO: [5]: 65528 - [1690185276.189390][40055:40057] CHIP:TOO: [6]: 65529 - [1690185276.189392][40055:40057] CHIP:TOO: [7]: 65530 - [1690185276.189394][40055:40057] CHIP:TOO: [8]: 65531 - [1690185276.189396][40055:40057] CHIP:TOO: [9]: 65532 - [1690185276.189398][40055:40057] CHIP:TOO: [10]: 65533 - [1690185276.189408][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_0000 DataVersion: 3752520678 - [1690185276.189411][40055:40057] CHIP:TOO: Binding: 0 entries - [1690185276.189414][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_FFFC DataVersion: 3752520678 - - - - [1690185276.266589][40055:40057] CHIP:TOO: [68]: 4294048773 - [1690185276.266629][40055:40057] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 2743502132 - [1690185276.266634][40055:40057] CHIP:TOO: ClientList: 1 entries - [1690185276.266636][40055:40057] CHIP:TOO: [1]: 6 - [1690185276.266646][40055:40057] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2743502132 - [1690185276.266652][40055:40057] CHIP:TOO: PartsList: 0 entries - [1690185276.266656][40055:40057] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFFC DataVersion: 2743502132 - [1690185276.266660][40055:40057] CHIP:TOO: FeatureMap: 0 - [1690185276.266668][40055:40057] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFFD DataVersion: 2743502132 - [1690185276.266670][40055:40057] CHIP:TOO: ClusterRevision: 1 - [1690185276.266686][40055:40057] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFF8 DataVersion: 2743502132 - [1690185276.266689][40055:40057] CHIP:TOO: GeneratedCommandList: 0 entries - [1690185276.266699][40055:40057] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFF9 DataVersion: 2743502132 - [1690185276.266702][40055:40057] CHIP:TOO: AcceptedCommandList: 0 entries - [1690185276.266714][40055:40057] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFFA DataVersion: 2743502132 - [1690185276.266717][40055:40057] CHIP:TOO: EventList: 0 entries - [1690185276.266737][40055:40057] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFFB DataVersion: 2743502132 - [1690185276.266742][40055:40057] CHIP:TOO: AttributeList: 10 entries - [1690185276.266744][40055:40057] CHIP:TOO: [1]: 0 - [1690185276.266746][40055:40057] CHIP:TOO: [2]: 1 - [1690185276.266748][40055:40057] CHIP:TOO: [3]: 2 - [1690185276.266750][40055:40057] CHIP:TOO: [4]: 3 - [1690185276.266752][40055:40057] CHIP:TOO: [5]: 65528 - [1690185276.266755][40055:40057] CHIP:TOO: [6]: 65529 - [1690185276.266757][40055:40057] CHIP:TOO: [7]: 65530 - [1690185276.266759][40055:40057] CHIP:TOO: [8]: 65531 - [1690185276.266761][40055:40057] CHIP:TOO: [9]: 65532 - [1690185276.266762][40055:40057] CHIP:TOO: [10]: 65533 - [1690185276.266774][40055:40057] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001E Attribute 0x0000_0000 DataVersion: 523636689 - [1690185276.266779][40055:40057] CHIP:TOO: Binding: 0 entries - - - [1690185276.399194][40055:40057] CHIP:TOO: Revision: 1 - [1690185276.399196][40055:40057] CHIP:TOO: } - [1690185276.399212][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 516620155 - [1690185276.399216][40055:40057] CHIP:TOO: ServerList: 5 entries - [1690185276.399218][40055:40057] CHIP:TOO: [1]: 4 - [1690185276.399220][40055:40057] CHIP:TOO: [2]: 6 - [1690185276.399222][40055:40057] CHIP:TOO: [3]: 29 - [1690185276.399223][40055:40057] CHIP:TOO: [4]: 47 - [1690185276.399225][40055:40057] CHIP:TOO: [5]: 1030 - [1690185276.399235][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 516620155 - [1690185276.399238][40055:40057] CHIP:TOO: ClientList: 0 entries - [1690185276.399247][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 516620155 - [1690185276.399251][40055:40057] CHIP:TOO: PartsList: 0 entries - [1690185276.399254][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_FFFC DataVersion: 516620155 - [1690185276.399256][40055:40057] CHIP:TOO: FeatureMap: 0 - [1690185276.399265][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_FFFD DataVersion: 516620155 - [1690185276.399267][40055:40057] CHIP:TOO: ClusterRevision: 1 - [1690185276.399282][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_FFF8 DataVersion: 516620155 - [1690185276.399285][40055:40057] CHIP:TOO: GeneratedCommandList: 0 entries - [1690185276.399294][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_FFF9 DataVersion: 516620155 - [1690185276.399297][40055:40057] CHIP:TOO: AcceptedCommandList: 0 entries - [1690185276.399309][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_FFFA DataVersion: 516620155 - [1690185276.399311][40055:40057] CHIP:TOO: EventList: 0 entries - [1690185276.399329][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_FFFB DataVersion: 516620155 - [1690185276.399334][40055:40057] CHIP:TOO: AttributeList: 10 entries - [1690185276.399336][40055:40057] CHIP:TOO: [1]: 0 - [1690185276.399338][40055:40057] CHIP:TOO: [2]: 1 - [1690185276.399340][40055:40057] CHIP:TOO: [3]: 2 - [1690185276.399341][40055:40057] CHIP:TOO: [4]: 3 - [1690185276.399343][40055:40057] CHIP:TOO: [5]: 65528 - [1690185276.399345][40055:40057] CHIP:TOO: [6]: 65529 - [1690185276.399347][40055:40057] CHIP:TOO: [7]: 65530 - [1690185276.399349][40055:40057] CHIP:TOO: [8]: 65531 - [1690185276.399350][40055:40057] CHIP:TOO: [9]: 65532 - [1690185276.399352][40055:40057] CHIP:TOO: [10]: 65533 - [1690185276.399354][40055:40057] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_002F Attribute 0x0000_0000 DataVersion: 850311415 - disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml index 8e5b360a93592c..bad927c19b6ba6 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml @@ -50,7 +50,7 @@ tests: saveAs: MaxMeasuredVariable constraints: type: int16u - minValue: MinMeasuredVariable + minValue: MinMeasuredVariable + 1 maxValue: 65534 - label: "Step 4: Read the mandatory attribute: MeasuredValue" diff --git a/src/app/tests/suites/certification/Test_TC_GRPKEY_2_1.yaml b/src/app/tests/suites/certification/Test_TC_GRPKEY_2_1.yaml index 3cef4c28dd6e4b..f6d17635840779 100644 --- a/src/app/tests/suites/certification/Test_TC_GRPKEY_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_GRPKEY_2_1.yaml @@ -170,7 +170,7 @@ tests: saveAs: MaxGroupKeysPerFabricValue constraints: type: int16u - minValue: 0 + minValue: 1 maxValue: 65535 - label: diff --git a/src/app/tests/suites/certification/Test_TC_IDM_11_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_11_1.yaml deleted file mode 100644 index 1598e76f4d0d2d..00000000000000 --- a/src/app/tests/suites/certification/Test_TC_IDM_11_1.yaml +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright (c) 2023 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default - -name: - 32.6.9. [TC-IDM-11.1] Data types - attribute strings [DUT as Server] - data - model - -PICS: - - MCORE.IDM.S - -config: - nodeId: 0x12344321 - cluster: "Basic Information" - endpoint: 0 - -tests: - - label: - "Step 1: TH performs a wildcard read of all attributes and endpoints" - verification: | - TH(chip-tool) sends the wildcard read command to read all attributes and endpoints from DUT(Reference app/all-clusters-app) - ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF - - Please store the log for use in the next step validation. - disabled: true - - - label: - "Step 2: For every returned attribute, if the attribute type is string - and the returned value is not Null or empty, ensure the returned value - is a valid UTF-8-encoded string. It is not permitted to have partially - encoded codepoints between the last legally-encoded codepoint and the - end of the string." - verification: | - From the privious step log, Verify UTF-8 Encoding for Each Returned String Attribute. - For each returned attribute with the attribute type "string," follow the verification process: - 1. Check if the returned value is not Null or empty. - 2. If the returned value is not Null or empty, validate that it is a valid UTF-8-encoded string. - 3. Ensure that there are no partially encoded codepoints between the last legally-encoded codepoint and the end of the string. - - The following log is an example of the output obtained for Basic Inforamtion Cluster. Pls repeat this for every cluster on every endpoint. The log represents the attributes of clusters found on different endpoints. - - Verification Instructions: - Please use the provided example log as a guide to verify the attributes for other clusters and endpoints in a similar manner. - - Example verification log for 'Basic information Cluster' (0x0000_0028) on Endpoint 0 : - [1690271126.212327][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0000 DataVersion: 338522070 - [1690271126.212330][10587:10589] CHIP:TOO: DataModelRevision: 1 - [1690271126.212344][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0001 DataVersion: 338522070 - [1690271126.212348][10587:10589] CHIP:TOO: VendorName: TEST_VENDOR - [1690271126.212358][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0002 DataVersion: 338522070 - [1690271126.212361][10587:10589] CHIP:TOO: VendorID: 65521 - [1690271126.212369][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0003 DataVersion: 338522070 - [1690271126.212371][10587:10589] CHIP:TOO: ProductName: TEST_PRODUCT - [1690271126.212379][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0004 DataVersion: 338522070 - [1690271126.212382][10587:10589] CHIP:TOO: ProductID: 32769 - [1690271126.212390][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 338522070 - [1690271126.212392][10587:10589] CHIP:TOO: NodeLabel: - [1690271126.212401][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 338522070 - [1690271126.212403][10587:10589] CHIP:TOO: Location: XX - [1690271126.212411][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0007 DataVersion: 338522070 - [1690271126.212413][10587:10589] CHIP:TOO: HardwareVersion: 0 - [1690271126.212422][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0008 DataVersion: 338522070 - [1690271126.212424][10587:10589] CHIP:TOO: HardwareVersionString: TEST_VERSION - [1690271126.212432][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0009 DataVersion: 338522070 - [1690271126.212434][10587:10589] CHIP:TOO: SoftwareVersion: 1 - [1690271126.212443][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_000A DataVersion: 338522070 - [1690271126.212445][10587:10589] CHIP:TOO: SoftwareVersionString: 1.0 - [1690271126.212453][10587:10589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_000B DataVersion: 338522070 - [1690271126.212455][10587:10589] CHIP:TOO: ManufacturingDate: 20200101 - disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml index 6075e7897f4d27..316518847aee6a 100644 --- a/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default name: 105.3.1. [TC-LUNIT-3.1] Read and Write Unit Localization Cluster Attributes @@ -43,7 +42,7 @@ tests: type: enum8 - label: "Step 2: TH writes 0 (Fahrenheit) to TemperatureUnit attribute" - PICS: LUNIT.S.A0000 && LUNIT.TempUnit.Fahrenheit + PICS: LUNIT.S.A0000 && LUNIT.S.M.Fahrenheit cluster: "Unit Localization" command: "writeAttribute" attribute: "TemperatureUnit" @@ -51,14 +50,14 @@ tests: value: 0 - label: "Step 3: TH reads TemperatureUnit attribute" - PICS: LUNIT.S.A0000 && LUNIT.TempUnit.Fahrenheit + PICS: LUNIT.S.A0000 && LUNIT.S.M.Fahrenheit command: "readAttribute" attribute: "TemperatureUnit" response: value: 0 - label: "Step 4: TH writes 1 (Celsius) to TemperatureUnit attribute" - PICS: LUNIT.S.A0000 && LUNIT.TempUnit.Celsius + PICS: LUNIT.S.A0000 && LUNIT.S.M.Celsius cluster: "Unit Localization" command: "writeAttribute" attribute: "TemperatureUnit" @@ -66,14 +65,14 @@ tests: value: 1 - label: "Step 5: TH reads TemperatureUnit attribute" - PICS: LUNIT.S.A0000 && LUNIT.TempUnit.Celsius + PICS: LUNIT.S.A0000 && LUNIT.S.M.Celsius command: "readAttribute" attribute: "TemperatureUnit" response: value: 1 - label: "Step 6: TH writes 2 (Kelvin) to TemperatureUnit attribute" - PICS: LUNIT.S.A0000 && LUNIT.TempUnit.Kelvin + PICS: LUNIT.S.A0000 && LUNIT.S.M.Kelvin cluster: "Unit Localization" command: "writeAttribute" attribute: "TemperatureUnit" @@ -81,7 +80,7 @@ tests: value: 2 - label: "Step 7: TH reads TemperatureUnit attribute" - PICS: LUNIT.S.A0000 && LUNIT.TempUnit.Kelvin + PICS: LUNIT.S.A0000 && LUNIT.S.M.Kelvin command: "readAttribute" attribute: "TemperatureUnit" response: diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_3_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_3_Simulated.yaml deleted file mode 100644 index dfb6ad9787fcf5..00000000000000 --- a/src/app/tests/suites/certification/Test_TC_LVL_2_3_Simulated.yaml +++ /dev/null @@ -1,584 +0,0 @@ -# Copyright (c) 2021 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: 21.2.3. [TC-LVL-2.3] Attributes with client as DUT - -PICS: - - LVL.C - - LVL.C.AM-READ - - LVL.C.AO-READ - - LVL.C.AM-WRITE - - LVL.C.AO-WRITE - -config: - nodeId: 0x12344321 - cluster: "Level Control" - endpoint: 1 - -tests: - #- label: "Wait for the device to be commissioned" - # cluster: "DelayCommands" - # command: "WaitForCommissioning" - - - label: "Read mandatory attribute CurrentLevel" - wait: "readAttribute" - attribute: "CurrentLevel" - - - label: "Read mandatory attribute OnLevel" - wait: "readAttribute" - attribute: "OnLevel" - - - label: "Read mandatory attribute Options" - wait: "readAttribute" - attribute: "Options" - - - label: "Read optional attribute RemainingTime" - wait: "readAttribute" - attribute: "RemainingTime" - - - label: "Read optional attribute StartUpCurrentLevel" - wait: "readAttribute" - attribute: "StartUpCurrentLevel" - - - label: "Read optional attribute CurrentFrequency" - wait: "readAttribute" - attribute: "CurrentFrequency" - - - label: "Read optional attribute MinFrequency" - wait: "readAttribute" - attribute: "MinFrequency" - - - label: "Read optional attribute MaxFrequency" - wait: "readAttribute" - attribute: "MaxFrequency" - - - label: "Read optional attribute MinLevel" - wait: "readAttribute" - attribute: "MinLevel" - - - label: "Read optional attribute MaxLevel" - wait: "readAttribute" - attribute: "MaxLevel" - - - label: "Read optional attribute OnOffTransitionTime" - wait: "readAttribute" - attribute: "OnOffTransitionTime" - - - label: "Read optional attribute OnTransitionTime" - wait: "readAttribute" - attribute: "OnTransitionTime" - - - label: "Read optional attribute OffTransitionTime" - wait: "readAttribute" - attribute: "OffTransitionTime" - - - label: "Read optional attribute DefaultMoveRate" - wait: "readAttribute" - attribute: "DefaultMoveRate" - - - label: "Write mandatory attribute OnLevel" - wait: "writeAttribute" - attribute: "OnLevel" - arguments: - value: - - - label: "Write mandatory attribute Options" - wait: "writeAttribute" - attribute: "Options" - arguments: - value: - - - label: "Write optional attribute OnOffTransitionTime" - wait: "writeAttribute" - attribute: "OnOffTransitionTime" - arguments: - value: - - - label: "Write optional attribute OnTransitionTime" - wait: "writeAttribute" - attribute: "OnTransitionTime" - arguments: - value: - - - label: "Write optional attribute OffTransitionTime" - wait: "writeAttribute" - attribute: "OffTransitionTime" - arguments: - value: - - - label: "Write optional attribute DefaultMoveRate" - wait: "writeAttribute" - attribute: "DefaultMoveRate" - arguments: - value: - - - label: "Write optional attribute StartUpCurrentLevel" - wait: "writeAttribute" - attribute: "StartUpCurrentLevel" - arguments: - value: - - - label: - "Configure TH such that it implements mandatory and none of the - optional attributes of the server-side of the cluster, and that it - also reflects this in global attributes such as FeatureMap and - AttributeList.Commission DUT to TH again" - verification: | - Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client) - - ./chip-tool levelcontrol read current-level 1 1 - Verify DUT receives current-level attribute response on the TH(all-clusters-minimal-app) Log: - [1657913862.815749][3126:3126] CHIP:IM: Received Read request - [1657913862.815884][3126:3126] CHIP:DMG: ReadRequestMessage = - [1657913862.815935][3126:3126] CHIP:DMG: { - [1657913862.815975][3126:3126] CHIP:DMG: AttributePathIBs = - [1657913862.816023][3126:3126] CHIP:DMG: [ - [1657913862.816107][3126:3126] CHIP:DMG: AttributePathIB = - [1657913862.816161][3126:3126] CHIP:DMG: { - [1657913862.816212][3126:3126] CHIP:DMG: Endpoint = 0x1, - [1657913862.816268][3126:3126] CHIP:DMG: Cluster = 0x8, - [1657913862.816325][3126:3126] CHIP:DMG: Attribute = 0x0000_0000, - [1657913862.816377][3126:3126] CHIP:DMG: } - [1657913862.816431][3126:3126] CHIP:DMG: - [1657913862.816477][3126:3126] CHIP:DMG: ], - [1657913862.816527][3126:3126] CHIP:DMG: - [1657913862.816573][3126:3126] CHIP:DMG: isFabricFiltered = true, - [1657913862.816619][3126:3126] CHIP:DMG: InteractionModelRevision = 1 - [1657913862.816662][3126:3126] CHIP:DMG: }, - - - ./chip-tool levelcontrol read on-level 1 1 - Verify DUT receives on-level attribute response on the TH(all-clusters-minimal-app) Log: - [1657913877.850398][3126:3126] CHIP:IM: Received Read request - [1657913877.850525][3126:3126] CHIP:DMG: ReadRequestMessage = - [1657913877.850574][3126:3126] CHIP:DMG: { - [1657913877.850614][3126:3126] CHIP:DMG: AttributePathIBs = - [1657913877.850725][3126:3126] CHIP:DMG: [ - [1657913877.850771][3126:3126] CHIP:DMG: AttributePathIB = - [1657913877.850821][3126:3126] CHIP:DMG: { - [1657913877.850872][3126:3126] CHIP:DMG: Endpoint = 0x1, - [1657913877.850932][3126:3126] CHIP:DMG: Cluster = 0x8, - [1657913877.850989][3126:3126] CHIP:DMG: Attribute = 0x0000_0011, - [1657913877.851048][3126:3126] CHIP:DMG: } - [1657913877.851103][3126:3126] CHIP:DMG: - [1657913877.851153][3126:3126] CHIP:DMG: ], - [1657913877.851203][3126:3126] CHIP:DMG: - [1657913877.851251][3126:3126] CHIP:DMG: isFabricFiltered = true, - [1657913877.851297][3126:3126] CHIP:DMG: InteractionModelRevision = 1 - [1657913877.851343][3126:3126] CHIP:DMG: }, - [1657913877.851471][3126:3126] CHIP:DMG: IM - - - ./chip-tool levelcontrol read options 1 1 - Verify DUT receives options attribute response on the TH(all-clusters-minimal-app) Log: - [1657913895.195563][3126:3126] CHIP:IM: Received Read request - [1657913895.195705][3126:3126] CHIP:DMG: ReadRequestMessage = - [1657913895.195732][3126:3126] CHIP:DMG: { - [1657913895.195754][3126:3126] CHIP:DMG: AttributePathIBs = - [1657913895.195780][3126:3126] CHIP:DMG: [ - [1657913895.195803][3126:3126] CHIP:DMG: AttributePathIB = - [1657913895.195901][3126:3126] CHIP:DMG: { - [1657913895.195932][3126:3126] CHIP:DMG: Endpoint = 0x1, - [1657913895.195963][3126:3126] CHIP:DMG: Cluster = 0x8, - [1657913895.195993][3126:3126] CHIP:DMG: Attribute = 0x0000_000F, - [1657913895.196022][3126:3126] CHIP:DMG: } - [1657913895.196073][3126:3126] CHIP:DMG: - [1657913895.196101][3126:3126] CHIP:DMG: ], - [1657913895.196161][3126:3126] CHIP:DMG: - [1657913895.196189][3126:3126] CHIP:DMG: isFabricFiltered = true, - [1657913895.196214][3126:3126] CHIP:DMG: InteractionModelRevision = 1 - [1657913895.196236][3126:3126] CHIP:DMG: }, - - - ./chip-tool levelcontrol read attribute-list 1 1 - Verify DUT receives attribute-list attribute response on the TH(all-clusters-minimal-app) Log: - [1657913906.648918][3126:3126] CHIP:IM: Received Read request - [1657913906.649061][3126:3126] CHIP:DMG: ReadRequestMessage = - [1657913906.649115][3126:3126] CHIP:DMG: { - [1657913906.649162][3126:3126] CHIP:DMG: AttributePathIBs = - [1657913906.649225][3126:3126] CHIP:DMG: [ - [1657913906.649273][3126:3126] CHIP:DMG: AttributePathIB = - [1657913906.649330][3126:3126] CHIP:DMG: { - [1657913906.649389][3126:3126] CHIP:DMG: Endpoint = 0x1, - [1657913906.649462][3126:3126] CHIP:DMG: Cluster = 0x8, - [1657913906.649529][3126:3126] CHIP:DMG: Attribute = 0x0000_FFFB, - [1657913906.649569][3126:3126] CHIP:DMG: } - [1657913906.649593][3126:3126] CHIP:DMG: - [1657913906.649618][3126:3126] CHIP:DMG: ], - [1657913906.649645][3126:3126] CHIP:DMG: - [1657913906.649731][3126:3126] CHIP:DMG: isFabricFiltered = true, - [1657913906.649757][3126:3126] CHIP:DMG: InteractionModelRevision = 1 - [1657913906.649781][3126:3126] CHIP:DMG: }, - - - ./chip-tool levelcontrol read feature-map 1 1 - Verify DUT receives feature-map attribute response on the TH(all-clusters-minimal-app) Log: - [1663070713.467153][4422:4422] CHIP:IM: Received Read request - [1663070713.467242][4422:4422] CHIP:DMG: ReadRequestMessage = - [1663070713.467275][4422:4422] CHIP:DMG: { - [1663070713.467300][4422:4422] CHIP:DMG: AttributePathIBs = - [1663070713.467329][4422:4422] CHIP:DMG: [ - [1663070713.467355][4422:4422] CHIP:DMG: AttributePathIB = - [1663070713.467390][4422:4422] CHIP:DMG: { - [1663070713.467422][4422:4422] CHIP:DMG: Endpoint = 0x1, - [1663070713.467455][4422:4422] CHIP:DMG: Cluster = 0x8, - [1663070713.467487][4422:4422] CHIP:DMG: Attribute = 0x0000_FFFC, - [1663070713.467517][4422:4422] CHIP:DMG: } - [1663070713.467548][4422:4422] CHIP:DMG: - [1663070713.467576][4422:4422] CHIP:DMG: ], - [1663070713.467606][4422:4422] CHIP:DMG: - [1663070713.467635][4422:4422] CHIP:DMG: isFabricFiltered = true, - [1663070713.467663][4422:4422] CHIP:DMG: InteractionModelRevision = 1 - [1663070713.467689][4422:4422] CHIP:DMG: }, - [1663070713.467767][4422:4422] CHIP:DMG: IM RH moving to [GeneratingReports] - cluster: "LogCommands" - command: "UserPrompt" - PICS: PICS_SKIP_SAMPLE_APP - arguments: - values: - - name: "message" - value: "Enter 'y' after success" - - name: "expectedValue" - value: "y" - - - label: - "DUT reads all supported optional attributes from TH one at a time in - a manufacturer specific order" - verification: | - Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client) - - TH all-clusters-minimal-app does not support optional attributes - - ./chip-tool levelcontrol read remaining-time 1 1 - Verify DUT(chip-tool) receives remaining-time attribute response on the TH(all-clusters-minimal-app) Log: - [1663147148.155292][37702:37702] CHIP:IM: Received Read request - [1663147148.155312][37702:37702] CHIP:DMG: ReadRequestMessage = - [1663147148.155315][37702:37702] CHIP:DMG: { - [1663147148.155317][37702:37702] CHIP:DMG: AttributePathIBs = - [1663147148.155320][37702:37702] CHIP:DMG: [ - [1663147148.155323][37702:37702] CHIP:DMG: AttributePathIB = - [1663147148.155326][37702:37702] CHIP:DMG: { - [1663147148.155328][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147148.155331][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147148.155334][37702:37702] CHIP:DMG: Attribute = 0x0000_0001, - [1663147148.155338][37702:37702] CHIP:DMG: } - [1663147148.155341][37702:37702] CHIP:DMG: - [1663147148.155343][37702:37702] CHIP:DMG: ], - [1663147148.155346][37702:37702] CHIP:DMG: - [1663147148.155349][37702:37702] CHIP:DMG: isFabricFiltered = true, - [1663147148.155351][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147148.155353][37702:37702] CHIP:DMG: }, - [1663147148.155366][37702:37702] CHIP:DMG: IM RH moving to [GeneratingReports] - [1663147148.155376][37702:37702] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0 - - - - ./chip-tool levelcontrol read min-level 1 1 - Verify DUT(chip-tool) receives min-level attribute response on the TH(all-clusters-minimal-app) Log: - [1663147176.255360][37702:37702] CHIP:DMG: ReadRequestMessage = - [1663147176.255364][37702:37702] CHIP:DMG: { - [1663147176.255368][37702:37702] CHIP:DMG: AttributePathIBs = - [1663147176.255373][37702:37702] CHIP:DMG: [ - [1663147176.255376][37702:37702] CHIP:DMG: AttributePathIB = - [1663147176.255381][37702:37702] CHIP:DMG: { - [1663147176.255385][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147176.255389][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147176.255393][37702:37702] CHIP:DMG: Attribute = 0x0000_0002, - [1663147176.255396][37702:37702] CHIP:DMG: } - [1663147176.255401][37702:37702] CHIP:DMG: - [1663147176.255404][37702:37702] CHIP:DMG: ], - [1663147176.255409][37702:37702] CHIP:DMG: - [1663147176.255413][37702:37702] CHIP:DMG: isFabricFiltered = true, - [1663147176.255416][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147176.255419][37702:37702] CHIP:DMG: }, - [1663147176.255436][37702:37702] CHIP:DMG: IM RH moving to [GeneratingReports] - [1663147176.255451][37702:37702] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0 - - - ./chip-tool levelcontrol read max-level 1 1 - Verify DUT(chip-tool) receives max-level attribute response on the TH(all-clusters-minimal-app) Log: - [1663147204.133512][37702:37702] CHIP:IM: Received Read request - [1663147204.133528][37702:37702] CHIP:DMG: ReadRequestMessage = - [1663147204.133531][37702:37702] CHIP:DMG: { - [1663147204.133533][37702:37702] CHIP:DMG: AttributePathIBs = - [1663147204.133536][37702:37702] CHIP:DMG: [ - [1663147204.133538][37702:37702] CHIP:DMG: AttributePathIB = - [1663147204.133541][37702:37702] CHIP:DMG: { - [1663147204.133543][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147204.133546][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147204.133549][37702:37702] CHIP:DMG: Attribute = 0x0000_0003, - [1663147204.133551][37702:37702] CHIP:DMG: } - [1663147204.133553][37702:37702] CHIP:DMG: - [1663147204.133555][37702:37702] CHIP:DMG: ], - [1663147204.133558][37702:37702] CHIP:DMG: - [1663147204.133561][37702:37702] CHIP:DMG: isFabricFiltered = true, - [1663147204.133563][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147204.133565][37702:37702] CHIP:DMG: }, - [1663147204.133577][37702:37702] CHIP:DMG: IM RH moving to [GeneratingReports] - [1663147204.133587][37702:37702] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0 - - ./chip-tool levelcontrol read current-frequency 1 1 - Verify DUT(chip-tool) receives current-frequency attribute response on the TH(all-clusters-minimal-app) Log: - [1663147223.228680][37702:37702] CHIP:IM: Received Read request - [1663147223.228702][37702:37702] CHIP:DMG: ReadRequestMessage = - [1663147223.228706][37702:37702] CHIP:DMG: { - [1663147223.228710][37702:37702] CHIP:DMG: AttributePathIBs = - [1663147223.228714][37702:37702] CHIP:DMG: [ - [1663147223.228717][37702:37702] CHIP:DMG: AttributePathIB = - [1663147223.228722][37702:37702] CHIP:DMG: { - [1663147223.228726][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147223.228730][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147223.228734][37702:37702] CHIP:DMG: Attribute = 0x0000_0004, - [1663147223.228738][37702:37702] CHIP:DMG: } - [1663147223.228742][37702:37702] CHIP:DMG: - [1663147223.228746][37702:37702] CHIP:DMG: ], - [1663147223.228751][37702:37702] CHIP:DMG: - [1663147223.228754][37702:37702] CHIP:DMG: isFabricFiltered = true, - [1663147223.228758][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147223.228761][37702:37702] CHIP:DMG: }, - [1663147223.228780][37702:37702] CHIP:DMG: IM RH moving to [GeneratingReports] - - ./chip-tool levelcontrol read min-frequency 1 1 - Verify DUT(chip-tool) receives min-frequency attribute response on the TH(all-clusters-minimal-app) Log: - [1663147242.442251][37702:37702] CHIP:IM: Received Read request - [1663147242.442277][37702:37702] CHIP:DMG: ReadRequestMessage = - [1663147242.442282][37702:37702] CHIP:DMG: { - [1663147242.442287][37702:37702] CHIP:DMG: AttributePathIBs = - [1663147242.442293][37702:37702] CHIP:DMG: [ - [1663147242.442298][37702:37702] CHIP:DMG: AttributePathIB = - [1663147242.442304][37702:37702] CHIP:DMG: { - [1663147242.442309][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147242.442315][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147242.442320][37702:37702] CHIP:DMG: Attribute = 0x0000_0005, - [1663147242.442324][37702:37702] CHIP:DMG: } - [1663147242.442331][37702:37702] CHIP:DMG: - [1663147242.442336][37702:37702] CHIP:DMG: ], - [1663147242.442342][37702:37702] CHIP:DMG: - [1663147242.442347][37702:37702] CHIP:DMG: isFabricFiltered = true, - [1663147242.442352][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147242.442355][37702:37702] CHIP:DMG: }, - [1663147242.442378][37702:37702] CHIP:DMG: IM RH moving to [GeneratingReports] - - ./chip-tool levelcontrol read max-frequency 1 1 - Verify DUT(chip-tool) receives max-frequency attribute response on the TH(all-clusters-minimal-app) Log: - [1663147259.687422][37702:37702] CHIP:IM: Received Read request - [1663147259.687445][37702:37702] CHIP:DMG: ReadRequestMessage = - [1663147259.687450][37702:37702] CHIP:DMG: { - [1663147259.687454][37702:37702] CHIP:DMG: AttributePathIBs = - [1663147259.687458][37702:37702] CHIP:DMG: [ - [1663147259.687463][37702:37702] CHIP:DMG: AttributePathIB = - [1663147259.687469][37702:37702] CHIP:DMG: { - [1663147259.687474][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147259.687478][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147259.687481][37702:37702] CHIP:DMG: Attribute = 0x0000_0006, - [1663147259.687485][37702:37702] CHIP:DMG: } - [1663147259.687490][37702:37702] CHIP:DMG: - [1663147259.687494][37702:37702] CHIP:DMG: ], - [1663147259.687500][37702:37702] CHIP:DMG: - [1663147259.687504][37702:37702] CHIP:DMG: isFabricFiltered = true, - [1663147259.687509][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147259.687513][37702:37702] CHIP:DMG: }, - [1663147259.687532][37702:37702] CHIP:DMG: IM RH moving to [GeneratingReports] - - ./chip-tool levelcontrol read on-off-transition-time 1 1 - Verify DUT(chip-tool) receives on-off-transition-time attribute response on the TH(all-clusters-minimal-app) Log: - [1663147276.525081][37702:37702] CHIP:IM: Received Read request - [1663147276.525105][37702:37702] CHIP:DMG: ReadRequestMessage = - [1663147276.525110][37702:37702] CHIP:DMG: { - [1663147276.525115][37702:37702] CHIP:DMG: AttributePathIBs = - [1663147276.525120][37702:37702] CHIP:DMG: [ - [1663147276.525124][37702:37702] CHIP:DMG: AttributePathIB = - [1663147276.525129][37702:37702] CHIP:DMG: { - [1663147276.525133][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147276.525138][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147276.525143][37702:37702] CHIP:DMG: Attribute = 0x0000_0010, - [1663147276.525148][37702:37702] CHIP:DMG: } - [1663147276.525155][37702:37702] CHIP:DMG: - [1663147276.525159][37702:37702] CHIP:DMG: ], - [1663147276.525166][37702:37702] CHIP:DMG: - [1663147276.525171][37702:37702] CHIP:DMG: isFabricFiltered = true, - [1663147276.525177][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147276.525181][37702:37702] CHIP:DMG: }, - [1663147276.525202][37702:37702] CHIP:DMG: IM RH moving to [GeneratingReports] - cluster: "LogCommands" - command: "UserPrompt" - PICS: PICS_SKIP_SAMPLE_APP - arguments: - values: - - name: "message" - value: "Enter 'y' after success" - - name: "expectedValue" - value: "y" - - - label: - "DUT writes a suitable value to all supported optional attributes on - the TH one at a time in a manufacturer specific order" - verification: | - Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client) - - TH all-clusters-minimal-app does not support optional attributes - - ./chip-tool levelcontrol write on-off-transition-time 5 1 1 - Verify DUT(chip-tool) receives on-off-transition-time attribute response on the TH(all-clusters-minimal-app) Log: - [1663147558.231731][37702:37702] CHIP:IM: Received Write request - [1663147558.231735][37702:37702] CHIP:DMG: IM WH moving to [Initialized] - [1663147558.231746][37702:37702] CHIP:DMG: WriteRequestMessage = - [1663147558.231749][37702:37702] CHIP:DMG: { - [1663147558.231753][37702:37702] CHIP:DMG: suppressResponse = false, - [1663147558.231757][37702:37702] CHIP:DMG: timedRequest = false, - [1663147558.231760][37702:37702] CHIP:DMG: AttributeDataIBs = - [1663147558.231765][37702:37702] CHIP:DMG: [ - [1663147558.231767][37702:37702] CHIP:DMG: AttributeDataIB = - [1663147558.231771][37702:37702] CHIP:DMG: { - [1663147558.231773][37702:37702] CHIP:DMG: AttributePathIB = - [1663147558.231777][37702:37702] CHIP:DMG: { - [1663147558.231781][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147558.231784][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147558.231789][37702:37702] CHIP:DMG: Attribute = 0x0000_0010, - [1663147558.231792][37702:37702] CHIP:DMG: } - [1663147558.231795][37702:37702] CHIP:DMG: - [1663147558.231798][37702:37702] CHIP:DMG: Data = 5, - [1663147558.231801][37702:37702] CHIP:DMG: }, - [1663147558.231805][37702:37702] CHIP:DMG: - [1663147558.231809][37702:37702] CHIP:DMG: ], - [1663147558.231813][37702:37702] CHIP:DMG: - [1663147558.231816][37702:37702] CHIP:DMG: moreChunkedMessages = false, - [1663147558.231820][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147558.231822][37702:37702] CHIP:DMG: }, - [1663147558.231844][37702:37702] CHIP:DMG: IM WH moving to [AddStatus] - - ./chip-tool levelcontrol write on-transition-time 5 1 1 - Verify DUT(chip-tool) receives on-transition-time attribute response on the TH(all-clusters-minimal-app) Log: - [1663147582.702165][37702:37702] CHIP:IM: Received Write request - [1663147582.702168][37702:37702] CHIP:DMG: IM WH moving to [Initialized] - [1663147582.702179][37702:37702] CHIP:DMG: WriteRequestMessage = - [1663147582.702182][37702:37702] CHIP:DMG: { - [1663147582.702185][37702:37702] CHIP:DMG: suppressResponse = false, - [1663147582.702188][37702:37702] CHIP:DMG: timedRequest = false, - [1663147582.702191][37702:37702] CHIP:DMG: AttributeDataIBs = - [1663147582.702196][37702:37702] CHIP:DMG: [ - [1663147582.702199][37702:37702] CHIP:DMG: AttributeDataIB = - [1663147582.702202][37702:37702] CHIP:DMG: { - [1663147582.702205][37702:37702] CHIP:DMG: AttributePathIB = - [1663147582.702209][37702:37702] CHIP:DMG: { - [1663147582.702212][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147582.702216][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147582.702219][37702:37702] CHIP:DMG: Attribute = 0x0000_0012, - [1663147582.702222][37702:37702] CHIP:DMG: } - [1663147582.702226][37702:37702] CHIP:DMG: - [1663147582.702230][37702:37702] CHIP:DMG: Data = 5, - [1663147582.702233][37702:37702] CHIP:DMG: }, - [1663147582.702236][37702:37702] CHIP:DMG: - [1663147582.702239][37702:37702] CHIP:DMG: ], - [1663147582.702243][37702:37702] CHIP:DMG: - [1663147582.702246][37702:37702] CHIP:DMG: moreChunkedMessages = false, - [1663147582.702248][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147582.702252][37702:37702] CHIP:DMG: }, - [1663147582.702271][37702:37702] CHIP:DMG: IM WH moving to [AddStatus] - - ./chip-tool levelcontrol write off-transition-time 5 1 1 - Verify DUT(chip-tool) receives off-transition-time attribute response on the TH(all-clusters-minimal-app) Log: - [1663147605.317885][37702:37702] CHIP:IM: Received Write request - [1663147605.317891][37702:37702] CHIP:DMG: IM WH moving to [Initialized] - [1663147605.317910][37702:37702] CHIP:DMG: WriteRequestMessage = - [1663147605.317915][37702:37702] CHIP:DMG: { - [1663147605.317920][37702:37702] CHIP:DMG: suppressResponse = false, - [1663147605.317925][37702:37702] CHIP:DMG: timedRequest = false, - [1663147605.317930][37702:37702] CHIP:DMG: AttributeDataIBs = - [1663147605.317936][37702:37702] CHIP:DMG: [ - [1663147605.317941][37702:37702] CHIP:DMG: AttributeDataIB = - [1663147605.317945][37702:37702] CHIP:DMG: { - [1663147605.317950][37702:37702] CHIP:DMG: AttributePathIB = - [1663147605.317956][37702:37702] CHIP:DMG: { - [1663147605.317962][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147605.317968][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147605.317973][37702:37702] CHIP:DMG: Attribute = 0x0000_0013, - [1663147605.317978][37702:37702] CHIP:DMG: } - [1663147605.317985][37702:37702] CHIP:DMG: - [1663147605.317990][37702:37702] CHIP:DMG: Data = 5, - [1663147605.317996][37702:37702] CHIP:DMG: }, - [1663147605.318002][37702:37702] CHIP:DMG: - [1663147605.318007][37702:37702] CHIP:DMG: ], - [1663147605.318014][37702:37702] CHIP:DMG: - [1663147605.318018][37702:37702] CHIP:DMG: moreChunkedMessages = false, - [1663147605.318024][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147605.318028][37702:37702] CHIP:DMG: }, - [1663147605.318058][37702:37702] CHIP:DMG: IM WH moving to [AddStatus] - - ./chip-tool levelcontrol write default-move-rate 5 1 1 - Verify DUT(chip-tool) receives default-move-rate attribute response on the TH(all-clusters-minimal-app) Log: - [1663147644.857538][37702:37702] CHIP:IM: Received Write request - [1663147644.857541][37702:37702] CHIP:DMG: IM WH moving to [Initialized] - [1663147644.857552][37702:37702] CHIP:DMG: WriteRequestMessage = - [1663147644.857555][37702:37702] CHIP:DMG: { - [1663147644.857557][37702:37702] CHIP:DMG: suppressResponse = false, - [1663147644.857560][37702:37702] CHIP:DMG: timedRequest = false, - [1663147644.857562][37702:37702] CHIP:DMG: AttributeDataIBs = - [1663147644.857566][37702:37702] CHIP:DMG: [ - [1663147644.857568][37702:37702] CHIP:DMG: AttributeDataIB = - [1663147644.857571][37702:37702] CHIP:DMG: { - [1663147644.857574][37702:37702] CHIP:DMG: AttributePathIB = - [1663147644.857577][37702:37702] CHIP:DMG: { - [1663147644.857580][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147644.857582][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147644.857585][37702:37702] CHIP:DMG: Attribute = 0x0000_0014, - [1663147644.857587][37702:37702] CHIP:DMG: } - [1663147644.857591][37702:37702] CHIP:DMG: - [1663147644.857594][37702:37702] CHIP:DMG: Data = 5, - [1663147644.857596][37702:37702] CHIP:DMG: }, - [1663147644.857601][37702:37702] CHIP:DMG: - [1663147644.857603][37702:37702] CHIP:DMG: ], - [1663147644.857606][37702:37702] CHIP:DMG: - [1663147644.857609][37702:37702] CHIP:DMG: moreChunkedMessages = false, - [1663147644.857611][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147644.857613][37702:37702] CHIP:DMG: }, - [1663147644.857629][37702:37702] CHIP:DMG: IM WH moving to [AddStatus] - - ./chip-tool levelcontrol write start-up-current-level 5 1 1 - Verify DUT(chip-tool) receives start-up-current-level attribute response on the TH(all-clusters-minimal-app) Log: - [1663147665.149448][37702:37702] CHIP:IM: Received Write request - [1663147665.149453][37702:37702] CHIP:DMG: IM WH moving to [Initialized] - [1663147665.149474][37702:37702] CHIP:DMG: WriteRequestMessage = - [1663147665.149480][37702:37702] CHIP:DMG: { - [1663147665.149486][37702:37702] CHIP:DMG: suppressResponse = false, - [1663147665.149492][37702:37702] CHIP:DMG: timedRequest = false, - [1663147665.149497][37702:37702] CHIP:DMG: AttributeDataIBs = - [1663147665.149506][37702:37702] CHIP:DMG: [ - [1663147665.149511][37702:37702] CHIP:DMG: AttributeDataIB = - [1663147665.149520][37702:37702] CHIP:DMG: { - [1663147665.149525][37702:37702] CHIP:DMG: AttributePathIB = - [1663147665.149532][37702:37702] CHIP:DMG: { - [1663147665.149539][37702:37702] CHIP:DMG: Endpoint = 0x1, - [1663147665.149545][37702:37702] CHIP:DMG: Cluster = 0x8, - [1663147665.149552][37702:37702] CHIP:DMG: Attribute = 0x0000_4000, - [1663147665.149558][37702:37702] CHIP:DMG: } - [1663147665.149565][37702:37702] CHIP:DMG: - [1663147665.149572][37702:37702] CHIP:DMG: Data = 5, - [1663147665.149578][37702:37702] CHIP:DMG: }, - [1663147665.149586][37702:37702] CHIP:DMG: - [1663147665.149590][37702:37702] CHIP:DMG: ], - [1663147665.149598][37702:37702] CHIP:DMG: - [1663147665.149604][37702:37702] CHIP:DMG: moreChunkedMessages = false, - [1663147665.149609][37702:37702] CHIP:DMG: InteractionModelRevision = 1 - [1663147665.149614][37702:37702] CHIP:DMG: }, - [1663147665.149652][37702:37702] CHIP:DMG: IM WH moving to [AddStatus] - cluster: "LogCommands" - command: "UserPrompt" - PICS: PICS_SKIP_SAMPLE_APP - arguments: - values: - - name: "message" - value: "Enter 'y' after success" - - name: "expectedValue" - value: "y" diff --git a/src/app/tests/suites/certification/Test_TC_REFALM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_REFALM_2_1.yaml index f254239933333e..a133eb9a975531 100644 --- a/src/app/tests/suites/certification/Test_TC_REFALM_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_REFALM_2_1.yaml @@ -13,7 +13,7 @@ # limitations under the License. # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default -name: 223.2.1. [TC-REFALM-2.1] Attributes with DUT as Server +name: 222.2.1. [TC-REFALM-2.1] Attributes with DUT as Server PICS: - REFALM.S @@ -24,6 +24,11 @@ config: endpoint: 0 tests: + - label: "Note" + verification: | + This is a simulated example log for instructional purposes only. In real scenarios, the actual log may vary depending on the feature implementation in Reference App. + disabled: true + - label: "Step 1: Commission DUT to TH (can be skipped if done in a preceding test)" @@ -35,7 +40,7 @@ tests: "Step 2: Ensure that the door alarm is not locally suppressed and the door is closed" verification: | - + Ensure that the door alarm is not locally suppressed and the door is closed disabled: true - label: "Step 3: TH reads from the DUT the Mask attribute" diff --git a/src/app/tests/suites/certification/Test_TC_REFALM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_REFALM_2_2.yaml index ac82c955979496..da9473dc7e9d22 100644 --- a/src/app/tests/suites/certification/Test_TC_REFALM_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_REFALM_2_2.yaml @@ -24,6 +24,11 @@ config: endpoint: 0 tests: + - label: "Note" + verification: | + This is a simulated example log for instructional purposes only. In real scenarios, the actual log may vary depending on the feature implementation in Reference App. + disabled: true + - label: "Step 1: Commission DUT to TH (can be skipped if done in a preceding test)" diff --git a/src/app/tests/suites/certification/Test_TC_REFALM_2_3.yaml b/src/app/tests/suites/certification/Test_TC_REFALM_2_3.yaml index ef4b026cf81dc5..be1df892bd9bcb 100644 --- a/src/app/tests/suites/certification/Test_TC_REFALM_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_REFALM_2_3.yaml @@ -35,58 +35,93 @@ tests: - label: "Step 2: Ensure that the door on the DUT is closed" verification: | - + Ensure that the door on the DUT is closed disabled: true - label: "Step 3: TH reads from the DUT the State attribute" PICS: REFALM.S.A0002 verification: | - Verify that the DUT response contains a 32-bit value with bit 0 set to 0 + ./chip-tool refrigeratoralarm read state 1 1 + On TH(chip-tool), Verify that the DUT response contains a 32-bit value with bit 0 set to 0. + + [1688447820.603249][4247:4249] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_0002 DataVersion: 1795162772 + [1688447820.603415][4247:4249] CHIP:TOO: State: 0 + [1688447820.603708][4247:4249] CHIP:EM: <<< [E:2198i S:4260 M:156565261 (Ack:46517349)] (S) Msg TX to 1:0000000000000001 [10DB] --- Type 0000:10 (SecureChannel:StandaloneAck) disabled: true - label: "Step 4: TH reads from the DUT the Mask attribute" PICS: REFALM.S.A0000 verification: | - Verify that the DUT response contains a 32-bit value with bit 0 set to 1 + ./chip-tool refrigeratoralarm read mask 1 1 + On TH(chip-tool), Verify that the DUT response contains a 32-bit value with bit 0 set to 1. + + [1688447677.832882][4229:4231] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_0000 DataVersion: 1795162772 + [1688447677.833165][4229:4231] CHIP:TOO: Mask: 1 + [1688447677.833494][4229:4231] CHIP:EM: <<< [E:27636i S:5449 M:199797248 (Ack:151091416)] (S) Msg TX to 1:0000000000000001 [10DB] --- Type 0000:10 (SecureChannel:StandaloneAck) disabled: true - label: "Step 5: Manually open the door on the DUT" verification: | - + Manually open the door on the DUT disabled: true - label: "Step 6: Wait for the time defined in PIXIT.REFALM.AlarmThreshold" verification: | - + Wait for the time defined in PIXIT.REFALM.AlarmThreshold disabled: true - label: "Step 7: TH reads from the DUT the State attribute" PICS: REFALM.S.A0002 verification: | - Verify that the DUT response contains a 32-bit value with bit 0 set to 1 + ./chip-tool refrigeratoralarm read state 1 1 + On TH(chip-tool), Verify that the DUT response contains a 32-bit value with bit 0 set to 0. + + [1688447820.603249][4247:4249] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_0002 DataVersion: 1795162772 + [1688447820.603415][4247:4249] CHIP:TOO: State: 1 + [1688447820.603708][4247:4249] CHIP:EM: <<< [E:2198i S:4260 M:156565261 (Ack:46517349)] (S) Msg TX to 1:0000000000000001 [10DB] --- Type 0000:10 (SecureChannel:StandaloneAck) disabled: true - label: "Step 8: Invoke the on DUT sequence to suppress the alarm, do not close the door" verification: | - + Invoke the on DUT sequence to suppress the alarm, do not close the door disabled: true - label: "Step 9: TH reads from the DUT the State attribute" PICS: REFALM.S.A0002 verification: | - Verify that the DUT response contains a 32-bit value with bit 0 set to 0 + ./chip-tool refrigeratoralarm read state 1 1 + On TH(chip-tool), Verify that the DUT response contains a 32-bit value with bit 0 set to 0. + + [1688447820.603249][4247:4249] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_0002 DataVersion: 1795162772 + [1688447820.603415][4247:4249] CHIP:TOO: State: 0 + [1688447820.603708][4247:4249] CHIP:EM: <<< [E:2198i S:4260 M:156565261 (Ack:46517349)] (S) Msg TX to 1:0000000000000001 [10DB] --- Type 0000:10 (SecureChannel:StandaloneAck) disabled: true - label: "Step 10: TH reads from the DUT the Mask attribute" PICS: REFALM.S.A0000 verification: | - Verify that the DUT response contains a 32-bit value with bit 0 set to 0 + ./chip-tool refrigeratoralarm read mask 1 1 + On TH(chip-tool), Verify that the DUT response contains a 32-bit value with bit 0 set to 1. + + [1688447677.832882][4229:4231] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_0000 DataVersion: 1795162772 + [1688447677.833165][4229:4231] CHIP:TOO: Mask: 0 + [1688447677.833494][4229:4231] CHIP:EM: <<< [E:27636i S:5449 M:199797248 (Ack:151091416)] (S) Msg TX to 1:0000000000000001 [10DB] --- Type 0000:10 (SecureChannel:StandaloneAck) disabled: true - label: "Step 11: TH reads from the DUT the Supported attribute" PICS: REFALM.S.A0003 verification: | - Verify that the DUT response contains a 32-bit value with bit 0 set to 1 + ./chip-tool refrigeratoralarm read supported 1 1 + On TH(chip-tool), Verify that the DUT response contains a 32-bit value with bit 0 set to 1. + + [1689677642.708638][18413:18415] CHIP:DMG: SuppressResponse = true, + [1689677642.708645][18413:18415] CHIP:DMG: InteractionModelRevision = 1 + [1689677642.708651][18413:18415] CHIP:DMG: } + [1689677642.708726][18413:18415] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_0003 DataVersion: 1517282962 + [1689677642.708773][18413:18415] CHIP:TOO: Supported: 1 + [1689677642.708845][18413:18415] CHIP:EM: <<< [E:32432i S:53289 M:29829407 (Ack:142651059)] (S) Msg TX to 1:0000000000000001 [BFDE] --- Type 0000:10 (SecureChannel:StandaloneAck) + [1689677642.708859][18413:18415] CHIP:IN: (S) Sending msg 29829407 on secure session with LSID: 53289 + [1689677642.708900][18413:18415] CHIP:EM: Flushed pending ack for MessageCounter:142651059 on exchange 32432i disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml index 52fb1470313d36..5e6ac9becd140c 100644 --- a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml @@ -50,7 +50,7 @@ tests: saveAs: CurrentMaxMeasured constraints: type: int16u - minValue: CurrentMinMeasured + minValue: CurrentMinMeasured + 1 maxValue: 10000 - label: "Step 4: TH reads the MeasuredValue attribute from the DUT" diff --git a/src/app/tests/suites/certification/Test_TC_RVCCLEANM_3_3.yaml b/src/app/tests/suites/certification/Test_TC_RVCCLEANM_3_3.yaml index 3a50dca22d51a7..7fa5f670b18342 100644 --- a/src/app/tests/suites/certification/Test_TC_RVCCLEANM_3_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_RVCCLEANM_3_3.yaml @@ -18,7 +18,9 @@ name: as Server PICS: - - RVCCLEANM.S + - RVCCLEANM.S.A0002 + - RVCCLEANM.S.A0003 + - RVCCLEANM.S.F00 config: nodeId: 0x12344321 diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml index 14583bde4cdf79..fe353a9ffa7801 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml @@ -752,7 +752,10 @@ tests: verification: | Run the below open-commissioning-window in TH Terminal - ./chip-tool pairing open-commissioning-window 1 1 200 2000 3840 + The user needs to change this command to match the longDiscriminator override. + use the same discriminator as the longDiscriminator of the DUT. + + ./chip-tool pairing open-commissioning-window 1 1 200 2000 verify success on TH (Chip-tool) logs: @@ -1062,7 +1065,9 @@ tests: DUT should start to send Commissionable Node Discovery DNS-SD advertisements" verification: | - If the device supports Discovery for an extended period of time, the Device should continue to advertise. Use the avahi-browse command and you should see the _matterc._udp advertisement + If the device supports Extended Discovery, pass the PROMPT before the extended time period expires. + + the Device should continue to advertise. Use the avahi-browse command and you should see the _matterc._udp advertisement Reference Raspberrypi device is not supporting extended discovery. cluster: "LogCommands" diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml index 812dd4732ba046..7bfb258663ed7c 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml @@ -97,11 +97,11 @@ tests: GroupKeySetID: 0x01a3, GroupKeySecurityPolicy: 0, EpochKey0: "hex:d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", - EpochStartTime0: 2220000, + EpochStartTime0: 1, EpochKey1: "hex:d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", - EpochStartTime1: 2220001, + EpochStartTime1: 18446744073709551613, EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", - EpochStartTime2: 2220002, + EpochStartTime2: 18446744073709551614, } - label: "Step 3: TH binds GroupId to GroupKeySet" @@ -176,11 +176,11 @@ tests: GroupKeySetID: 0x01a3, GroupKeySecurityPolicy: 0, EpochKey0: null, - EpochStartTime0: 2220000, + EpochStartTime0: 1, EpochKey1: null, - EpochStartTime1: 2220001, + EpochStartTime1: 18446744073709551613, EpochKey2: null, - EpochStartTime2: 2220002, + EpochStartTime2: 18446744073709551614, } - label: diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml index d6fa8b817564f0..2e138b9cac6680 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default name: 26.1.2. [TC-SC-5.2] Receiving a group message - TH to DUT @@ -77,11 +76,11 @@ tests: GroupKeySetID: 0x01a3, GroupKeySecurityPolicy: 0, EpochKey0: "hex:d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", - EpochStartTime0: 2220000, + EpochStartTime0: 1, EpochKey1: "hex:d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", - EpochStartTime1: 2220001, + EpochStartTime1: 18446744073709551613, EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", - EpochStartTime2: 2220002, + EpochStartTime2: 18446744073709551614, } - label: "Step 3: TH binds GroupId to GroupKeySet" diff --git a/src/app/tests/suites/certification/Test_TC_SM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_SM_1_1.yaml deleted file mode 100755 index 9929d3531f41b3..00000000000000 --- a/src/app/tests/suites/certification/Test_TC_SM_1_1.yaml +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright (c) 2023 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default - -name: 54.1.1. [TC-SM-1.1] Device composition - Root Node [DUT as Server] - -PICS: - - MCORE.SM.S - -config: - nodeId: 0x12344321 - cluster: "Basic Information" - endpoint: 0 - -tests: - - label: - "Step 1: TH performs a wildcard read of all attributes and endpoints" - verification: | - TH(chip-tool) sends the wildcard read command to read all attributes and endpoints from DUT(Reference app/all-clusters-app) - ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF - disabled: true - - - label: - "Step 2: C.2.10, Verify that endpoint 0 exists in the returned data" - verification: | - On TH(chip-tool), Verify that endpoint 0 exists in the returned report data Message - below is the sample log provided for the raspi platform: - - [1690185276.189258][40055:40057] CHIP:TOO: [28]: 4294048774 - [1690185276.189270][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 1390630643 - [1690185276.189273][40055:40057] CHIP:TOO: ClientList: 1 entries - [1690185276.189275][40055:40057] CHIP:TOO: [1]: 41 - [1690185276.189286][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1390630643 - [1690185276.189290][40055:40057] CHIP:TOO: PartsList: 2 entries - [1690185276.189293][40055:40057] CHIP:TOO: [1]: 1 - [1690185276.189295][40055:40057] CHIP:TOO: [2]: 2 - [1690185276.189298][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFC DataVersion: 1390630643 - [1690185276.189300][40055:40057] CHIP:TOO: FeatureMap: 0 - [1690185276.189309][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFD DataVersion: 1390630643 - [1690185276.189311][40055:40057] CHIP:TOO: ClusterRevision: 1 - [1690185276.189326][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFF8 DataVersion: 1390630643 - [1690185276.189329][40055:40057] CHIP:TOO: GeneratedCommandList: 0 entries - [1690185276.189339][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFF9 DataVersion: 1390630643 - [1690185276.189341][40055:40057] CHIP:TOO: AcceptedCommandList: 0 entries - [1690185276.189353][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFA DataVersion: 1390630643 - [1690185276.189356][40055:40057] CHIP:TOO: EventList: 0 entries - [1690185276.189374][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFB DataVersion: 1390630643 - [1690185276.189378][40055:40057] CHIP:TOO: AttributeList: 10 entries - [1690185276.189380][40055:40057] CHIP:TOO: [1]: 0 - [1690185276.189382][40055:40057] CHIP:TOO: [2]: 1 - [1690185276.189384][40055:40057] CHIP:TOO: [3]: 2 - [1690185276.189386][40055:40057] CHIP:TOO: [4]: 3 - [1690185276.189388][40055:40057] CHIP:TOO: [5]: 65528 - [1690185276.189390][40055:40057] CHIP:TOO: [6]: 65529 - [1690185276.189392][40055:40057] CHIP:TOO: [7]: 65530 - [1690185276.189394][40055:40057] CHIP:TOO: [8]: 65531 - [1690185276.189396][40055:40057] CHIP:TOO: [9]: 65532 - [1690185276.189398][40055:40057] CHIP:TOO: [10]: 65533 - [1690185276.189408][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_0000 DataVersion: 3752520678 - [1690185276.189411][40055:40057] CHIP:TOO: Binding: 0 entries - [1690185276.189414][40055:40057] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_FFFC DataVersion: 3752520678 - [1690185276.189416][40055:40057] CHIP:TOO: FeatureMap: 0 - disabled: true - - - label: - "Step 3: C.2.10, Verify that the endpoint 0 descriptor cluster - DeviceTypeList includes the Root Node device type id (0x0016)" - verification: | - On TH(chip-tool), Verify that the endpoint 0 descriptor cluster DeviceTypeList includes the Root Node device type id - 0x0016(22) in the returned report data Message - below is the sample log provided for the raspi platform: - [1690191137.963592][40907:40909] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_FFFA DataVersion: 2221012748 - [1690191137.963595][40907:40909] CHIP:TOO: EventList: 0 entries - [1690191137.963612][40907:40909] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_FFFB DataVersion: 2221012748 - [1690191137.963616][40907:40909] CHIP:TOO: AttributeList: 7 entries - [1690191137.963619][40907:40909] CHIP:TOO: [1]: 0 - [1690191137.963621][40907:40909] CHIP:TOO: [2]: 65528 - [1690191137.963623][40907:40909] CHIP:TOO: [3]: 65529 - [1690191137.963625][40907:40909] CHIP:TOO: [4]: 65530 - [1690191137.963627][40907:40909] CHIP:TOO: [5]: 65531 - [1690191137.963629][40907:40909] CHIP:TOO: [6]: 65532 - [1690191137.963631][40907:40909] CHIP:TOO: [7]: 65533 - [1690191137.963649][40907:40909] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1390630643 - [1690191137.963657][40907:40909] CHIP:TOO: DeviceTypeList: 1 entries - [1690191137.963663][40907:40909] CHIP:TOO: [1]: { - [1690191137.963665][40907:40909] CHIP:TOO: DeviceType: 22 - [1690191137.963667][40907:40909] CHIP:TOO: Revision: 1 - [1690191137.963669][40907:40909] CHIP:TOO: } - [1690191137.963704][40907:40909] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 1390630643 - [1690191137.963712][40907:40909] CHIP:TOO: ServerList: 28 entries - [1690191137.963714][40907:40909] CHIP:TOO: [1]: 3 - [1690191137.963716][40907:40909] CHIP:TOO: [2]: 4 - [1690191137.963717][40907:40909] CHIP:TOO: [3]: 29 - [1690191137.963719][40907:40909] CHIP:TOO: [4]: 30 - [1690191137.963721][40907:40909] CHIP:TOO: [5]: 31 - [1690191137.963723][40907:40909] CHIP:TOO: [6]: 40 - [1690191137.963725][40907:40909] CHIP:TOO: [7]: 42 - [1690191137.963727][40907:40909] CHIP:TOO: [8]: 43 - [1690191137.963729][40907:40909] CHIP:TOO: [9]: 44 - [1690191137.963731][40907:40909] CHIP:TOO: [10]: 45 - disabled: true - - - label: - "Step 4: {REF_SM_ENDPOINT}, For each of the non-root endpoints, verify - that the descriptor cluster DeviceTypeList does NOT include the Root - Node device type id (0x0016)" - verification: | - On TH(chip-tool), For each of the non-root endpoints(endpoint - 1 and endpoint 2), verify that the descriptor cluster DeviceTypeList does NOT include the Root Node device type id - 0x0016(22) in the returned report data Message - below is the sample log provided for the raspi platform: - - [1690191138.044893][40907:40909] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_000F Attribute 0x0000_FFFB DataVersion: 4049418703 - [1690191138.044897][40907:40909] CHIP:TOO: AttributeList: 9 entries - [1690191138.044900][40907:40909] CHIP:TOO: [1]: 81 - [1690191138.044902][40907:40909] CHIP:TOO: [2]: 85 - [1690191138.044904][40907:40909] CHIP:TOO: [3]: 111 - [1690191138.044906][40907:40909] CHIP:TOO: [4]: 65528 - [1690191138.044908][40907:40909] CHIP:TOO: [5]: 65529 - [1690191138.044910][40907:40909] CHIP:TOO: [6]: 65530 - [1690191138.044912][40907:40909] CHIP:TOO: [7]: 65531 - [1690191138.044914][40907:40909] CHIP:TOO: [8]: 65532 - [1690191138.044916][40907:40909] CHIP:TOO: [9]: 65533 - [1690191138.044941][40907:40909] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2743502132 - [1690191138.044945][40907:40909] CHIP:TOO: DeviceTypeList: 1 entries - [1690191138.044950][40907:40909] CHIP:TOO: [1]: { - [1690191138.044952][40907:40909] CHIP:TOO: DeviceType: 256 - [1690191138.044954][40907:40909] CHIP:TOO: Revision: 1 - [1690191138.044956][40907:40909] CHIP:TOO: } - [1690191138.045023][40907:40909] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 2743502132 - [1690191138.045038][40907:40909] CHIP:TOO: ServerList: 68 entries - [1690191138.045040][40907:40909] CHIP:TOO: [1]: 3 - [1690191138.045042][40907:40909] CHIP:TOO: [2]: 4 - - [1690191138.208428][40907:40909] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_0006 Attribute 0x0000_FFFB DataVersion: 1862188847 - [1690191138.208435][40907:40909] CHIP:TOO: AttributeList: 11 entries - [1690191138.208438][40907:40909] CHIP:TOO: [1]: 0 - [1690191138.208442][40907:40909] CHIP:TOO: [2]: 16384 - [1690191138.208445][40907:40909] CHIP:TOO: [3]: 16385 - [1690191138.208447][40907:40909] CHIP:TOO: [4]: 16386 - [1690191138.208450][40907:40909] CHIP:TOO: [5]: 16387 - [1690191138.208454][40907:40909] CHIP:TOO: [6]: 65528 - [1690191138.208456][40907:40909] CHIP:TOO: [7]: 65529 - [1690191138.208459][40907:40909] CHIP:TOO: [8]: 65530 - [1690191138.208462][40907:40909] CHIP:TOO: [9]: 65531 - [1690191138.208465][40907:40909] CHIP:TOO: [10]: 65532 - [1690191138.208467][40907:40909] CHIP:TOO: [11]: 65533 - [1690191138.208488][40907:40909] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 516620155 - [1690191138.208494][40907:40909] CHIP:TOO: DeviceTypeList: 1 entries - [1690191138.208500][40907:40909] CHIP:TOO: [1]: { - [1690191138.208502][40907:40909] CHIP:TOO: DeviceType: 256 - [1690191138.208505][40907:40909] CHIP:TOO: Revision: 1 - [1690191138.208508][40907:40909] CHIP:TOO: } - [1690191138.208524][40907:40909] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 516620155 - [1690191138.208530][40907:40909] CHIP:TOO: ServerList: 5 entries - [1690191138.208532][40907:40909] CHIP:TOO: [1]: 4 - [1690191138.208536][40907:40909] CHIP:TOO: [2]: 6 - [1690191138.208539][40907:40909] CHIP:TOO: [3]: 29 - [1690191138.208542][40907:40909] CHIP:TOO: [4]: 47 - [1690191138.208546][40907:40909] CHIP:TOO: [5]: 1030 - [1690191138.208557][40907:40909] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 516620155 - [1690191138.208561][40907:40909] CHIP:TOO: ClientList: 0 entries - disabled: true - - - label: - "Step 5: C.2.10, Validate all the mandatory clusters for the Root Node - Device Type exist on the Root Node endpoint" - verification: | - On TH(chip-tool), Validate all the mandatory clusters(Basic Information(40), Access Control(31), Group Key Management(63) General Commissioning(48), Administrator Commissioning(60), Node Operational Credentials(62), Localization Configuration(43), Time Format Localization(44), Unit Localization(45), General Diagnostics(51), and ICD Management(70)) for the Root Node Device Type exist on the Root Node endpoint(endpoint 0) - - [1690191137.963649][40907:40909] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1390630643 - [1690191137.963657][40907:40909] CHIP:TOO: DeviceTypeList: 1 entries - [1690191137.963663][40907:40909] CHIP:TOO: [1]: { - [1690191137.963665][40907:40909] CHIP:TOO: DeviceType: 22 - [1690191137.963667][40907:40909] CHIP:TOO: Revision: 1 - [1690191137.963669][40907:40909] CHIP:TOO: } - [1690191137.963704][40907:40909] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 1390630643 - [1690191137.963712][40907:40909] CHIP:TOO: ServerList: 28 entries - [1690191137.963714][40907:40909] CHIP:TOO: [1]: 3 - [1690191137.963716][40907:40909] CHIP:TOO: [2]: 4 - [1690191137.963717][40907:40909] CHIP:TOO: [3]: 29 - [1690191137.963719][40907:40909] CHIP:TOO: [4]: 30 - [1690191137.963721][40907:40909] CHIP:TOO: [5]: 31 - [1690191137.963723][40907:40909] CHIP:TOO: [6]: 40 - [1690191137.963725][40907:40909] CHIP:TOO: [7]: 42 - [1690191137.963727][40907:40909] CHIP:TOO: [8]: 43 - [1690191137.963729][40907:40909] CHIP:TOO: [9]: 44 - [1690191137.963731][40907:40909] CHIP:TOO: [10]: 45 - [1690191137.963733][40907:40909] CHIP:TOO: [11]: 47 - [1690191137.963735][40907:40909] CHIP:TOO: [12]: 48 - [1690191137.963737][40907:40909] CHIP:TOO: [13]: 49 - [1690191137.963739][40907:40909] CHIP:TOO: [14]: 50 - [1690191137.963742][40907:40909] CHIP:TOO: [15]: 51 - [1690191137.963744][40907:40909] CHIP:TOO: [16]: 52 - [1690191137.963745][40907:40909] CHIP:TOO: [17]: 53 - [1690191137.963747][40907:40909] CHIP:TOO: [18]: 54 - [1690191137.963749][40907:40909] CHIP:TOO: [19]: 55 - [1690191137.963751][40907:40909] CHIP:TOO: [20]: 56 - [1690191137.963753][40907:40909] CHIP:TOO: [21]: 60 - [1690191137.963754][40907:40909] CHIP:TOO: [22]: 62 - [1690191137.963756][40907:40909] CHIP:TOO: [23]: 63 - [1690191137.963758][40907:40909] CHIP:TOO: [24]: 64 - [1690191137.963760][40907:40909] CHIP:TOO: [25]: 65 - [1690191137.963762][40907:40909] CHIP:TOO: [26]: 70 - [1690191137.963764][40907:40909] CHIP:TOO: [27]: 1029 - [1690191137.963766][40907:40909] CHIP:TOO: [28]: 4294048774 - [1690191137.963778][40907:40909] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 1390630643 - [1690191137.963781][40907:40909] CHIP:TOO: ClientList: 1 entries - [1690191137.963783][40907:40909] CHIP:TOO: [1]: 41 - [1690191137.963795][40907:40909] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1390630643 - [1690191137.963799][40907:40909] CHIP:TOO: PartsList: 2 entries - disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_SM_1_2.yaml b/src/app/tests/suites/certification/Test_TC_SM_1_2.yaml deleted file mode 100755 index 05286d1a00b825..00000000000000 --- a/src/app/tests/suites/certification/Test_TC_SM_1_2.yaml +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright (c) 2023 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default - -name: 54.1.2. [TC-SM-1.2] Device composition - Topology [DUT as Server] - -PICS: - - MCORE.IDM.S - -config: - nodeId: 0x12344321 - cluster: "Basic Information" - endpoint: 0 - -tests: - - label: - "Step 1: TH performs a wildcard read of all attributes on all - endpoints" - verification: | - TH(chip-tool) sends the wildcard read command to read all attributes and endpoints from DUT(Reference app/all-clusters-app) - ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF - disabled: true - - - label: - "Step 2: Verify the Descriptor cluster PartsList on endpoint 0 exactly - lists all the other (non-0) endpoints on the DUT - i.e. the endpoints - returned in step 1 (except EP 0) must be listed in the PartsList, and - all endpoints listed in the PartsList must be amongst the endpoint(s) - returned in step 1" - verification: | - On TH(chip-tool), Verify the Descriptor cluster PartsList on endpoint 0 exactly lists all the other (non-0) endpoints in the returned report data Message - below is the sample log provided for the raspi platform: - - [1690193538.813187][43091:43093] CHIP:TOO: [28]: 4294048774 - [1690193538.813213][43091:43093] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 1390630643 - [1690193538.813220][43091:43093] CHIP:TOO: ClientList: 1 entries - [1690193538.813224][43091:43093] CHIP:TOO: [1]: 41 - [1690193538.813254][43091:43093] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1390630643 - [1690193538.813262][43091:43093] CHIP:TOO: PartsList: 2 entries - [1690193538.813268][43091:43093] CHIP:TOO: [1]: 1 - [1690193538.813276][43091:43093] CHIP:TOO: [2]: 2 - [1690193538.813281][43091:43093] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFC DataVersion: 1390630643 - [1690193538.813283][43091:43093] CHIP:TOO: FeatureMap: 0 - disabled: true - - - label: - "Step 4: For each endpoint on the DUT (including EP 0), verify the - PartsList in the Descriptor cluster on that endpoint does not include - itself" - verification: | - On TH(chip-tool), verify the PartsList in the Descriptor cluster on that endpoint does not include itself For each endpoint on the DUT (including EP 0) in the returned report data Message - below is the sample log provided for the raspi platform: - - [1690193538.813187][43091:43093] CHIP:TOO: [28]: 4294048774 - [1690193538.813213][43091:43093] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 1390630643 - [1690193538.813220][43091:43093] CHIP:TOO: ClientList: 1 entries - [1690193538.813224][43091:43093] CHIP:TOO: [1]: 41 - [1690193538.813254][43091:43093] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1390630643 - [1690193538.813262][43091:43093] CHIP:TOO: PartsList: 2 entries - [1690193538.813268][43091:43093] CHIP:TOO: [1]: 1 - [1690193538.813276][43091:43093] CHIP:TOO: [2]: 2 - [1690193538.813281][43091:43093] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_FFFC DataVersion: 1390630643 - [1690193538.813283][43091:43093] CHIP:TOO: FeatureMap: 0 - - - [1690193538.869392][43091:43093] CHIP:TOO: [68]: 4294048773 - [1690193538.869403][43091:43093] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 2743502132 - [1690193538.869406][43091:43093] CHIP:TOO: ClientList: 1 entries - [1690193538.869408][43091:43093] CHIP:TOO: [1]: 6 - [1690193538.869417][43091:43093] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2743502132 - [1690193538.869420][43091:43093] CHIP:TOO: PartsList: 0 entries - [1690193538.869423][43091:43093] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFFC DataVersion: 2743502132 - [1690193538.869425][43091:43093] CHIP:TOO: FeatureMap: 0 - [1690193538.869433][43091:43093] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFFD DataVersion: 2743502132 - [1690193538.869435][43091:43093] CHIP:TOO: ClusterRevision: 1 - [1690193538.869450][43091:43093] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFF8 DataVersion: 2743502132 - [1690193538.869453][43091:43093] CHIP:TOO: GeneratedCommandList: 0 entries - [1690193538.869462][43091:43093] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFF9 DataVersion: 2743502132 - [1690193538.869464][43091:43093] CHIP:TOO: AcceptedCommandList: 0 entries - [1690193538.869476][43091:43093] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFFA DataVersion: 2743502132 - [1690193538.869478][43091:43093] CHIP:TOO: EventList: 0 entries - [1690193538.869496][43091:43093] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_FFFB DataVersion: 2743502132 - - - [1690193539.051392][43091:43093] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 516620155 - [1690193539.051395][43091:43093] CHIP:TOO: ClientList: 0 entries - [1690193539.051410][43091:43093] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 516620155 - [1690193539.051414][43091:43093] CHIP:TOO: PartsList: 0 entries - [1690193539.051418][43091:43093] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_FFFC DataVersion: 516620155 - [1690193539.051421][43091:43093] CHIP:TOO: FeatureMap: 0 - [1690193539.051435][43091:43093] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_FFFD DataVersion: 516620155 - [1690193539.051438][43091:43093] CHIP:TOO: ClusterRevision: 1 - [1690193539.051459][43091:43093] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_FFF8 DataVersion: 516620155 - [1690193539.051462][43091:43093] CHIP:TOO: GeneratedCommandList: 0 entries - disabled: true - - - label: - "Step 5: Create two empty list variables flat and tree, For each - non-root endpoint on the DUT, If the DeviceTypeList attribute in the - Descriptor cluster for that endpoint includes the Aggregator device - type(0x000e), add the endpoint id to the flat list, Otherwise, add - the endpoint id to the tree list" - verification: | - - disabled: true - - - label: - "Step 6: For each endpoint e in the tree list, walk the entire - PartsList tree and ensure e does not appear in any descendants." - verification: | - - disabled: true - - - label: - "Step 7: For each endpoint e in the flat list: * for each endpoint id - sub_id present in the in the PartsList of e, ensure that every id - listed in the PartsList for endpoint sub_id appears in the PartsList - of e" - verification: | - - disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml index 41c94bc0ad274a..e0f6df2d917fb4 100644 --- a/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml @@ -75,7 +75,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 65528, 65529, 65531, 65532, 65533] - label: "Step 4b: TH reads from the DUT the AttributeList attribute. 0x0002: diff --git a/src/app/tests/suites/certification/Test_TC_TCTL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TCTL_1_1.yaml index 0a88b2982d45ba..680b359d2b7d32 100644 --- a/src/app/tests/suites/certification/Test_TC_TCTL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TCTL_1_1.yaml @@ -75,7 +75,7 @@ tests: be 1 if and only if TCTL.S.F02(A_STEP) & TCTL.S.F00(TN)" command: "readAttribute" attribute: "FeatureMap" - PICS: TCTL.S.F02 && !TCTL.S.F00 + PICS: TCTL.S.F02 && TCTL.S.F00 response: constraints: type: bitmap32 diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml index f6d1aae6b8a9b2..2081e133f84876 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml @@ -553,8 +553,16 @@ tests: type: list contains: [30] + - label: "Step 5a: Read the mandatory commands in AcceptedCommandList" + command: "readAttribute" + attribute: "AcceptedCommandList" + response: + constraints: + type: list + contains: [0] + - label: - "Step 5a: Read Feature dependent(TSTAT.S.F03(SCH)) commands in + "Step 5b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in AcceptedCommandList" PICS: TSTAT.S.F03 command: "readAttribute" @@ -562,9 +570,11 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 3] + contains: [1, 2, 3] - - label: "Step 5b: Read the optional attribute: AcceptedCommandList" + - label: + "Step 5c: Read the optional (GetRelayStatusLog) command in + AcceptedCommandList" PICS: TSTAT.S.C04.Rsp command: "readAttribute" attribute: "AcceptedCommandList" diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml index 574725b5c06b84..4d4ee2d4c7b70b 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml @@ -1736,20 +1736,52 @@ tests: anyOf: [4, 5] - label: - "Step 12: Write Attribute command for ControlSequenceOfOperation with - a new valid value" + "Step 12: TH writes value 1 for attribute ControlSequenceOfOperation. + If TSTAT.S.F01 is true & TSTAT.S.F00 is false" command: "writeAttribute" attribute: "ControlSequenceOfOperation" - PICS: TSTAT.S.F00 || TSTAT.S.F01 + PICS: TSTAT.S.F01 && !TSTAT.S.F00 arguments: - value: 2 + value: 1 - label: "Step 12: Read it back again to confirm the successful write" command: "readAttribute" attribute: "ControlSequenceOfOperation" - PICS: TSTAT.S.F00 || TSTAT.S.F01 + PICS: TSTAT.S.F01 && !TSTAT.S.F00 + response: + value: 1 + + - label: + "Step 12: TH writes value 3 for attribute ControlSequenceOfOperation. + If TSTAT.S.F00 is true & TSTAT.S.F01 is false" + command: "writeAttribute" + attribute: "ControlSequenceOfOperation" + PICS: TSTAT.S.F00 && !TSTAT.S.F01 + arguments: + value: 3 + + - label: "Step 12: Read it back again to confirm the successful write" + command: "readAttribute" + attribute: "ControlSequenceOfOperation" + PICS: TSTAT.S.F00 && !TSTAT.S.F01 + response: + value: 3 + + - label: + "Step 12: TH writes value 4 for attribute ControlSequenceOfOperation. + If TSTAT.S.F01 & TSTAT.S.F00 are true" + command: "writeAttribute" + attribute: "ControlSequenceOfOperation" + PICS: TSTAT.S.F00 && TSTAT.S.F01 + arguments: + value: 4 + + - label: "Step 12: Read it back again to confirm the successful write" + command: "readAttribute" + attribute: "ControlSequenceOfOperation" + PICS: TSTAT.S.F00 && TSTAT.S.F01 response: - value: 2 + value: 4 - label: "Writes MaxHeatSetpointLimit attribute to default value of 2950 to diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml index e88ffbd7703897..56d387720a5e23 100644 --- a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml @@ -31,7 +31,7 @@ tests: - name: "nodeId" value: nodeId - - label: "Step 2: TH read ClusterRevision attribute from the DUT" + - label: "Step 2: TH reads from the DUT the ClusterRevision attribute." command: "readAttribute" attribute: "ClusterRevision" response: @@ -39,7 +39,7 @@ tests: constraints: type: int16u - - label: "Step 3: Read FeatureMap attribute from the DUT" + - label: "Step 3: TH reads from the DUT the FeatureMap attribute." command: "readAttribute" attribute: "FeatureMap" response: @@ -47,25 +47,36 @@ tests: constraints: type: bitmap32 - - label: "Step 4: Read the global attribute: AttributeList" + - label: "Step 4a: TH reads from the DUT the AttributeList attribute." PICS: PICS_EVENT_LIST_ENABLED command: "readAttribute" attribute: "AttributeList" response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] + contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533] - - label: "Step 4: Read the global attribute: AttributeList" + - label: "Step 4a: TH reads from the DUT the AttributeList attribute." PICS: "!PICS_EVENT_LIST_ENABLED" command: "readAttribute" attribute: "AttributeList" response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 65528, 65529, 65531, 65532, 65533] - - label: "Step 5: Read the global attribute: AcceptedCommandList" + - label: + "Step 4b: TH reads optional attribute(ScheduleProgrammingVisibility) + in AttributeList" + PICS: TSUIC.S.A0002 + command: "readAttribute" + attribute: "AttributeList" + response: + constraints: + type: list + contains: [2] + + - label: "Step 5: TH reads from the DUT the AcceptedCommandList attribute." command: "readAttribute" attribute: "AcceptedCommandList" response: @@ -73,7 +84,7 @@ tests: constraints: type: list - - label: "Step 6: Read the global attribute: GeneratedCommandList" + - label: "Step 6: TH reads from the DUT the GeneratedCommandList attribute." command: "readAttribute" attribute: "GeneratedCommandList" response: diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml index 1a2431a63c9386..7f0951646ba01b 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml @@ -25,7 +25,7 @@ config: endpoint: 1 fastMotionDuration: type: int16u - defaultValue: 3000 + defaultValue: 5000 fullMotionDuration: type: int16u defaultValue: 6000 diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml index 54ce50c8176b59..735fb0aaff648f 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml @@ -25,7 +25,7 @@ config: endpoint: 1 fastMotionDuration: type: int16u - defaultValue: 3000 + defaultValue: 5000 fullMotionDuration: type: int16u defaultValue: 6000 diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values index 509c37ed6fd293..63caa7841d3ccf 100644 --- a/src/app/tests/suites/certification/ci-pics-values +++ b/src/app/tests/suites/certification/ci-pics-values @@ -784,16 +784,9 @@ LUNIT.S=1 LUNIT.S.F00=1 LUNIT.S.A0000=1 -LUNIT.TempUnit.Fahrenheit=1 -LUNIT.TempUnit.Celsius=1 -LUNIT.TempUnit.Kelvin=1 -LUNIT.C.A0000=1 -LUNIT.C.Afff8=1 -LUNIT.C.Afff9=1 -LUNIT.C.Afffa=1 -LUNIT.C.Afffb=1 -LUNIT.C.Afffc=1 -LUNIT.C.Afffd=1 +LUNIT.S.M.Fahrenheit=1 +LUNIT.S.M.Celsius=1 +LUNIT.S.M.Kelvin=1 LUNIT.C=1 @@ -1148,21 +1141,7 @@ DGWIFI.S.A000b=1 DGWIFI.S.A000c=1 # Client DGWIFI.C=1 -DGWIFI.C.A=0 -DGWIFI.C.A0000=1 -DGWIFI.C.A0001=1 -DGWIFI.C.A0002=1 -DGWIFI.C.A0003=1 -DGWIFI.C.A0004=1 -DGWIFI.C.A0005=1 -DGWIFI.C.A0006=1 -DGWIFI.C.A0007=1 -DGWIFI.C.A0008=1 -DGWIFI.C.A0009=1 -DGWIFI.C.A000a=1 -DGWIFI.C.A000b=1 -DGWIFI.C.A000c=1 -DGWIFI.C.C00.Tx=0 +DGWIFI.S.C00.Tx=0 # Events DGWIFI.S.E00=1 DGWIFI.S.E01=1 diff --git a/src/app/tests/suites/manualTests.json b/src/app/tests/suites/manualTests.json index b6a4f38f9c90d2..e5c4da8fc77b85 100644 --- a/src/app/tests/suites/manualTests.json +++ b/src/app/tests/suites/manualTests.json @@ -136,9 +136,7 @@ "Test_TC_IDM_6_3", "Test_TC_IDM_6_4", "Test_TC_IDM_7_1", - "Test_TC_IDM_8_1", - "Test_TC_IDM_10_1", - "Test_TC_IDM_11_1" + "Test_TC_IDM_8_1" ], "MediaControl": [ "Test_TC_LOWPOWER_2_2", 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 7640dd8634e296..07b07acb67d4c3 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -96,7 +96,6 @@ class TestList : public Command { printf("Test_TC_DGETH_2_1\n"); printf("Test_TC_DGETH_2_2\n"); printf("Test_TC_FLW_1_1\n"); - printf("Test_TC_FLW_2_1\n"); printf("Test_TC_FLABEL_1_1\n"); printf("Test_TC_FAN_1_1\n"); printf("Test_TC_FAN_2_1\n"); @@ -197,7 +196,6 @@ class TestList : public Command { printf("Test_TC_PCC_2_4\n"); printf("Test_TC_REFALM_1_1\n"); printf("Test_TC_RH_1_1\n"); - printf("Test_TC_RH_2_1\n"); printf("Test_TC_RVCCLEANM_1_1\n"); printf("Test_TC_RVCRUNM_1_1\n"); printf("Test_TC_RVCOPSTATE_1_1\n"); @@ -46024,239 +46022,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { } }; -class Test_TC_FLW_2_1 : public TestCommandBridge { -public: - // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced - Test_TC_FLW_2_1() - : TestCommandBridge("Test_TC_FLW_2_1") - , mTestIndex(0) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull) - - ~Test_TC_FLW_2_1() - { - } - - /////////// TestCommand Interface ///////// - void NextTest() override - { - CHIP_ERROR err = CHIP_NO_ERROR; - - if (0 == mTestIndex) { - ChipLogProgress(chipTool, " **** Test Start: Test_TC_FLW_2_1\n"); - } - - if (mTestCount == mTestIndex) { - ChipLogProgress(chipTool, " **** Test Complete: Test_TC_FLW_2_1\n"); - SetCommandExitStatus(CHIP_NO_ERROR); - return; - } - - Wait(); - - // Ensure we increment mTestIndex before we start running the relevant - // command. That way if we lose the timeslice after we send the message - // but before our function call returns, we won't end up with an - // incorrect mTestIndex value observed when we get the response. - switch (mTestIndex++) { - case 0: - ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Wait for the commissioned device to be retrieved\n"); - err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0(); - break; - case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: Read the mandatory attribute: MinMeasuredValue\n"); - if (ShouldSkip("FLW.S.A0001")) { - NextTest(); - return; - } - err = TestStep2ReadTheMandatoryAttributeMinMeasuredValue_1(); - break; - case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: Read the mandatory attribute: MaxMeasuredValue\n"); - if (ShouldSkip("FLW.S.A0002")) { - NextTest(); - return; - } - err = TestStep3ReadTheMandatoryAttributeMaxMeasuredValue_2(); - break; - case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4: Read the mandatory attribute: MeasuredValue\n"); - if (ShouldSkip("FLW.S.A0000")) { - NextTest(); - return; - } - err = TestStep4ReadTheMandatoryAttributeMeasuredValue_3(); - break; - case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : Step 5: TH reads from the DUT the Tolerance attribute\n"); - if (ShouldSkip("FLW.S.A0003")) { - NextTest(); - return; - } - err = TestStep5ThReadsFromTheDutTheToleranceAttribute_4(); - break; - } - - if (CHIP_NO_ERROR != err) { - ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err)); - SetCommandExitStatus(err); - } - } - - void OnStatusUpdate(const chip::app::StatusIB & status) override - { - switch (mTestIndex - 1) { - case 0: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 1: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 2: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 3: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 4: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - } - - // Go on to the next test. - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - - chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); } - -private: - std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 5; - - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - CHIP_ERROR TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0() - { - - chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; - value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; - return WaitForCommissionee("alpha", value); - } - NSNumber * _Nullable MinMeasuredVariable; - - CHIP_ERROR TestStep2ReadTheMandatoryAttributeMinMeasuredValue_1() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 2: Read the mandatory attribute: MinMeasuredValue Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - if (value != nil) { - - VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("minMeasuredValue", [value unsignedShortValue], 65533U)); - } - { - MinMeasuredVariable = value; - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - NSNumber * _Nullable MaxMeasuredVariable; - - CHIP_ERROR TestStep3ReadTheMandatoryAttributeMaxMeasuredValue_2() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 3: Read the mandatory attribute: MaxMeasuredValue Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - if (value != nil) { - - VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value unsignedShortValue], MinMeasuredVariable)); - VerifyOrReturn(CheckConstraintMaxValue("maxMeasuredValue", [value unsignedShortValue], 65534U)); - } - { - MaxMeasuredVariable = value; - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestStep4ReadTheMandatoryAttributeMeasuredValue_3() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 4: Read the mandatory attribute: MeasuredValue Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - if (value != nil) { - - VerifyOrReturn(CheckConstraintType("measuredValue", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value unsignedShortValue], MinMeasuredVariable)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value unsignedShortValue], MaxMeasuredVariable)); - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestStep5ThReadsFromTheDutTheToleranceAttribute_4() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeToleranceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 5: TH reads from the DUT the Tolerance attribute Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - VerifyOrReturn(CheckConstraintType("tolerance", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("tolerance", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("tolerance", [value unsignedShortValue], 2048U)); - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } -}; - class Test_TC_FLABEL_1_1 : public TestCommandBridge { public: // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced @@ -62342,7 +62107,7 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { break; case 2: ChipLogProgress(chipTool, " ***** Test Step 2 : Step 2: TH writes 0 (Fahrenheit) to TemperatureUnit attribute\n"); - if (ShouldSkip("LUNIT.S.A0000 && LUNIT.TempUnit.Fahrenheit")) { + if (ShouldSkip("LUNIT.S.A0000 && LUNIT.S.M.Fahrenheit")) { NextTest(); return; } @@ -62350,7 +62115,7 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { break; case 3: ChipLogProgress(chipTool, " ***** Test Step 3 : Step 3: TH reads TemperatureUnit attribute\n"); - if (ShouldSkip("LUNIT.S.A0000 && LUNIT.TempUnit.Fahrenheit")) { + if (ShouldSkip("LUNIT.S.A0000 && LUNIT.S.M.Fahrenheit")) { NextTest(); return; } @@ -62358,7 +62123,7 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { break; case 4: ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4: TH writes 1 (Celsius) to TemperatureUnit attribute\n"); - if (ShouldSkip("LUNIT.S.A0000 && LUNIT.TempUnit.Celsius")) { + if (ShouldSkip("LUNIT.S.A0000 && LUNIT.S.M.Celsius")) { NextTest(); return; } @@ -62366,7 +62131,7 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { break; case 5: ChipLogProgress(chipTool, " ***** Test Step 5 : Step 5: TH reads TemperatureUnit attribute\n"); - if (ShouldSkip("LUNIT.S.A0000 && LUNIT.TempUnit.Celsius")) { + if (ShouldSkip("LUNIT.S.A0000 && LUNIT.S.M.Celsius")) { NextTest(); return; } @@ -62374,7 +62139,7 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { break; case 6: ChipLogProgress(chipTool, " ***** Test Step 6 : Step 6: TH writes 2 (Kelvin) to TemperatureUnit attribute\n"); - if (ShouldSkip("LUNIT.S.A0000 && LUNIT.TempUnit.Kelvin")) { + if (ShouldSkip("LUNIT.S.A0000 && LUNIT.S.M.Kelvin")) { NextTest(); return; } @@ -62382,7 +62147,7 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { break; case 7: ChipLogProgress(chipTool, " ***** Test Step 7 : Step 7: TH reads TemperatureUnit attribute\n"); - if (ShouldSkip("LUNIT.S.A0000 && LUNIT.TempUnit.Kelvin")) { + if (ShouldSkip("LUNIT.S.A0000 && LUNIT.S.M.Kelvin")) { NextTest(); return; } @@ -88982,239 +88747,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { } }; -class Test_TC_RH_2_1 : public TestCommandBridge { -public: - // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced - Test_TC_RH_2_1() - : TestCommandBridge("Test_TC_RH_2_1") - , mTestIndex(0) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull) - - ~Test_TC_RH_2_1() - { - } - - /////////// TestCommand Interface ///////// - void NextTest() override - { - CHIP_ERROR err = CHIP_NO_ERROR; - - if (0 == mTestIndex) { - ChipLogProgress(chipTool, " **** Test Start: Test_TC_RH_2_1\n"); - } - - if (mTestCount == mTestIndex) { - ChipLogProgress(chipTool, " **** Test Complete: Test_TC_RH_2_1\n"); - SetCommandExitStatus(CHIP_NO_ERROR); - return; - } - - Wait(); - - // Ensure we increment mTestIndex before we start running the relevant - // command. That way if we lose the timeslice after we send the message - // but before our function call returns, we won't end up with an - // incorrect mTestIndex value observed when we get the response. - switch (mTestIndex++) { - case 0: - ChipLogProgress(chipTool, " ***** Test Step 0 : Step 1: Wait for the commissioned device to be retrieved\n"); - err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0(); - break; - case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: TH reads the MinMeasuredValue attribute from the DUT\n"); - if (ShouldSkip("RH.S.A0001")) { - NextTest(); - return; - } - err = TestStep2ThReadsTheMinMeasuredValueAttributeFromTheDut_1(); - break; - case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: TH reads the MaxMeasuredValue attribute from the DUT\n"); - if (ShouldSkip("RH.S.A0002")) { - NextTest(); - return; - } - err = TestStep3ThReadsTheMaxMeasuredValueAttributeFromTheDut_2(); - break; - case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4: TH reads the MeasuredValue attribute from the DUT\n"); - if (ShouldSkip("RH.S.A0000")) { - NextTest(); - return; - } - err = TestStep4ThReadsTheMeasuredValueAttributeFromTheDut_3(); - break; - case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : Step 5: TH reads the Tolerance attribute from the DUT\n"); - if (ShouldSkip("RH.S.A0003")) { - NextTest(); - return; - } - err = TestStep5ThReadsTheToleranceAttributeFromTheDut_4(); - break; - } - - if (CHIP_NO_ERROR != err) { - ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err)); - SetCommandExitStatus(err); - } - } - - void OnStatusUpdate(const chip::app::StatusIB & status) override - { - switch (mTestIndex - 1) { - case 0: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 1: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 2: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 3: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 4: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - } - - // Go on to the next test. - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - - chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); } - -private: - std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 5; - - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - CHIP_ERROR TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0() - { - - chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; - value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; - return WaitForCommissionee("alpha", value); - } - NSNumber * _Nullable CurrentMinMeasured; - - CHIP_ERROR TestStep2ThReadsTheMinMeasuredValueAttributeFromTheDut_1() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeMinMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 2: TH reads the MinMeasuredValue attribute from the DUT Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - if (value != nil) { - - VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("minMeasuredValue", [value unsignedShortValue], 9999U)); - } - { - CurrentMinMeasured = value; - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - NSNumber * _Nullable CurrentMaxMeasured; - - CHIP_ERROR TestStep3ThReadsTheMaxMeasuredValueAttributeFromTheDut_2() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeMaxMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 3: TH reads the MaxMeasuredValue attribute from the DUT Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - if (value != nil) { - - VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value unsignedShortValue], CurrentMinMeasured)); - VerifyOrReturn(CheckConstraintMaxValue("maxMeasuredValue", [value unsignedShortValue], 10000U)); - } - { - CurrentMaxMeasured = value; - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestStep4ThReadsTheMeasuredValueAttributeFromTheDut_3() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeMeasuredValueWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 4: TH reads the MeasuredValue attribute from the DUT Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - if (value != nil) { - - VerifyOrReturn(CheckConstraintType("measuredValue", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value unsignedShortValue], CurrentMinMeasured)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value unsignedShortValue], CurrentMaxMeasured)); - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR TestStep5ThReadsTheToleranceAttributeFromTheDut_4() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeToleranceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 5: TH reads the Tolerance attribute from the DUT Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - VerifyOrReturn(CheckConstraintType("tolerance", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("tolerance", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("tolerance", [value unsignedShortValue], 2048U)); - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } -}; - class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge { public: // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced @@ -92634,8 +92166,6 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); - VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); - VerifyOrReturn(CheckConstraintContains("attributeList", value, 3UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL)); @@ -92807,7 +92337,7 @@ class Test_TC_TCTL_1_1 : public TestCommandBridge { break; case 5: ChipLogProgress(chipTool, " ***** Test Step 5 : Step 3d: TH reads from the DUT the FeatureMap attribute. bit 2: SHALL be 1 if and only if TCTL.S.F02(A_STEP) & TCTL.S.F00(TN)\n"); - if (ShouldSkip("TCTL.S.F02 && !TCTL.S.F00")) { + if (ShouldSkip("TCTL.S.F02 && TCTL.S.F00")) { NextTest(); return; } @@ -94595,47 +94125,51 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { err = TestStep4rReadTheFeatureDependentTSTATSF05AUTOOptionalAttributeInAttributeList_52(); break; case 53: - ChipLogProgress(chipTool, " ***** Test Step 53 : Step 5a: Read Feature dependent(TSTAT.S.F03(SCH)) commands in AcceptedCommandList\n"); + ChipLogProgress(chipTool, " ***** Test Step 53 : Step 5a: Read the mandatory commands in AcceptedCommandList\n"); + err = TestStep5aReadTheMandatoryCommandsInAcceptedCommandList_53(); + break; + case 54: + ChipLogProgress(chipTool, " ***** Test Step 54 : Step 5b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in AcceptedCommandList\n"); if (ShouldSkip("TSTAT.S.F03")) { NextTest(); return; } - err = TestStep5aReadFeatureDependentTSTATSF03SCHCommandsInAcceptedCommandList_53(); + err = TestStep5bReadFeatureDependentTSTATSF03SCHCommandsInAcceptedCommandList_54(); break; - case 54: - ChipLogProgress(chipTool, " ***** Test Step 54 : Step 5b: Read the optional attribute: AcceptedCommandList\n"); + case 55: + ChipLogProgress(chipTool, " ***** Test Step 55 : Step 5c: Read the optional (GetRelayStatusLog) command in AcceptedCommandList\n"); if (ShouldSkip("TSTAT.S.C04.Rsp")) { NextTest(); return; } - err = TestStep5bReadTheOptionalAttributeAcceptedCommandList_54(); + err = TestStep5cReadTheOptionalGetRelayStatusLogCommandInAcceptedCommandList_55(); break; - case 55: - ChipLogProgress(chipTool, " ***** Test Step 55 : Step 6a: Read the global attribute: GeneratedCommandList\n"); + case 56: + ChipLogProgress(chipTool, " ***** Test Step 56 : Step 6a: Read the global attribute: GeneratedCommandList\n"); if (ShouldSkip(" !TSTAT.S.C04.Rsp && !TSTAT.S.C02.Rsp ")) { NextTest(); return; } - err = TestStep6aReadTheGlobalAttributeGeneratedCommandList_55(); + err = TestStep6aReadTheGlobalAttributeGeneratedCommandList_56(); break; - case 56: - ChipLogProgress(chipTool, " ***** Test Step 56 : Step 6b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in GeneratedCommandList\n"); + case 57: + ChipLogProgress(chipTool, " ***** Test Step 57 : Step 6b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in GeneratedCommandList\n"); if (ShouldSkip("TSTAT.S.F03")) { NextTest(); return; } - err = TestStep6bReadFeatureDependentTSTATSF03SCHCommandsInGeneratedCommandList_56(); + err = TestStep6bReadFeatureDependentTSTATSF03SCHCommandsInGeneratedCommandList_57(); break; - case 57: - ChipLogProgress(chipTool, " ***** Test Step 57 : Step 6c: Read optional command (GetRelayStatusLogResponse) in GeneratedCommandList\n"); + case 58: + ChipLogProgress(chipTool, " ***** Test Step 58 : Step 6c: Read optional command (GetRelayStatusLogResponse) in GeneratedCommandList\n"); if (ShouldSkip("TSTAT.S.C04.Rsp")) { NextTest(); return; } - err = TestStep6cReadOptionalCommandGetRelayStatusLogResponseInGeneratedCommandList_57(); + err = TestStep6cReadOptionalCommandGetRelayStatusLogResponseInGeneratedCommandList_58(); break; - case 58: - ChipLogProgress(chipTool, " ***** Test Step 58 : Step 7: Read EventList attribute from the DUT.\n"); + case 59: + ChipLogProgress(chipTool, " ***** Test Step 59 : Step 7: Read EventList attribute from the DUT.\n"); if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) { NextTest(); return; @@ -94830,6 +94364,9 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { case 58: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 59: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -94840,7 +94377,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 59; + const uint16_t mTestCount = 60; chip::Optional mNodeId; chip::Optional mCluster; @@ -95962,7 +95499,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep5aReadFeatureDependentTSTATSF03SCHCommandsInAcceptedCommandList_53() + CHIP_ERROR TestStep5aReadTheMandatoryCommandsInAcceptedCommandList_53() { MTRBaseDevice * device = GetDevice("alpha"); @@ -95970,12 +95507,32 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 5a: Read Feature dependent(TSTAT.S.F03(SCH)) commands in AcceptedCommandList Error: %@", err); + NSLog(@"Step 5a: Read the mandatory commands in AcceptedCommandList Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestStep5bReadFeatureDependentTSTATSF03SCHCommandsInAcceptedCommandList_54() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { + NSLog(@"Step 5b: Read Feature dependent(TSTAT.S.F03(SCH)) commands in AcceptedCommandList Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 3UL)); @@ -95986,7 +95543,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep5bReadTheOptionalAttributeAcceptedCommandList_54() + CHIP_ERROR TestStep5cReadTheOptionalGetRelayStatusLogCommandInAcceptedCommandList_55() { MTRBaseDevice * device = GetDevice("alpha"); @@ -95994,7 +95551,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 5b: Read the optional attribute: AcceptedCommandList Error: %@", err); + NSLog(@"Step 5c: Read the optional (GetRelayStatusLog) command in AcceptedCommandList Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -96007,7 +95564,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep6aReadTheGlobalAttributeGeneratedCommandList_55() + CHIP_ERROR TestStep6aReadTheGlobalAttributeGeneratedCommandList_56() { MTRBaseDevice * device = GetDevice("alpha"); @@ -96031,7 +95588,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep6bReadFeatureDependentTSTATSF03SCHCommandsInGeneratedCommandList_56() + CHIP_ERROR TestStep6bReadFeatureDependentTSTATSF03SCHCommandsInGeneratedCommandList_57() { MTRBaseDevice * device = GetDevice("alpha"); @@ -96052,7 +95609,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep6cReadOptionalCommandGetRelayStatusLogResponseInGeneratedCommandList_57() + CHIP_ERROR TestStep6cReadOptionalCommandGetRelayStatusLogResponseInGeneratedCommandList_58() { MTRBaseDevice * device = GetDevice("alpha"); @@ -96119,39 +95676,47 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0(); break; case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: TH read ClusterRevision attribute from the DUT\n"); - err = TestStep2ThReadClusterRevisionAttributeFromTheDut_1(); + ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: TH reads from the DUT the ClusterRevision attribute.\n"); + err = TestStep2ThReadsFromTheDutTheClusterRevisionAttribute_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: Read FeatureMap attribute from the DUT\n"); - err = TestStep3ReadFeatureMapAttributeFromTheDut_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: TH reads from the DUT the FeatureMap attribute.\n"); + err = TestStep3ThReadsFromTheDutTheFeatureMapAttribute_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4: Read the global attribute: AttributeList\n"); + ChipLogProgress(chipTool, " ***** Test Step 3 : Step 4a: TH reads from the DUT the AttributeList attribute.\n"); if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) { NextTest(); return; } - err = TestStep4ReadTheGlobalAttributeAttributeList_3(); + err = TestStep4aThReadsFromTheDutTheAttributeListAttribute_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4: Read the global attribute: AttributeList\n"); + ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4a: TH reads from the DUT the AttributeList attribute.\n"); if (ShouldSkip("!PICS_EVENT_LIST_ENABLED")) { NextTest(); return; } - err = TestStep4ReadTheGlobalAttributeAttributeList_4(); + err = TestStep4aThReadsFromTheDutTheAttributeListAttribute_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Step 5: Read the global attribute: AcceptedCommandList\n"); - err = TestStep5ReadTheGlobalAttributeAcceptedCommandList_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4b: TH reads optional attribute(ScheduleProgrammingVisibility) in AttributeList\n"); + if (ShouldSkip("TSUIC.S.A0002")) { + NextTest(); + return; + } + err = TestStep4bThReadsOptionalAttributeScheduleProgrammingVisibilityInAttributeList_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : Step 6: Read the global attribute: GeneratedCommandList\n"); - err = TestStep6ReadTheGlobalAttributeGeneratedCommandList_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : Step 5: TH reads from the DUT the AcceptedCommandList attribute.\n"); + err = TestStep5ThReadsFromTheDutTheAcceptedCommandListAttribute_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : Step 7: TH reads from the DUT the EventList attribute.\n"); + ChipLogProgress(chipTool, " ***** Test Step 7 : Step 6: TH reads from the DUT the GeneratedCommandList attribute.\n"); + err = TestStep6ThReadsFromTheDutTheGeneratedCommandListAttribute_7(); + break; + case 8: + ChipLogProgress(chipTool, " ***** Test Step 8 : Step 7: TH reads from the DUT the EventList attribute.\n"); if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) { NextTest(); return; @@ -96193,6 +95758,9 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -96203,7 +95771,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 8; + const uint16_t mTestCount = 9; chip::Optional mNodeId; chip::Optional mCluster; @@ -96218,7 +95786,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { return WaitForCommissionee("alpha", value); } - CHIP_ERROR TestStep2ThReadClusterRevisionAttributeFromTheDut_1() + CHIP_ERROR TestStep2ThReadsFromTheDutTheClusterRevisionAttribute_1() { MTRBaseDevice * device = GetDevice("alpha"); @@ -96226,7 +95794,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 2: TH read ClusterRevision attribute from the DUT Error: %@", err); + NSLog(@"Step 2: TH reads from the DUT the ClusterRevision attribute. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -96242,7 +95810,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep3ReadFeatureMapAttributeFromTheDut_2() + CHIP_ERROR TestStep3ThReadsFromTheDutTheFeatureMapAttribute_2() { MTRBaseDevice * device = GetDevice("alpha"); @@ -96250,7 +95818,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 3: Read FeatureMap attribute from the DUT Error: %@", err); + NSLog(@"Step 3: TH reads from the DUT the FeatureMap attribute. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -96266,7 +95834,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep4ReadTheGlobalAttributeAttributeList_3() + CHIP_ERROR TestStep4aThReadsFromTheDutTheAttributeListAttribute_3() { MTRBaseDevice * device = GetDevice("alpha"); @@ -96274,14 +95842,13 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err); + NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); - VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65530UL)); @@ -96295,7 +95862,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep4ReadTheGlobalAttributeAttributeList_4() + CHIP_ERROR TestStep4aThReadsFromTheDutTheAttributeListAttribute_4() { MTRBaseDevice * device = GetDevice("alpha"); @@ -96303,14 +95870,13 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 4: Read the global attribute: AttributeList Error: %@", err); + NSLog(@"Step 4a: TH reads from the DUT the AttributeList attribute. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); - VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL)); @@ -96323,7 +95889,28 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep5ReadTheGlobalAttributeAcceptedCommandList_5() + CHIP_ERROR TestStep4bThReadsOptionalAttributeScheduleProgrammingVisibilityInAttributeList_5() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { + NSLog(@"Step 4b: TH reads optional attribute(ScheduleProgrammingVisibility) in AttributeList Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); + VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestStep5ThReadsFromTheDutTheAcceptedCommandListAttribute_6() { MTRBaseDevice * device = GetDevice("alpha"); @@ -96331,7 +95918,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 5: Read the global attribute: AcceptedCommandList Error: %@", err); + NSLog(@"Step 5: TH reads from the DUT the AcceptedCommandList attribute. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -96347,7 +95934,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep6ReadTheGlobalAttributeGeneratedCommandList_6() + CHIP_ERROR TestStep6ThReadsFromTheDutTheGeneratedCommandListAttribute_7() { MTRBaseDevice * device = GetDevice("alpha"); @@ -96355,7 +95942,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { - NSLog(@"Step 6: Read the global attribute: GeneratedCommandList Error: %@", err); + NSLog(@"Step 6: TH reads from the DUT the GeneratedCommandList attribute. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -107492,7 +107079,7 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; - value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 3000UL; + value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 5000UL; return WaitForMs("alpha", value); } @@ -107844,7 +107431,7 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; - value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 3000UL; + value.ms = mFastMotionDuration.HasValue() ? mFastMotionDuration.Value() : 5000UL; return WaitForMs("alpha", value); } @@ -173834,7 +173421,6 @@ void registerCommandsTests(Commands & commands) make_unique(), make_unique(), make_unique(), - make_unique(), make_unique(), make_unique(), make_unique(), @@ -173935,7 +173521,6 @@ void registerCommandsTests(Commands & commands) make_unique(), make_unique(), make_unique(), - make_unique(), make_unique(), make_unique(), make_unique(), diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h index 85b6ca3fc694ae..2c689ce70fe83b 100644 --- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h @@ -321,7 +321,7 @@ class Test_TC_DGWIFI_3_2_SimulatedSuite : public TestCommand { case 0: { LogStep(0, "DUT sends ResetCounts command to TH"); - VerifyOrDo(!ShouldSkip("DGTHREAD.C.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); + VerifyOrDo(!ShouldSkip("DGWIFI.S.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitCommand(GetEndpoint(0), WiFiNetworkDiagnostics::Id, WiFiNetworkDiagnostics::Commands::ResetCounts::Id); } } @@ -1634,188 +1634,6 @@ class Test_TC_DGTHREAD_3_4_SimulatedSuite : public TestCommand } }; -class Test_TC_LVL_2_3_SimulatedSuite : public TestCommand -{ -public: - Test_TC_LVL_2_3_SimulatedSuite() : TestCommand("Test_TC_LVL_2_3_Simulated", 24) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_LVL_2_3_SimulatedSuite() {} - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - case 21: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; - break; - case 22: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; - break; - case 23: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; - break; - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - { - case 0: { - LogStep(0, "Read mandatory attribute CurrentLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::CurrentLevel::Id); - } - case 1: { - LogStep(1, "Read mandatory attribute OnLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnLevel::Id); - } - case 2: { - LogStep(2, "Read mandatory attribute Options"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::Options::Id); - } - case 3: { - LogStep(3, "Read optional attribute RemainingTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::RemainingTime::Id); - } - case 4: { - LogStep(4, "Read optional attribute StartUpCurrentLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::StartUpCurrentLevel::Id); - } - case 5: { - LogStep(5, "Read optional attribute CurrentFrequency"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::CurrentFrequency::Id); - } - case 6: { - LogStep(6, "Read optional attribute MinFrequency"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::MinFrequency::Id); - } - case 7: { - LogStep(7, "Read optional attribute MaxFrequency"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::MaxFrequency::Id); - } - case 8: { - LogStep(8, "Read optional attribute MinLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::MinLevel::Id); - } - case 9: { - LogStep(9, "Read optional attribute MaxLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::MaxLevel::Id); - } - case 10: { - LogStep(10, "Read optional attribute OnOffTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnOffTransitionTime::Id); - } - case 11: { - LogStep(11, "Read optional attribute OnTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnTransitionTime::Id); - } - case 12: { - LogStep(12, "Read optional attribute OffTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OffTransitionTime::Id); - } - case 13: { - LogStep(13, "Read optional attribute DefaultMoveRate"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::DefaultMoveRate::Id); - } - case 14: { - LogStep(14, "Write mandatory attribute OnLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnLevel::Id); - } - case 15: { - LogStep(15, "Write mandatory attribute Options"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::Options::Id); - } - case 16: { - LogStep(16, "Write optional attribute OnOffTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnOffTransitionTime::Id); - } - case 17: { - LogStep(17, "Write optional attribute OnTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnTransitionTime::Id); - } - case 18: { - LogStep(18, "Write optional attribute OffTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OffTransitionTime::Id); - } - case 19: { - LogStep(19, "Write optional attribute DefaultMoveRate"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::DefaultMoveRate::Id); - } - case 20: { - LogStep(20, "Write optional attribute StartUpCurrentLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::StartUpCurrentLevel::Id); - } - case 21: { - LogStep(21, - "Configure TH such that it implements mandatory and none of the optional attributes of the server-side of the " - "cluster, and that it also reflects this in global attributes such as FeatureMap and AttributeList.Commission " - "DUT to TH again"); - VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - ListFreer listFreer; - chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value; - value.message = chip::Span("Enter 'y' after successgarbage: not in length on purpose", 23); - value.expectedValue.Emplace(); - value.expectedValue.Value() = chip::Span("ygarbage: not in length on purpose", 1); - return UserPrompt(kIdentityAlpha, value); - } - case 22: { - LogStep(22, "DUT reads all supported optional attributes from TH one at a time in a manufacturer specific order"); - VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - ListFreer listFreer; - chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value; - value.message = chip::Span("Enter 'y' after successgarbage: not in length on purpose", 23); - value.expectedValue.Emplace(); - value.expectedValue.Value() = chip::Span("ygarbage: not in length on purpose", 1); - return UserPrompt(kIdentityAlpha, value); - } - case 23: { - LogStep(23, - "DUT writes a suitable value to all supported optional attributes on the TH one at a time in a manufacturer " - "specific order"); - VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - ListFreer listFreer; - chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value; - value.message = chip::Span("Enter 'y' after successgarbage: not in length on purpose", 23); - value.expectedValue.Emplace(); - value.expectedValue.Value() = chip::Span("ygarbage: not in length on purpose", 1); - return UserPrompt(kIdentityAlpha, value); - } - } - return CHIP_NO_ERROR; - } -}; - class Test_TC_OO_3_2_SimulatedSuite : public TestCommand { public: @@ -1955,10 +1773,6 @@ std::unique_ptr GetTestCommand(std::string testName) { return std::unique_ptr(new Test_TC_DGTHREAD_3_4_SimulatedSuite()); } - if (testName == "Test_TC_LVL_2_3_Simulated") - { - return std::unique_ptr(new Test_TC_LVL_2_3_SimulatedSuite()); - } if (testName == "Test_TC_OO_3_2_Simulated") { return std::unique_ptr(new Test_TC_OO_3_2_SimulatedSuite()); @@ -1984,6 +1798,5 @@ void PrintTestCommands() ChipLogError(chipTool, "\t* Test_TC_CC_7_5_Simulated"); ChipLogError(chipTool, "\t* Test_TC_CC_9_4_Simulated"); ChipLogError(chipTool, "\t* Test_TC_DGTHREAD_3_4_Simulated"); - ChipLogError(chipTool, "\t* Test_TC_LVL_2_3_Simulated"); ChipLogError(chipTool, "\t* Test_TC_OO_3_2_Simulated"); } diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h index 85b6ca3fc694ae..2c689ce70fe83b 100644 --- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h @@ -321,7 +321,7 @@ class Test_TC_DGWIFI_3_2_SimulatedSuite : public TestCommand { case 0: { LogStep(0, "DUT sends ResetCounts command to TH"); - VerifyOrDo(!ShouldSkip("DGTHREAD.C.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); + VerifyOrDo(!ShouldSkip("DGWIFI.S.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitCommand(GetEndpoint(0), WiFiNetworkDiagnostics::Id, WiFiNetworkDiagnostics::Commands::ResetCounts::Id); } } @@ -1634,188 +1634,6 @@ class Test_TC_DGTHREAD_3_4_SimulatedSuite : public TestCommand } }; -class Test_TC_LVL_2_3_SimulatedSuite : public TestCommand -{ -public: - Test_TC_LVL_2_3_SimulatedSuite() : TestCommand("Test_TC_LVL_2_3_Simulated", 24) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_LVL_2_3_SimulatedSuite() {} - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - case 21: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; - break; - case 22: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; - break; - case 23: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; - break; - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - { - case 0: { - LogStep(0, "Read mandatory attribute CurrentLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::CurrentLevel::Id); - } - case 1: { - LogStep(1, "Read mandatory attribute OnLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnLevel::Id); - } - case 2: { - LogStep(2, "Read mandatory attribute Options"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::Options::Id); - } - case 3: { - LogStep(3, "Read optional attribute RemainingTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::RemainingTime::Id); - } - case 4: { - LogStep(4, "Read optional attribute StartUpCurrentLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::StartUpCurrentLevel::Id); - } - case 5: { - LogStep(5, "Read optional attribute CurrentFrequency"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::CurrentFrequency::Id); - } - case 6: { - LogStep(6, "Read optional attribute MinFrequency"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::MinFrequency::Id); - } - case 7: { - LogStep(7, "Read optional attribute MaxFrequency"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::MaxFrequency::Id); - } - case 8: { - LogStep(8, "Read optional attribute MinLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::MinLevel::Id); - } - case 9: { - LogStep(9, "Read optional attribute MaxLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::MaxLevel::Id); - } - case 10: { - LogStep(10, "Read optional attribute OnOffTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnOffTransitionTime::Id); - } - case 11: { - LogStep(11, "Read optional attribute OnTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnTransitionTime::Id); - } - case 12: { - LogStep(12, "Read optional attribute OffTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OffTransitionTime::Id); - } - case 13: { - LogStep(13, "Read optional attribute DefaultMoveRate"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::DefaultMoveRate::Id); - } - case 14: { - LogStep(14, "Write mandatory attribute OnLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnLevel::Id); - } - case 15: { - LogStep(15, "Write mandatory attribute Options"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::Options::Id); - } - case 16: { - LogStep(16, "Write optional attribute OnOffTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnOffTransitionTime::Id); - } - case 17: { - LogStep(17, "Write optional attribute OnTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OnTransitionTime::Id); - } - case 18: { - LogStep(18, "Write optional attribute OffTransitionTime"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::OffTransitionTime::Id); - } - case 19: { - LogStep(19, "Write optional attribute DefaultMoveRate"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::DefaultMoveRate::Id); - } - case 20: { - LogStep(20, "Write optional attribute StartUpCurrentLevel"); - return WaitAttribute(GetEndpoint(1), LevelControl::Id, LevelControl::Attributes::StartUpCurrentLevel::Id); - } - case 21: { - LogStep(21, - "Configure TH such that it implements mandatory and none of the optional attributes of the server-side of the " - "cluster, and that it also reflects this in global attributes such as FeatureMap and AttributeList.Commission " - "DUT to TH again"); - VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - ListFreer listFreer; - chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value; - value.message = chip::Span("Enter 'y' after successgarbage: not in length on purpose", 23); - value.expectedValue.Emplace(); - value.expectedValue.Value() = chip::Span("ygarbage: not in length on purpose", 1); - return UserPrompt(kIdentityAlpha, value); - } - case 22: { - LogStep(22, "DUT reads all supported optional attributes from TH one at a time in a manufacturer specific order"); - VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - ListFreer listFreer; - chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value; - value.message = chip::Span("Enter 'y' after successgarbage: not in length on purpose", 23); - value.expectedValue.Emplace(); - value.expectedValue.Value() = chip::Span("ygarbage: not in length on purpose", 1); - return UserPrompt(kIdentityAlpha, value); - } - case 23: { - LogStep(23, - "DUT writes a suitable value to all supported optional attributes on the TH one at a time in a manufacturer " - "specific order"); - VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - ListFreer listFreer; - chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value; - value.message = chip::Span("Enter 'y' after successgarbage: not in length on purpose", 23); - value.expectedValue.Emplace(); - value.expectedValue.Value() = chip::Span("ygarbage: not in length on purpose", 1); - return UserPrompt(kIdentityAlpha, value); - } - } - return CHIP_NO_ERROR; - } -}; - class Test_TC_OO_3_2_SimulatedSuite : public TestCommand { public: @@ -1955,10 +1773,6 @@ std::unique_ptr GetTestCommand(std::string testName) { return std::unique_ptr(new Test_TC_DGTHREAD_3_4_SimulatedSuite()); } - if (testName == "Test_TC_LVL_2_3_Simulated") - { - return std::unique_ptr(new Test_TC_LVL_2_3_SimulatedSuite()); - } if (testName == "Test_TC_OO_3_2_Simulated") { return std::unique_ptr(new Test_TC_OO_3_2_SimulatedSuite()); @@ -1984,6 +1798,5 @@ void PrintTestCommands() ChipLogError(chipTool, "\t* Test_TC_CC_7_5_Simulated"); ChipLogError(chipTool, "\t* Test_TC_CC_9_4_Simulated"); ChipLogError(chipTool, "\t* Test_TC_DGTHREAD_3_4_Simulated"); - ChipLogError(chipTool, "\t* Test_TC_LVL_2_3_Simulated"); ChipLogError(chipTool, "\t* Test_TC_OO_3_2_Simulated"); } From d7a9833bb4b4b41c27f593f85719e1e5fd1c51fc Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Mon, 2 Oct 2023 16:13:50 +0300 Subject: [PATCH 05/10] [Telink] Update Docker image (Zephyr update) (#29528) --- integrations/docker/images/base/chip-build/version | 2 +- integrations/docker/images/stage-2/chip-build-telink/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index e6464c27c33fa2..836a52071db553 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -15 : [Silabs] Adds fix for SLC CLI path +16 : [Telink] Update Docker image (Zephyr update) diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile index 040a5b32bba096..018344aa4378e6 100644 --- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile @@ -24,7 +24,7 @@ RUN set -x \ && : # last line # Setup Zephyr -ARG ZEPHYR_REVISION=31278e7f9a0103e369e9255f921e04986eb57eb3 +ARG ZEPHYR_REVISION=5e5f3cfde3fb5070b2e6cfb8ab08bc688b5aa3d4 WORKDIR /opt/telink/zephyrproject RUN set -x \ && python3 -m pip install -U --no-cache-dir \ From e645c7cb3193973566b701bc59b261c31f65a1c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:23:22 -0400 Subject: [PATCH 06/10] Bump third_party/libwebsockets/repo from `7ef2065` to `4144c1e` (#29522) Bumps [third_party/libwebsockets/repo](https://github.com/warmcat/libwebsockets) from `7ef2065` to `4144c1e`. - [Commits](https://github.com/warmcat/libwebsockets/compare/7ef2065fdf38f74d196238ebc618b7009e25e408...4144c1e61bfc69b08f52e727f687430026ebb608) --- updated-dependencies: - dependency-name: third_party/libwebsockets/repo dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- third_party/libwebsockets/repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libwebsockets/repo b/third_party/libwebsockets/repo index 7ef2065fdf38f7..4144c1e61bfc69 160000 --- a/third_party/libwebsockets/repo +++ b/third_party/libwebsockets/repo @@ -1 +1 @@ -Subproject commit 7ef2065fdf38f74d196238ebc618b7009e25e408 +Subproject commit 4144c1e61bfc69b08f52e727f687430026ebb608 From 3f891a7d41a2c1d26a2b4e7e70b467399cdbbccf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:24:44 -0400 Subject: [PATCH 07/10] Bump third_party/openthread/repo from `f0530af` to `eaa6261` (#29524) Bumps [third_party/openthread/repo](https://github.com/openthread/openthread) from `f0530af` to `eaa6261`. - [Release notes](https://github.com/openthread/openthread/releases) - [Commits](https://github.com/openthread/openthread/compare/f0530afa37bf0eff42001a7251b141e5678b1728...eaa62613a59392551b761c275e8cd05cbb5898f7) --- updated-dependencies: - dependency-name: third_party/openthread/repo dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- third_party/openthread/repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/openthread/repo b/third_party/openthread/repo index f0530afa37bf0e..eaa62613a59392 160000 --- a/third_party/openthread/repo +++ b/third_party/openthread/repo @@ -1 +1 @@ -Subproject commit f0530afa37bf0eff42001a7251b141e5678b1728 +Subproject commit eaa62613a59392551b761c275e8cd05cbb5898f7 From 7013b09a6235fa48c69e5ce5f751d2860ef26b93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:25:56 -0400 Subject: [PATCH 08/10] Bump third_party/mbedtls/repo from `b53e630` to `da635ab` (#29527) Bumps [third_party/mbedtls/repo](https://github.com/ARMmbed/mbedtls) from `b53e630` to `da635ab`. - [Release notes](https://github.com/ARMmbed/mbedtls/releases) - [Commits](https://github.com/ARMmbed/mbedtls/compare/b53e630d8a4ccab0bbc24be365b9b3b2e971111b...da635ab65760bf1d6fe4abf0121aab2b6d2a5bad) --- updated-dependencies: - dependency-name: third_party/mbedtls/repo dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- third_party/mbedtls/repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/mbedtls/repo b/third_party/mbedtls/repo index b53e630d8a4cca..da635ab65760bf 160000 --- a/third_party/mbedtls/repo +++ b/third_party/mbedtls/repo @@ -1 +1 @@ -Subproject commit b53e630d8a4ccab0bbc24be365b9b3b2e971111b +Subproject commit da635ab65760bf1d6fe4abf0121aab2b6d2a5bad From 4fa372163b1c69a8697d5cbdd73e5ee91b85a75a Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 2 Oct 2023 11:02:00 -0400 Subject: [PATCH 09/10] Remove usage of `__has_include` and usage of `USE_ZAP_CONFIG` (#29492) * Start removing split defines and setups for InitDataModelHandler * Restyle * Add EmptyDataModelHandler to Matter.framework. --------- Co-authored-by: Andrei Litvin Co-authored-by: Boris Zbarsky --- examples/all-clusters-app/ameba/chip_main.cmake | 1 - examples/all-clusters-minimal-app/ameba/chip_main.cmake | 1 - examples/chef/ameba/chip_main.cmake | 1 - examples/light-switch-app/ameba/chip_main.cmake | 1 - examples/lighting-app/ameba/chip_main.cmake | 1 - examples/ota-requestor-app/ameba/chip_main.cmake | 1 - examples/pigweed-app/ameba/chip_main.cmake | 1 - src/app/util/DataModelHandler.cpp | 5 ----- src/controller/BUILD.gn | 7 ++++++- src/controller/EmptyDataModelHandler.cpp | 2 +- src/darwin/Framework/Matter.xcodeproj/project.pbxproj | 6 ++++++ 11 files changed, 13 insertions(+), 14 deletions(-) diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake index 3a3d2429f6e5bd..f105d3efe41a44 100755 --- a/examples/all-clusters-app/ameba/chip_main.cmake +++ b/examples/all-clusters-app/ameba/chip_main.cmake @@ -259,7 +259,6 @@ list( -DINET_CONFIG_ENABLE_IPV4=0 -DCHIP_PROJECT=1 -DCHIP_DEVICE_LAYER_TARGET=Ameba - -DUSE_ZAP_CONFIG -DCHIP_HAVE_CONFIG_H -DMBEDTLS_CONFIG_FILE= -DCHIP_SHELL_MAX_TOKENS=11 diff --git a/examples/all-clusters-minimal-app/ameba/chip_main.cmake b/examples/all-clusters-minimal-app/ameba/chip_main.cmake index 6eed28e5dec0da..acd5032e661fbf 100755 --- a/examples/all-clusters-minimal-app/ameba/chip_main.cmake +++ b/examples/all-clusters-minimal-app/ameba/chip_main.cmake @@ -220,7 +220,6 @@ list( -DINET_CONFIG_ENABLE_IPV4=0 -DCHIP_PROJECT=1 -DCHIP_DEVICE_LAYER_TARGET=Ameba - -DUSE_ZAP_CONFIG -DCHIP_HAVE_CONFIG_H -DMBEDTLS_CONFIG_FILE= ) diff --git a/examples/chef/ameba/chip_main.cmake b/examples/chef/ameba/chip_main.cmake index bc4ef4a9308bc1..de17e0534cb7cd 100755 --- a/examples/chef/ameba/chip_main.cmake +++ b/examples/chef/ameba/chip_main.cmake @@ -87,7 +87,6 @@ list( -DINET_CONFIG_ENABLE_IPV4=0 -DCHIP_PROJECT=1 -DCHIP_DEVICE_LAYER_TARGET=Ameba - -DUSE_ZAP_CONFIG -DCHIP_HAVE_CONFIG_H -DMBEDTLS_CONFIG_FILE= -DCHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID=${CONFIG_DEVICE_PRODUCT_ID} diff --git a/examples/light-switch-app/ameba/chip_main.cmake b/examples/light-switch-app/ameba/chip_main.cmake index 71deaa9938e494..78f3c8c755f488 100755 --- a/examples/light-switch-app/ameba/chip_main.cmake +++ b/examples/light-switch-app/ameba/chip_main.cmake @@ -248,7 +248,6 @@ list( -DINET_CONFIG_ENABLE_IPV4=0 -DCHIP_PROJECT=1 -DCHIP_DEVICE_LAYER_TARGET=Ameba - -DUSE_ZAP_CONFIG -DCHIP_HAVE_CONFIG_H -DMBEDTLS_CONFIG_FILE= ) diff --git a/examples/lighting-app/ameba/chip_main.cmake b/examples/lighting-app/ameba/chip_main.cmake index 727b7e4d554868..146ba5dbe934e7 100755 --- a/examples/lighting-app/ameba/chip_main.cmake +++ b/examples/lighting-app/ameba/chip_main.cmake @@ -243,7 +243,6 @@ list( -DINET_CONFIG_ENABLE_IPV4=0 -DCHIP_PROJECT=1 -DCHIP_DEVICE_LAYER_TARGET=Ameba - -DUSE_ZAP_CONFIG -DCHIP_HAVE_CONFIG_H -DMBEDTLS_CONFIG_FILE= ) diff --git a/examples/ota-requestor-app/ameba/chip_main.cmake b/examples/ota-requestor-app/ameba/chip_main.cmake index ed14a6424eab40..cffc1339536d53 100644 --- a/examples/ota-requestor-app/ameba/chip_main.cmake +++ b/examples/ota-requestor-app/ameba/chip_main.cmake @@ -74,7 +74,6 @@ list( -DINET_CONFIG_ENABLE_IPV4=0 -DCHIP_PROJECT=1 -DCHIP_DEVICE_LAYER_TARGET=Ameba - -DUSE_ZAP_CONFIG -DCHIP_HAVE_CONFIG_H -DMBEDTLS_CONFIG_FILE= ) diff --git a/examples/pigweed-app/ameba/chip_main.cmake b/examples/pigweed-app/ameba/chip_main.cmake index 1f0db465a6878b..d70bbb7b0c1ce4 100644 --- a/examples/pigweed-app/ameba/chip_main.cmake +++ b/examples/pigweed-app/ameba/chip_main.cmake @@ -82,7 +82,6 @@ list( -DINET_CONFIG_ENABLE_IPV4=0 -DCHIP_PROJECT=1 -DCHIP_DEVICE_LAYER_TARGET=Ameba - -DUSE_ZAP_CONFIG -DCHIP_HAVE_CONFIG_H -DMBEDTLS_CONFIG_FILE= -DCONFIG_ENABLE_PW_RPC=1 diff --git a/src/app/util/DataModelHandler.cpp b/src/app/util/DataModelHandler.cpp index 990e8a5ceb67b5..8a37bd4cd7f5a9 100644 --- a/src/app/util/DataModelHandler.cpp +++ b/src/app/util/DataModelHandler.cpp @@ -22,20 +22,15 @@ #include -#if __has_include() -#define USE_ZAP_CONFIG 1 #include #include -#endif #include using namespace ::chip; void InitDataModelHandler() { -#ifdef USE_ZAP_CONFIG ChipLogProgress(Zcl, "Using ZAP configuration..."); emberAfEndpointConfigure(); emberAfInit(); -#endif } diff --git a/src/controller/BUILD.gn b/src/controller/BUILD.gn index 9fcbca7ea451e2..435e405c299c97 100644 --- a/src/controller/BUILD.gn +++ b/src/controller/BUILD.gn @@ -18,6 +18,12 @@ import("${chip_root}/src/lib/lib.gni") import("${chip_root}/src/platform/device.gni") import("${chip_root}/src/platform/python.gni") +source_set("nodatamodel") { + sources = [ "EmptyDataModelHandler.cpp" ] + + public_deps = [ "${chip_root}/src/app" ] +} + static_library("controller") { output_name = "libChipController" @@ -39,7 +45,6 @@ static_library("controller") { "CommissioningDelegate.cpp", "DeviceDiscoveryDelegate.h", "DevicePairingDelegate.h", - "EmptyDataModelHandler.cpp", "ExampleOperationalCredentialsIssuer.cpp", "ExampleOperationalCredentialsIssuer.h", "SetUpCodePairer.cpp", diff --git a/src/controller/EmptyDataModelHandler.cpp b/src/controller/EmptyDataModelHandler.cpp index bd99925e82a613..8f98938175ba7b 100644 --- a/src/controller/EmptyDataModelHandler.cpp +++ b/src/controller/EmptyDataModelHandler.cpp @@ -24,4 +24,4 @@ #include -__attribute__((weak)) void InitDataModelHandler() {} +void InitDataModelHandler() {} diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj index 5c68dd1d2cba9f..0f5cf8dedc20dd 100644 --- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj +++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj @@ -179,6 +179,8 @@ 51B22C2A2740CB47008D5055 /* MTRCommandPayloadsObjc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B22C292740CB47008D5055 /* MTRCommandPayloadsObjc.mm */; }; 51C8E3F82825CDB600D47D00 /* MTRTestKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = 51C8E3F72825CDB600D47D00 /* MTRTestKeys.m */; }; 51C984622A61CE2A00B0AD9A /* MTRFabricInfoChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 51C984602A61CE2A00B0AD9A /* MTRFabricInfoChecker.m */; }; + 51CFDDB12AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CFDDB02AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp */; }; + 51CFDDB22AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CFDDB02AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp */; }; 51D10D2E2808E2CA00E8CA3D /* MTRTestStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 51D10D2D2808E2CA00E8CA3D /* MTRTestStorage.m */; }; 51E24E73274E0DAC007CCF6E /* MTRErrorTestUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E24E72274E0DAC007CCF6E /* MTRErrorTestUtils.mm */; }; 51E4D121291D0EB400C8C535 /* MTRBaseClusterUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E4D120291D0EB400C8C535 /* MTRBaseClusterUtils.h */; }; @@ -537,6 +539,7 @@ 51C8E3F72825CDB600D47D00 /* MTRTestKeys.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRTestKeys.m; sourceTree = ""; }; 51C984602A61CE2A00B0AD9A /* MTRFabricInfoChecker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRFabricInfoChecker.m; sourceTree = ""; }; 51C984612A61CE2A00B0AD9A /* MTRFabricInfoChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRFabricInfoChecker.h; sourceTree = ""; }; + 51CFDDB02AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmptyDataModelHandler.cpp; path = ../controller/EmptyDataModelHandler.cpp; sourceTree = ""; }; 51D10D2D2808E2CA00E8CA3D /* MTRTestStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRTestStorage.m; sourceTree = ""; }; 51E24E72274E0DAC007CCF6E /* MTRErrorTestUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRErrorTestUtils.mm; sourceTree = ""; }; 51E4D120291D0EB400C8C535 /* MTRBaseClusterUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRBaseClusterUtils.h; sourceTree = ""; }; @@ -956,6 +959,7 @@ isa = PBXGroup; children = ( 5143041F2914CED9004DC7FE /* generic-callback-stubs.cpp */, + 51CFDDB02AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp */, ); name = app; path = ../../../app; @@ -1668,6 +1672,7 @@ 039145E12993102B00257B3E /* main.mm in Sources */, 037C3DD42991BD5200B7EEE2 /* logging.mm in Sources */, B45374012A9FEC4F00807602 /* unix-sockets.c in Sources */, + 51CFDDB22AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp in Sources */, 03F430A82994112B00166449 /* editline.c in Sources */, B45373E92A9FEBC100807602 /* server.c in Sources */, 037C3DB32991BD5000B7EEE2 /* OpenCommissioningWindowCommand.mm in Sources */, @@ -1736,6 +1741,7 @@ 5A7947E427C0129600434CF2 /* MTRDeviceController+XPC.mm in Sources */, 5A6FEC9027B563D900F25F42 /* MTRDeviceControllerOverXPC.mm in Sources */, B289D4222639C0D300D4E314 /* MTROnboardingPayloadParser.mm in Sources */, + 51CFDDB12AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp in Sources */, 3CF134AD289D8E570017A19E /* MTRDeviceAttestationInfo.mm in Sources */, 2C1B027A2641DB4E00780EF1 /* MTROperationalCredentialsDelegate.mm in Sources */, 7560FD1C27FBBD3F005E85B3 /* MTREventTLVValueDecoder.mm in Sources */, From 188cf7da6d1ae6355a8fb1416546c5506be27b77 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 2 Oct 2023 11:03:54 -0400 Subject: [PATCH 10/10] Remove some unused CIPD packages before android compile. (#29530) This should save about 2.5GB of space. Ideally we should not download these in the first place, however I would have to figure out how to set that up. For now tested locally that compile seems to pass because we use the NDK, however CI will fully validate this. --- .github/workflows/full-android.yaml | 10 ++++++++++ .github/workflows/smoketest-android.yaml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 35b5628351b8e6..ee6fc243218531 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -59,6 +59,16 @@ jobs: with: platform: android + - name: Cleanup pigweed CIPD packages + # This should not generally be needed, however android CI runs out of space + # We do not need pigweed cross compile here because we use android NDK + # compilers, so removing rust and arm compilers saves 2.5GB + run: | + du -sh .environment/cipd/packages/pigweed/rust \ + .environment/cipd/packages/arm + + rm -rf .environment/cipd/packages/pigweed/rust \ + .environment/cipd/packages/arm - name: Build Android arm-chip-tool run: | ./scripts/run_in_build_env.sh \ diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 7dca5c975bb36e..d97d55fbd11073 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -48,6 +48,16 @@ jobs: uses: ./.github/actions/checkout-submodules-and-bootstrap with: platform: android + - name: Cleanup pigweed CIPD packages + # This should not generally be needed, however android CI runs out of space + # We do not need pigweed cross compile here because we use android NDK + # compilers, so removing rust and arm compilers saves 2.5GB + run: | + du -sh .environment/cipd/packages/pigweed/rust \ + .environment/cipd/packages/arm + + rm -rf .environment/cipd/packages/pigweed/rust \ + .environment/cipd/packages/arm - name: Build Android CHIPTool and CHIPTest (ARM64) run: |