Update of the Yaml tests, removed tests on LastConfiguredBy

lpbeliveau-silabs · lpbeliveau-silabs · commit ff8ca4ca3bb5 · 2025-03-14T15:53:35.000-04:00
diff --git a/src/app/clusters/scenes-server/scenes-server.cpp b/src/app/clusters/scenes-server/scenes-server.cpp
@@ -392,7 +392,7 @@ void AddSceneParse(CommandHandlerInterface::HandlerContext & ctx, const CommandD
         storageData.SetName(req.sceneName);
     }
 
-    auto fieldSetIter = req.extensionFieldSets.begin();
+    auto fieldSetIter = req.extensionFieldSetStructs.begin();
     uint8_t EFSCount  = 0;
     // Goes through all EFS in command
     while (fieldSetIter.Next() && EFSCount < scenes::kMaxClustersPerScene)
diff --git a/src/app/tests/suites/TestScenesFabricRemoval.yaml b/src/app/tests/suites/TestScenesFabricRemoval.yaml
@@ -249,7 +249,7 @@ tests:
                 value: 0x0001
               - name: "SceneName"
                 value: "Scene1"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value: []
       response:
           values:
@@ -272,7 +272,7 @@ tests:
                 value: 0x0000
               - name: "SceneName"
                 value: "Scene2"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value: []
       response:
           values:
@@ -296,7 +296,7 @@ tests:
                 value: 1000
               - name: "SceneName"
                 value: "Scene1"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value: []
       response:
           values:
@@ -320,7 +320,7 @@ tests:
                 value: 0x0000
               - name: "SceneName"
                 value: "Scene2"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value: []
       response:
           values:
diff --git a/src/app/tests/suites/TestScenesFabricSceneInfo.yaml b/src/app/tests/suites/TestScenesFabricSceneInfo.yaml
@@ -202,7 +202,7 @@ tests:
                 value: 1000
               - name: "SceneName"
                 value: "Scene1"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value:
                     [
                         {
@@ -303,7 +303,7 @@ tests:
                 value: 0x01
               - name: "TransitionTime"
                 value: 1000
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value:
                     [
                         {
@@ -414,7 +414,7 @@ tests:
                 value: 2000
               - name: "SceneName"
                 value: "Scene1"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value:
                     [
                         {
@@ -447,7 +447,7 @@ tests:
                 value: 0x01
               - name: "TransitionTime"
                 value: 2000
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value:
                     [
                         {
diff --git a/src/app/tests/suites/TestScenesMaxCapacity.yaml b/src/app/tests/suites/TestScenesMaxCapacity.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # !!!!!!!!!! TEST INFORMATION !!!!!!!!!!!!!!!!!!
-# This test covers multi fabric support for scenes cluster attributes such as LastConfiguredBy and FabricSceneInfo
+# This test covers multi fabric support for scenes cluster attributes such as FabricSceneInfo
 
 name: Scenes Multi-fabric testing
 
diff --git a/src/app/tests/suites/TestScenesMultiFabric.yaml b/src/app/tests/suites/TestScenesMultiFabric.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # !!!!!!!!!! TEST INFORMATION !!!!!!!!!!!!!!!!!!
-# This test covers multi fabric support for scenes cluster attributes such as LastConfiguredBy and FabricSceneInfo
+# This test covers multi fabric support for scenes cluster attributes such as FabricSceneInfo
 
 name: Scenes Multi-fabric testing
 
@@ -314,19 +314,6 @@ tests:
               - name: "GroupID"
                 value: G1
 
-    - label: "TH1 Reads LastConfiguredBy attribute"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: null
-
-    - label: "TH2 reads LastConfiguredBy attribute"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: null
-
     - label: "TH1 sends an AddScene command to DUT for Scene 1 G1"
       command: "AddScene"
       arguments:
@@ -339,7 +326,7 @@ tests:
                 value: 1000
               - name: "SceneName"
                 value: "Scene1"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value:
                     [
                         {
@@ -419,19 +406,6 @@ tests:
           value: []
           # TODO : Have FabricSceneInfo initialized on adding a new fabric
 
-    - label: "TH1 reads LastConfiguredBy attribute, should be TH1's nodeId"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
-    - label: "TH2 reads LastConfiguredBy attribute, should be TH1's nodeId"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
     - label: "TH2 sends an AddScene command to DUT for Scene 1 G1"
       identity: "beta"
       command: "AddScene"
@@ -445,7 +419,7 @@ tests:
                 value: 1000
               - name: "SceneName"
                 value: "Scene1"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value:
                     [
                         {
@@ -468,19 +442,6 @@ tests:
               - name: "SceneID"
                 value: 0x01
 
-    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdBeta
-
-    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdBeta
-
     - label: "TH2 sends a RecallScene command for Scene 1 Group 1"
       identity: "beta"
       command: "RecallScene"
@@ -548,19 +509,6 @@ tests:
               - name: "SceneIdentifierFrom"
                 value: 0x01
 
-    - label: "TH1 reads LastConfiguredBy attribute, should be TH1's nodeId"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
-    - label: "TH2 reads LastConfiguredBy attribute, should be TH1's nodeId"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
     - label: "TH2 confirms the FabricSceneInfo didn't change"
       identity: "beta"
       command: "readAttribute"
@@ -614,19 +562,6 @@ tests:
               - name: "SceneID"
                 value: 0x01
 
-    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdBeta
-
-    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdBeta
-
     - label: "TH2 confirms the FabricSceneInfo's update"
       identity: "beta"
       command: "readAttribute"
@@ -683,19 +618,6 @@ tests:
               - name: "SceneIdentifierFrom"
                 value: 0x00
 
-    - label: "TH1 reads LastConfiguredBy attribute, should be TH1's nodeId"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
-    - label: "TH2 reads LastConfiguredBy attribute, should be TH1's nodeId"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
     - label: "TH2 confirms its FabricSceneInfo remained unchanged"
       identity: "beta"
       command: "readAttribute"
@@ -789,19 +711,6 @@ tests:
               - name: "SceneID"
                 value: 0x02
 
-    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdBeta
-
-    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdBeta
-
     - label: "TH2 confirms its FabricSceneInfo was updated"
       identity: "beta"
       command: "readAttribute"
@@ -849,19 +758,6 @@ tests:
               - name: "GroupID"
                 value: G1
 
-    - label: "TH1 reads LastConfiguredBy attribute, should be TH1's nodeId"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
-    - label: "TH2 reads LastConfiguredBy attribute, should be TH1's nodeId"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
     - label: "TH2 confirms its FabricSceneInfo remained unchanged"
       identity: "beta"
       command: "readAttribute"
@@ -915,19 +811,6 @@ tests:
               - name: "SceneID"
                 value: 0x02
 
-    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdBeta
-
-    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdBeta
-
     - label: "TH2 confirms its FabricSceneInfo was updated"
       identity: "beta"
       command: "readAttribute"
@@ -974,19 +857,6 @@ tests:
               - name: "GroupID"
                 value: G2
 
-    - label: "TH1 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
-    - label: "TH2 reads LastConfiguredBy attribute, should be TH2's nodeId"
-      identity: "beta"
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          value: commissionerNodeIdAlpha
-
     - label: "TH2 confirms its FabricSceneInfo remained unchanged"
       identity: "beta"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -5924,14 +5924,12 @@ PICS:
     #
     # server / attributes
     #
-    - label: "Does the device implement the LastConfiguredBy attribute?"
-      id: S.S.A0000
 
     - label: "Does the device implement the SceneTableSize attribute?"
-      id: S.S.A0001
+      id: S.S.A0000
 
     - label: "Does the device implement the FabricSceneInfo attribute?"
-      id: S.S.A0002
+      id: S.S.A0001
 
     #
     # server / commandsReceived
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_9_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_9_1.yaml
@@ -175,7 +175,7 @@ tests:
 
     - label: "Step 4: TH sends a AddScene command to DUT with the GroupID field
           set to G1, the SceneID field set to 0x02, the TransitionTime field set
-          to 0 and the ExtensionFieldSets set to: '[{ ClusterID: 0x0008,
+          to 0 and the ExtensionFieldSetStructs set to: '[{ ClusterID: 0x0008,
           AttributeValueList: [{ AttributeID: 0x0000, ValueUnsigned8: 0x64 }]}]'
           "
       command: "AddScene"
@@ -189,7 +189,7 @@ tests:
                 value: 0
               - name: "SceneName"
                 value: "Scene1"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value:
                     [
                         {
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_7.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_7.yaml
@@ -162,7 +162,7 @@ tests:
 
     - label: "Step 4: TH sends a AddScene command to DUT with the GroupID field
           set to G1, the SceneID field set to 0x02, the TransitionTime field set
-          to 1000 (1s) and the ExtensionFieldSets set to: '[{ ClusterID: 0x0006,
+          to 1000 (1s) and the ExtensionFieldSetStructs set to: '[{ ClusterID: 0x0006,
           AttributeValueList: [{ AttributeID: 0x0000, ValueUnsigned8: 0x01 }]}]'
           "
       command: "AddScene"
@@ -176,7 +176,7 @@ tests:
                 value: 1000
               - name: "SceneName"
                 value: "Scene1"
-              - name: "ExtensionFieldSets"
+              - name: "ExtensionFieldSetStructs"
                 value:
                     [
                         {
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_1.yaml b/src/app/tests/suites/certification/Test_TC_S_2_1.yaml
@@ -32,24 +32,16 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Step 2: TH reads from the DUT the LastConfiguredBy attribute"
-      PICS: S.S.A0000
-      command: "readAttribute"
-      attribute: "LastConfiguredBy"
-      response:
-          constraints:
-              type: node_id
-
     - label: "Step 3: TH reads from the DUT the SceneTableSize attribute"
-      PICS: S.S.A0001
+      PICS: S.S.A0000
       command: "readAttribute"
       attribute: "SceneTableSize"
       response:
           constraints:
               type: int16u
 
     - label: "Step 4: TH reads from the DUT the FabricSceneInfo attribute"
-      PICS: S.S.A0002
+      PICS: S.S.A0001
       command: "readAttribute"
       attribute: "FabricSceneInfo"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ void AddSceneParse(CommandHandlerInterface::HandlerContext & ctx, const CommandD`
`392`	`392`	`storageData.SetName(req.sceneName);`
`393`	`393`	`}`
`394`	`394`
`395`		`- auto fieldSetIter = req.extensionFieldSets.begin();`
	`395`	`+ auto fieldSetIter = req.extensionFieldSetStructs.begin();`
`396`	`396`	`uint8_t EFSCount = 0;`
`397`	`397`	`// Goes through all EFS in command`
`398`	`398`	`while (fieldSetIter.Next() && EFSCount < scenes::kMaxClustersPerScene)`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ tests:`
`202`	`202`	`value: 1000`
`203`	`203`	`- name: "SceneName"`
`204`	`204`	`value: "Scene1"`
`205`		`- - name: "ExtensionFieldSets"`
	`205`	`+ - name: "ExtensionFieldSetStructs"`
`206`	`206`	`value:`
`207`	`207`	`[`
`208`	`208`	`{`
`@@ -303,7 +303,7 @@ tests:`
`303`	`303`	`value: 0x01`
`304`	`304`	`- name: "TransitionTime"`
`305`	`305`	`value: 1000`
`306`		`- - name: "ExtensionFieldSets"`
	`306`	`+ - name: "ExtensionFieldSetStructs"`
`307`	`307`	`value:`
`308`	`308`	`[`
`309`	`309`	`{`
`@@ -414,7 +414,7 @@ tests:`
`414`	`414`	`value: 2000`
`415`	`415`	`- name: "SceneName"`
`416`	`416`	`value: "Scene1"`
`417`		`- - name: "ExtensionFieldSets"`
	`417`	`+ - name: "ExtensionFieldSetStructs"`
`418`	`418`	`value:`
`419`	`419`	`[`
`420`	`420`	`{`
`@@ -447,7 +447,7 @@ tests:`
`447`	`447`	`value: 0x01`
`448`	`448`	`- name: "TransitionTime"`
`449`	`449`	`value: 2000`
`450`		`- - name: "ExtensionFieldSets"`
	`450`	`+ - name: "ExtensionFieldSetStructs"`
`451`	`451`	`value:`
`452`	`452`	`[`
`453`	`453`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5924,14 +5924,12 @@ PICS:`
`5924`	`5924`	`#`
`5925`	`5925`	`# server / attributes`
`5926`	`5926`	`#`
`5927`		`- - label: "Does the device implement the LastConfiguredBy attribute?"`
`5928`		`- id: S.S.A0000`
`5929`	`5927`
`5930`	`5928`	`- label: "Does the device implement the SceneTableSize attribute?"`
`5931`		`- id: S.S.A0001`
	`5929`	`+ id: S.S.A0000`
`5932`	`5930`
`5933`	`5931`	`- label: "Does the device implement the FabricSceneInfo attribute?"`
`5934`		`- id: S.S.A0002`
	`5932`	`+ id: S.S.A0001`
`5935`	`5933`
`5936`	`5934`	`#`
`5937`	`5935`	`# server / commandsReceived`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ tests:`
`175`	`175`
`176`	`176`	`- label: "Step 4: TH sends a AddScene command to DUT with the GroupID field`
`177`	`177`	`set to G1, the SceneID field set to 0x02, the TransitionTime field set`
`178`		`- to 0 and the ExtensionFieldSets set to: '[{ ClusterID: 0x0008,`
	`178`	`+ to 0 and the ExtensionFieldSetStructs set to: '[{ ClusterID: 0x0008,`
`179`	`179`	`AttributeValueList: [{ AttributeID: 0x0000, ValueUnsigned8: 0x64 }]}]'`
`180`	`180`	`"`
`181`	`181`	`command: "AddScene"`
`@@ -189,7 +189,7 @@ tests:`
`189`	`189`	`value: 0`
`190`	`190`	`- name: "SceneName"`
`191`	`191`	`value: "Scene1"`
`192`		`- - name: "ExtensionFieldSets"`
	`192`	`+ - name: "ExtensionFieldSetStructs"`
`193`	`193`	`value:`
`194`	`194`	`[`
`195`	`195`	`{`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ tests:`
`162`	`162`
`163`	`163`	`- label: "Step 4: TH sends a AddScene command to DUT with the GroupID field`
`164`	`164`	`set to G1, the SceneID field set to 0x02, the TransitionTime field set`
`165`		`- to 1000 (1s) and the ExtensionFieldSets set to: '[{ ClusterID: 0x0006,`
	`165`	`+ to 1000 (1s) and the ExtensionFieldSetStructs set to: '[{ ClusterID: 0x0006,`
`166`	`166`	`AttributeValueList: [{ AttributeID: 0x0000, ValueUnsigned8: 0x01 }]}]'`
`167`	`167`	`"`
`168`	`168`	`command: "AddScene"`
`@@ -176,7 +176,7 @@ tests:`
`176`	`176`	`value: 1000`
`177`	`177`	`- name: "SceneName"`
`178`	`178`	`value: "Scene1"`
`179`		`- - name: "ExtensionFieldSets"`
	`179`	`+ - name: "ExtensionFieldSetStructs"`
`180`	`180`	`value:`
`181`	`181`	`[`
`182`	`182`	`{`