Merge branch 'sve-2' into cherry-pick-6ca1f85f284e4545c55ab45d21e619d…

…2e6573e5a
project-chip · Aug 24, 2022 · 550f9a6 · 550f9a6
2 parents e7d0320 + bdbcb40
commit 550f9a6
Show file tree

Hide file tree

Showing 134 changed files with 5,551 additions and 2,427 deletions.
diff --git a/scripts/requirements.esp32.txt b/scripts/requirements.esp32.txt
@@ -1,12 +1,12 @@
-click>=7.0
-future>=0.15.2
-pyparsing>=2.0.3,<2.4.0
-idf-component-manager>=0.2.99-beta
-gdbgui==0.13.2.0
-pygdbmi<=0.9.0.2
-reedsolo>=1.5.3,<=1.5.4
-bitstring>=3.1.6
-ecdsa>=0.16.0
-kconfiglib==13.7.1
-construct==2.10.54
-python-socketio<5
+click>=7.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+future>=0.15.2 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+pyparsing>=2.0.3,<2.4.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+idf-component-manager>=0.2.99-beta ; platform_machine != 'aarch64' and sys_platform == 'linux'
+gdbgui==0.13.2.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+pygdbmi<=0.9.0.2 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+reedsolo>=1.5.3,<=1.5.4 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+bitstring>=3.1.6 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+ecdsa>=0.16.0 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+kconfiglib==13.7.1 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+construct==2.10.54 ; platform_machine != 'aarch64' and sys_platform == 'linux'
+python-socketio<5 ; platform_machine != 'aarch64' and sys_platform == 'linux'
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
@@ -24,6 +24,20 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Pre-Conditions"
+      verification: |
+          1.N1 is the node ID of TH1
+
+          2.N2 is the node ID of TH2
+
+          2.D_OK_EMPTY:"1718" which is an octstr of length 2 containing valid TLV:
+
+          - top-level anonymous list (empty)
+          3.D_OK_SINGLE:"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018" which is an octstr of length 50-100 containing valid TLV:
+
+          - top-level anonymous list, containing - one element with profile-specific tag in fully-qualified form
+      disabled: true
+
     - label: "TH1 commissions DUT using admin node ID N1"
       verification: |
           DUT

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml
@@ -112,7 +112,7 @@ tests:
           struct: Data field: D_OK_EMPTY : 1718"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"1718"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"1718"}]' 1 0
 
           On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element
 
@@ -209,7 +209,7 @@ tests:
           :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]' 1 0
 
           On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  .
 
@@ -338,7 +338,7 @@ tests:
           which is an octstr of length 128 containing valid TLV:"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003148656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E0018"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003148656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E0018"}]' 1 0
 
           On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element
           [1656417544.279572][3888:3893] CHIP:DMG: WriteResponseMessage =
@@ -456,7 +456,7 @@ tests:
           :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018"}]' 1 0
           On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  which Returns  CONSTRAINT_ERROR (0x87)
 
 
@@ -485,7 +485,7 @@ tests:
           struct Data field: D_BAD_STRUCT : 1518"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"1518"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"1518"}]' 1 0
 
           On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  which Returns  CONSTRAINT_ERROR (0x87)
 
@@ -512,7 +512,7 @@ tests:
           :3701D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"3701D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"3701D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]' 1 0
 
           On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element which Returns  CONSTRAINT_ERROR (0x87)
 
@@ -539,7 +539,7 @@ tests:
           :17103D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"17103D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"17103D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]' 1 0
 
           On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
 
@@ -567,7 +567,7 @@ tests:
           17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018FF"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018FF"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018FF"}]' 1 0
 
           On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
 
@@ -594,7 +594,7 @@ tests:
           :17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700"}]' 1 0
 
           On TH1(Chiptool) , Verify    AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element,  Returns  CONSTRAINT_ERROR (0x87)
 
@@ -619,7 +619,7 @@ tests:
           1.struct Data field: D_BAD_NOnE"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":""}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":""}]' 1 0
 
           On TH1(Chiptool) , Verify    AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element,  Returns  CONSTRAINT_ERROR (0x87)
 
@@ -649,7 +649,7 @@ tests:
           17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"1718"},{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"1718"},{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]' 1 0
 
           On TH1(Chiptool) , Verify  Successfully AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements and  CONSTRAINT_ERROR (0x87) for second element path
 
@@ -745,7 +745,7 @@ tests:
           value is an empty list"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[]" 1 0
+          ./chip-tool accesscontrol write extension '[]' 1 0
 
           On TH1(Chiptool) , Verify  Successfully,AccessControl cluster Extension attribute, value is an empty list