refactor: simplify CGEN feature identifier from CGEN.S.F00(TC) to CGEN.S.F00

- Update PICS.yaml and ci-pics-values to use simplified feature ID
- Update Python test files to use new feature identifier
- Improve error messaging when commissioning feature check fails
- Affected test files: TC_CGEN_2_5 through TC_CGEN_2_11

Author: swan-amazon

src/app/tests/suites/certification/PICS.yaml

@@ -3638,7 +3638,7 @@ PICS:
     - label:
           "Does the device implement the General Commissioning cluster's terms
           and conditions feature?"
-      id: CGEN.S.F00(TC)
+      id: CGEN.S.F00
 
     - label: "The device's failsafe expiration limit."
       id: PIXIT.CGEN.FailsafeExpiryLengthSeconds

src/app/tests/suites/certification/ci-pics-values

@@ -744,7 +744,7 @@ CGEN.S.C04.Rsp=1
 CGEN.S.C05.Tx=1
 
 #Feature
-CGEN.S.F00(TC)=1
+CGEN.S.F00=1
 
 #PIXIT
 PIXIT.CGEN.FailsafeExpiryLengthSeconds=0

src/python_testing/TC_CGEN_2_10.py

@@ -48,7 +48,7 @@ def desc_TC_CGEN_2_10(self) -> str:
 
     def pics_TC_CGEN_2_10(self) -> list[str]:
         """ This function returns a list of PICS for this test case that must be True for the test to be run"""
-        return ["CGEN.S", "CGEN.S.F00(TC)"]
+        return ["CGEN.S", "CGEN.S.F00"]
 
     def steps_TC_CGEN_2_10(self) -> list[TestStep]:
         return [
@@ -68,8 +68,8 @@ async def test_TC_CGEN_2_10(self):
         commissioner: ChipDeviceCtrl.ChipDeviceController = self.default_controller
 
         self.step(0)
-        if not self.pics_guard(self.check_pics("CGEN.S.F00(TC)")):
-            self.skip_all_remaining_steps(1)
+        if not self.check_pics("CGEN.S.F00"):
+            asserts.skip('Root endpoint does not support the [commissioning] feature under test')
             return
 
         # Step 1: Begin commissioning with PASE and failsafe

src/python_testing/TC_CGEN_2_11.py

@@ -49,7 +49,7 @@ def desc_TC_CGEN_2_11(self) -> str:
 
     def pics_TC_CGEN_2_11(self) -> list[str]:
         """ This function returns a list of PICS for this test case that must be True for the test to be run"""
-        return ["CGEN.S", "CGEN.S.F00(TC)"]
+        return ["CGEN.S", "CGEN.S.F00"]
 
     def steps_TC_CGEN_2_11(self) -> list[TestStep]:
         return [
@@ -71,8 +71,8 @@ async def test_TC_CGEN_2_11(self):
         tc_user_response_to_simulate = self.matter_test_config.global_test_params['PIXIT.CGEN.RequiredTCAcknowledgements']
 
         self.step(0)
-        if not self.pics_guard(self.check_pics("CGEN.S.F00(TC)")):
-            self.skip_all_remaining_steps(1)
+        if not self.check_pics("CGEN.S.F00"):
+            asserts.skip('Root endpoint does not support the [commissioning] feature under test')
             return
 
         # Step 1: Begin commissioning with PASE and failsafe

src/python_testing/TC_CGEN_2_5.py

@@ -51,7 +51,7 @@ def desc_TC_CGEN_2_5(self) -> str:
 
     def pics_TC_CGEN_2_5(self) -> list[str]:
         """ This function returns a list of PICS for this test case that must be True for the test to be run"""
-        return ["CGEN.S", "CGEN.S.F00(TC)"]
+        return ["CGEN.S", "CGEN.S.F00"]
 
     def steps_TC_CGEN_2_5(self) -> list[TestStep]:
         return [
@@ -79,8 +79,8 @@ async def test_TC_CGEN_2_5(self):
         tc_user_response_to_simulate = self.matter_test_config.global_test_params['PIXIT.CGEN.RequiredTCAcknowledgements']
 
         self.step(0)
-        if not self.pics_guard(self.check_pics("CGEN.S.F00(TC)")):
-            self.skip_all_remaining_steps(1)
+        if not self.check_pics("CGEN.S.F00"):
+            asserts.skip('Root endpoint does not support the [commissioning] feature under test')
             return
 
         # Step 1: Begin commissioning with PASE and failsafe

src/python_testing/TC_CGEN_2_6.py

@@ -46,7 +46,7 @@ def desc_TC_CGEN_2_6(self) -> str:
 
     def pics_TC_CGEN_2_6(self) -> list[str]:
         """ This function returns a list of PICS for this test case that must be True for the test to be run"""
-        return ["CGEN.S", "CGEN.S.F00(TC)"]
+        return ["CGEN.S", "CGEN.S.F00"]
 
     def steps_TC_CGEN_2_6(self) -> list[TestStep]:
         return [
@@ -60,8 +60,8 @@ async def test_TC_CGEN_2_6(self):
         commissioner: ChipDeviceCtrl.ChipDeviceController = self.default_controller
 
         self.step(0)
-        if not self.pics_guard(self.check_pics("CGEN.S.F00(TC)")):
-            self.skip_all_remaining_steps(1)
+        if not self.check_pics("CGEN.S.F00"):
+            asserts.skip('Root endpoint does not support the [commissioning] feature under test')
             return
 
         # Step 1: Commission device without setting TC acknowledgements

src/python_testing/TC_CGEN_2_7.py

@@ -49,7 +49,7 @@ def desc_TC_CGEN_2_7(self) -> str:
 
     def pics_TC_CGEN_2_7(self) -> list[str]:
         """ This function returns a list of PICS for this test case that must be True for the test to be run"""
-        return ["CGEN.S", "CGEN.S.F00(TC)"]
+        return ["CGEN.S", "CGEN.S.F00"]
 
     def steps_TC_CGEN_2_7(self) -> list[TestStep]:
         return [
@@ -71,8 +71,8 @@ async def test_TC_CGEN_2_7(self):
         tc_user_response_to_simulate = self.matter_test_config.global_test_params['PIXIT.CGEN.RequiredTCAcknowledgements']
 
         self.step(0)
-        if not self.pics_guard(self.check_pics("CGEN.S.F00(TC)")):
-            self.skip_all_remaining_steps(1)
+        if not self.check_pics("CGEN.S.F00"):
+            asserts.skip('Root endpoint does not support the [commissioning] feature under test')
             return
 
         # Step 1: Begin commissioning with PASE and failsafe

src/python_testing/TC_CGEN_2_8.py

@@ -49,7 +49,7 @@ def desc_TC_CGEN_2_8(self) -> str:
 
     def pics_TC_CGEN_2_8(self) -> list[str]:
         """ This function returns a list of PICS for this test case that must be True for the test to be run"""
-        return ["CGEN.S", "CGEN.S.F00(TC)"]
+        return ["CGEN.S", "CGEN.S.F00"]
 
     def steps_TC_CGEN_2_8(self) -> list[TestStep]:
         return [
@@ -72,8 +72,8 @@ async def test_TC_CGEN_2_8(self):
         tc_user_response_to_simulate = self.matter_test_config.global_test_params['PIXIT.CGEN.RequiredTCAcknowledgements']
 
         self.step(0)
-        if not self.pics_guard(self.check_pics("CGEN.S.F00(TC)")):
-            self.skip_all_remaining_steps(1)
+        if not self.check_pics("CGEN.S.F00"):
+            asserts.skip('Root endpoint does not support the [commissioning] feature under test')
             return
 
         # Step 1: Begin commissioning with PASE and failsafe

src/python_testing/TC_CGEN_2_9.py

@@ -72,7 +72,7 @@ def desc_TC_CGEN_2_9(self) -> str:
 
     def pics_TC_CGEN_2_9(self) -> list[str]:
         """ This function returns a list of PICS for this test case that must be True for the test to be run"""
-        return ["CGEN.S", "CGEN.S.F00(TC)"]
+        return ["CGEN.S", "CGEN.S.F00"]
 
     def steps_TC_CGEN_2_9(self) -> list[TestStep]:
         return [
@@ -95,8 +95,8 @@ async def test_TC_CGEN_2_9(self):
         tc_user_response_to_simulate = self.matter_test_config.global_test_params['PIXIT.CGEN.RequiredTCAcknowledgements']
 
         self.step(0)
-        if not self.pics_guard(self.check_pics("CGEN.S.F00(TC)")):
-            self.skip_all_remaining_steps(1)
+        if not self.check_pics("CGEN.S.F00"):
+            asserts.skip('Root endpoint does not support the [commissioning] feature under test')
             return
 
         # Step 1: Begin commissioning with PASE and failsafe