Update/Fix AVSM test scripts (#40706)

* Update/Fix AVSM test scripts based on Test plan changes in
CHIP-Specifications/chip-test-plans#5453

- This does not include the new test case 2.16 which shall be a separate
  PR.

* Apply suggestions from code review

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot <[email protected]>

Author: 3 people

src/python_testing/TC_AVSM_2_11.py

@@ -95,11 +95,16 @@ def steps_TC_AVSM_2_11(self) -> list[TestStep]:
             ),
             TestStep(
                 8,
+                "TH reads StreamUsagePriorities attribute from CameraAVStreamManagement Cluster on DUT.",
+                "Verify the list is the same as set in StreamPriorities in step 7.",
+            ),
+            TestStep(
+                9,
                 "TH sends the SetStreamPriorities command with StreamPriorities containing a StreamUsage not in aSupportedStreamUsages.",
                 "DUT responds with a DYNAMIC_CONSTRAINT_ERROR status code.",
             ),
             TestStep(
-                9,
+                10,
                 "TH sends the SetStreamPriorities command with StreamPriorities containing duplicate StreamUsage values from aSupportedStreamUsages.",
                 "DUT responds with a ALREADY_EXISTS status code.",
             ),
@@ -169,14 +174,23 @@ async def test_TC_AVSM_2_11(self):
 
         self.step(7)
         try:
+            aStreamUsagePriorities = aSupportedStreamUsages[0:1]
             await self.send_single_cmd(
-                endpoint=endpoint, cmd=commands.SetStreamPriorities(streamPriorities=(aSupportedStreamUsages))
+                endpoint=endpoint, cmd=commands.SetStreamPriorities(streamPriorities=(aStreamUsagePriorities))
             )
         except InteractionModelError as e:
             asserts.assert_equal(e.status, Status.Success, "Unexpected error returned")
             pass
 
         self.step(8)
+        readStreamUsagePriorities = await self.read_single_attribute_check_success(
+            endpoint=endpoint, cluster=cluster, attribute=attr.StreamUsagePriorities
+        )
+        logger.info(f"Rx'd StreamUsagePriorities: {readStreamUsagePriorities}")
+        asserts.assert_equal(readStreamUsagePriorities, aStreamUsagePriorities,
+                             "The read StreamUsagePriorities is different from the one set in SetStreamPriorities")
+
+        self.step(9)
         try:
             notSupportedStreamUsage = next(
                 (e for e in Globals.Enums.StreamUsageEnum if e not in aSupportedStreamUsages and e != Globals.Enums.StreamUsageEnum.kInternal), None)
@@ -194,7 +208,7 @@ async def test_TC_AVSM_2_11(self):
             )
             pass
 
-        self.step(9)
+        self.step(10)
         try:
             await self.send_single_cmd(
                 endpoint=endpoint,

src/python_testing/TC_AVSM_2_3.py

@@ -74,11 +74,16 @@ def steps_TC_AVSM_2_3(self) -> list[TestStep]:
             ),
             TestStep(
                 4,
+                "TH sends the SnapshotStreamModify command with SnapshotStreamID set to aStreamID + 1.",
+                "DUT responds with an NOT_FOUND status code.",
+            ),
+            TestStep(
+                5,
                 "TH sends the SnapshotStreamModify command with SnapshotStreamID set to aStreamID. If WMARK is supported, set WaterMarkEnabled to !aWmark`and if OSD is supported, set OSDEnabled to `!aOSD in the command.",
                 "DUT responds with a SUCCESS status code.",
             ),
             TestStep(
-                5,
+                6,
                 "TH reads AllocatedSnapshotStreams attribute from CameraAVStreamManagement Cluster on DUT",
                 "Verify the following: If WMARK is supported, verify WaterMarkEnabled == !aWmark. If OSD is supported, verify OSDEnabled == !aOSD.",
             ),
@@ -137,6 +142,19 @@ async def test_TC_AVSM_2_3(self):
             pass
 
         self.step(4)
+        try:
+            cmd = commands.SnapshotStreamModify(
+                snapshotStreamID=aStreamID + 1,
+                watermarkEnabled=None if aWmark is None else not aWmark,
+                OSDEnabled=None if aOSD is None else not aOSD,
+            )
+            await self.send_single_cmd(endpoint=endpoint, cmd=cmd)
+            asserts.fail("Unexpected success when expecting NOT_FOUND due to wrong streamID")
+        except InteractionModelError as e:
+            asserts.assert_equal(e.status, Status.NotFound, "Unexpected error when expecting NOT_FOUND")
+            pass
+
+        self.step(5)
         try:
             cmd = commands.SnapshotStreamModify(
                 snapshotStreamID=aStreamID,
@@ -148,7 +166,7 @@ async def test_TC_AVSM_2_3(self):
             asserts.assert_equal(e.status, Status.Success, "Unexpected error returned")
             pass
 
-        self.step(5)
+        self.step(6)
         aAllocatedSnapshotStreams = await self.read_single_attribute_check_success(
             endpoint=endpoint, cluster=cluster, attribute=attr.AllocatedSnapshotStreams
         )

src/python_testing/TC_AVSM_2_5.py

@@ -123,6 +123,11 @@ def steps_TC_AVSM_2_5(self) -> list[TestStep]:
                 "TH sends the AudioStreamAllocate command with values from step 6 except with AudioCodec set to 10(outside of valid range)",
                 "DUT responds with a CONSTRAINT_ERROR status code.",
             ),
+            TestStep(
+                15,
+                "TH sends the AudioStreamAllocate command with values from step 6 except with SampleRate set to a value not in aMicrophoneCapabilities",
+                "DUT responds with a DYNAMIC_CONSTRAINT_ERROR status code.",
+            ),
         ]
 
     @run_if_endpoint_matches(
@@ -219,12 +224,12 @@ async def test_TC_AVSM_2_5(self):
             )
             pass
 
+        self.step(9)
         notSupportedStreamUsage = next(
             (e for e in Globals.Enums.StreamUsageEnum if e not in aStreamUsagePriorities and e != Globals.Enums.StreamUsageEnum.kInternal),
             Globals.Enums.StreamUsageEnum.kUnknownEnumValue,
         )
 
-        self.step(9)
         try:
             adoStreamAllocateCmd = commands.AudioStreamAllocate(
                 streamUsage=notSupportedStreamUsage,
@@ -344,6 +349,26 @@ async def test_TC_AVSM_2_5(self):
             )
             pass
 
+        self.step(15)
+        try:
+            adoStreamAllocateCmd = commands.AudioStreamAllocate(
+                streamUsage=aStreamUsagePriorities[0],
+                audioCodec=aMicrophoneCapabilities.supportedCodecs[0],
+                channelCount=aMicrophoneCapabilities.maxNumberOfChannels,
+                sampleRate=aMicrophoneCapabilities.supportedSampleRates[0] + 10,
+                bitRate=aBitRate,
+                bitDepth=aMicrophoneCapabilities.supportedBitDepths[0],
+            )
+            await self.send_single_cmd(endpoint=endpoint, cmd=adoStreamAllocateCmd)
+            asserts.fail("Unexpected success when expecting DYNAMIC_CONSTRAINT_ERROR due to unsupported sample rate")
+        except InteractionModelError as e:
+            asserts.assert_equal(
+                e.status,
+                Status.DynamicConstraintError,
+                "Unexpected status returned when expecting DYNAMIC_CONSTRAINT_ERROR due to unsupported sample rate",
+            )
+            pass
+
 
 if __name__ == "__main__":
     default_matter_test_main()

src/python_testing/TC_AVSM_2_7.py

@@ -132,39 +132,49 @@ def steps_TC_AVSM_2_7(self) -> list[TestStep]:
             ),
             TestStep(
                 17,
+                "TH sends the VideoStreamAllocate command with the same arguments from step 10 except with StreamUsage set to Internal",
+                "DUT responds with a CONSTRAINT_ERROR status code.",
+            ),
+            TestStep(
+                18,
                 "TH sends the VideoStreamAllocate command with the same arguments from step 10 except StreamUsage set to a value not in aStreamUsagePriorities.",
                 "DUT responds with a INVALID IN STATE status code.",
             ),
             TestStep(
-                18,
+                19,
                 "TH sends the VideoStreamAllocate command with the same arguments from step 10 except MinFrameRate set to 0(outside of valid range).",
                 "DUT responds with a CONSTRAINT_ERROR status code.",
             ),
             TestStep(
-                19,
+                20,
                 "TH sends the VideoStreamAllocate command with the same arguments from step 10 except MinFrameRate > MaxFrameRate.",
                 "DUT responds with a CONSTRAINT_ERROR status code.",
             ),
             TestStep(
-                20,
+                21,
                 "TH sends the VideoStreamAllocate command with the same arguments from step 10 except MinBitRate set to 0(outside of valid range).",
                 "DUT responds with a CONSTRAINT_ERROR status code.",
             ),
             TestStep(
-                21,
+                22,
                 "TH sends the VideoStreamAllocate command with the same arguments from step 10 except MinBitRate > MaxBitRate.",
                 "DUT responds with a CONSTRAINT_ERROR status code.",
             ),
             TestStep(
-                22,
-                "TH sends the VideoStreamAllocate command with the same arguments from step 10 except MinKeyFrameInterval > MaxKeyFrameInterval.",
+                23,
+                "TH sends the VideoStreamAllocate command with the same arguments from step 10 except KeyFrameInterval > Max value",
                 "DUT responds with a CONSTRAINT_ERROR status code.",
             ),
             TestStep(
-                23,
+                24,
                 "TH sends the VideoStreamAllocate command with the same arguments from step 10 except VideoCodec is set to 10 (out of range).",
                 "DUT responds with a CONSTRAINT_ERROR status code.",
             ),
+            TestStep(
+                25,
+                "TH sends the VideoStreamAllocate command with the same arguments from step 10 except MaxFrameRate set to a value not in aVideoSensorParams.",
+                "DUT responds with a DYNAMIC_CONSTRAINT_ERROR status code.",
+            ),
         ]
 
     @run_if_endpoint_matches(
@@ -343,6 +353,36 @@ async def test_TC_AVSM_2_7(self):
             self.skip_step(16)
 
         self.step(17)
+        try:
+            outOfConstraintStreamUsage = Globals.Enums.StreamUsageEnum.kInternal
+            videoStreamAllocateCmd = commands.VideoStreamAllocate(
+                streamUsage=outOfConstraintStreamUsage,
+                videoCodec=aRateDistortionTradeOffPoints[0].codec,
+                minFrameRate=30,  # An acceptable value for min frame rate
+                maxFrameRate=aVideoSensorParams.maxFPS,
+                minResolution=aMinViewport,
+                maxResolution=cluster.Structs.VideoResolutionStruct(
+                    width=aVideoSensorParams.sensorWidth, height=aVideoSensorParams.sensorHeight
+                ),
+                minBitRate=aRateDistortionTradeOffPoints[0].minBitRate,
+                maxBitRate=aRateDistortionTradeOffPoints[0].minBitRate,
+                keyFrameInterval=4000,
+                watermarkEnabled=watermark,
+                OSDEnabled=osd,
+            )
+            await self.send_single_cmd(endpoint=endpoint, cmd=videoStreamAllocateCmd)
+            asserts.fail(
+                "Unexpected success when expecting CONSTRAINT_ERROR due to StreamUsage set to Internal",
+            )
+        except InteractionModelError as e:
+            asserts.assert_equal(
+                e.status,
+                Status.ConstraintError,
+                "Unexpected error returned when expecting CONSTRAINT_ERROR due to StreamUsage set to Internal",
+            )
+            pass
+
+        self.step(18)
         try:
             notSupportedStreamUsage = next(
                 (e for e in Globals.Enums.StreamUsageEnum if e not in aStreamUsagePriorities and e != Globals.Enums.StreamUsageEnum.kInternal),
@@ -375,7 +415,7 @@ async def test_TC_AVSM_2_7(self):
             )
             pass
 
-        self.step(18)
+        self.step(19)
         try:
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
@@ -402,7 +442,7 @@ async def test_TC_AVSM_2_7(self):
             )
             pass
 
-        self.step(19)
+        self.step(20)
         try:
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
@@ -429,7 +469,7 @@ async def test_TC_AVSM_2_7(self):
             )
             pass
 
-        self.step(20)
+        self.step(21)
         try:
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
@@ -456,7 +496,7 @@ async def test_TC_AVSM_2_7(self):
             )
             pass
 
-        self.step(21)
+        self.step(22)
         try:
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
@@ -483,7 +523,7 @@ async def test_TC_AVSM_2_7(self):
             )
             pass
 
-        self.step(22)
+        self.step(23)
         try:
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
@@ -494,9 +534,9 @@ async def test_TC_AVSM_2_7(self):
                 maxResolution=cluster.Structs.VideoResolutionStruct(
                     width=aVideoSensorParams.sensorWidth, height=aVideoSensorParams.sensorHeight
                 ),
-                minBitRate=aRateDistortionTradeOffPoints[0].minBitRate + 1,
+                minBitRate=aRateDistortionTradeOffPoints[0].minBitRate,
                 maxBitRate=aRateDistortionTradeOffPoints[0].minBitRate,
-                keyFrameInterval=4000 + 1,
+                keyFrameInterval=65500 + 1,
                 watermarkEnabled=watermark,
                 OSDEnabled=osd,
             )
@@ -510,7 +550,7 @@ async def test_TC_AVSM_2_7(self):
             )
             pass
 
-        self.step(23)
+        self.step(24)
         try:
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
@@ -521,7 +561,7 @@ async def test_TC_AVSM_2_7(self):
                 maxResolution=cluster.Structs.VideoResolutionStruct(
                     width=aVideoSensorParams.sensorWidth, height=aVideoSensorParams.sensorHeight
                 ),
-                minBitRate=aRateDistortionTradeOffPoints[0].minBitRate + 1,
+                minBitRate=aRateDistortionTradeOffPoints[0].minBitRate,
                 maxBitRate=aRateDistortionTradeOffPoints[0].minBitRate,
                 keyFrameInterval=4000,
                 watermarkEnabled=watermark,
@@ -537,6 +577,33 @@ async def test_TC_AVSM_2_7(self):
             )
             pass
 
+        self.step(25)
+        try:
+            videoStreamAllocateCmd = commands.VideoStreamAllocate(
+                streamUsage=aStreamUsagePriorities[0],
+                videoCodec=aRateDistortionTradeOffPoints[0].codec,
+                minFrameRate=30,  # An acceptable value for min frame rate
+                maxFrameRate=aVideoSensorParams.maxFPS + 10,
+                minResolution=aMinViewport,
+                maxResolution=cluster.Structs.VideoResolutionStruct(
+                    width=aVideoSensorParams.sensorWidth, height=aVideoSensorParams.sensorHeight
+                ),
+                minBitRate=aRateDistortionTradeOffPoints[0].minBitRate,
+                maxBitRate=aRateDistortionTradeOffPoints[0].minBitRate,
+                keyFrameInterval=4000,
+                watermarkEnabled=watermark,
+                OSDEnabled=osd,
+            )
+            await self.send_single_cmd(endpoint=endpoint, cmd=videoStreamAllocateCmd)
+            asserts.fail("Unexpected success when expecting DYNAMIC_CONSTRAINT_ERROR due to unsupported MaxFrameRate")
+        except InteractionModelError as e:
+            asserts.assert_equal(
+                e.status,
+                Status.DynamicConstraintError,
+                "Unexpected error returned when expecting DYNAMIC_CONSTRAINT_ERROR due to unsupported MaxFrameRate",
+            )
+            pass
+
 
 if __name__ == "__main__":
     default_matter_test_main()