From d8f0f2eae0592b0082dacb7eba46b441df1e69bd Mon Sep 17 00:00:00 2001 From: Cecille Freeman Date: Thu, 15 Dec 2022 12:40:58 -0500 Subject: [PATCH 1/6] Add automated test for TC-ACE-1.3 in python This test requires python as it requires the allocation of three controllers on one fabric with CAT tags. This cannot be specified in the yaml. --- .github/workflows/tests.yaml | 1 + src/python_testing/TC_ACE_1_3.py | 339 +++++++++++++++++++ src/python_testing/matter_testing_support.py | 35 +- 3 files changed, 374 insertions(+), 1 deletion(-) create mode 100644 src/python_testing/TC_ACE_1_3.py diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 04bbef6ff50b39..0695e2f8bf4df2 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -397,6 +397,7 @@ jobs: scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_SC_3_6.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"' scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_DA_1_7.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --bool-arg allow_sdk_dac:true"' scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1 --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_TestEventTrigger.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --bool-arg allow_sdk_dac:true"' + scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_ACE_1_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"' - name: Uploading core files uses: actions/upload-artifact@v3 if: ${{ failure() && !env.ACT }} diff --git a/src/python_testing/TC_ACE_1_3.py b/src/python_testing/TC_ACE_1_3.py new file mode 100644 index 00000000000000..43a711018233a3 --- /dev/null +++ b/src/python_testing/TC_ACE_1_3.py @@ -0,0 +1,339 @@ +# +# Copyright (c) 2022 Project CHIP Authors +# All rights reserved. +# +# 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. +# + +from matter_testing_support import MatterBaseTest, default_matter_test_main, async_test_body +from chip.interaction_model import Status, InteractionModelError +import chip.clusters as Clusters +import logging +from mobly import asserts + + +def acl_subject(cat:int) -> int: + return 0xFFFFFFFD00000000 | cat + +class TC_ACE_1_3(MatterBaseTest): + + async def write_acl(self, acl): + # This returns an attribute status + result = await self.default_controller.WriteAttribute(self.dut_node_id, [(0, Clusters.AccessControl.Attributes.Acl(acl))]) + asserts.assert_equal(result[0].Status, Status.Success, "ACL write failed") + print(result) + + async def read_descriptor_expect_success(self, th): + cluster = Clusters.Objects.Descriptor + attribute = Clusters.Descriptor.Attributes.DeviceTypeList + endpoint = 1 + await self.read_single_attribute_check_success(dev_ctrl=th, endpoint=1, cluster=cluster, attribute=attribute) + + async def read_descriptor_expect_unsupported_access(self, th): + cluster = Clusters.Objects.Descriptor + attribute = Clusters.Descriptor.Attributes.DeviceTypeList + endpoint = 1 + await self.read_single_attribute_expect_error(dev_ctrl=th, endpoint=1, cluster=cluster, attribute=attribute, error=Status.UnsupportedAccess) + + @async_test_body + async def test_TC_ACE_1_3(self): + cat1_id = 0x11110000 + cat2_id = 0x22220000 + + cat1v1 = cat1_id | 0x0001 + cat1v2 = cat1_id | 0x0002 + cat1v3 = cat1_id | 0x0003 + cat2v1 = cat2_id | 0x0001 + cat2v2 = cat2_id | 0x0002 + cat2v3 = cat2_id | 0x0003 + logging.info('cat1v1 0x%x', cat1v1); + + self.print_step(1, "Commissioning, already done") + TH0 = self.default_controller + fabric_admin = self.certificate_authority_manager.activeCaList[0].adminList[0] + + TH0_nodeid = self.matter_test_config.controller_node_id + TH1_nodeid = self.matter_test_config.controller_node_id + 1 + TH2_nodeid = self.matter_test_config.controller_node_id + 2 + TH3_nodeid = self.matter_test_config.controller_node_id + 3 + + TH1 = fabric_admin.NewController(nodeId=TH1_nodeid, + paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path), + catTags=[cat1v3]) + TH2 = fabric_admin.NewController(nodeId=TH2_nodeid, + paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path), + catTags=[cat1v2, cat2v1]) + TH3 = fabric_admin.NewController(nodeId=TH3_nodeid, + paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path), + catTags=[cat1v1, cat2v2]) + + self.print_step(2, "TH0 write sACL all view on EP1") + TH0_admin_acl = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kAdminister, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[TH0_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + all_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + acl = [TH0_admin_acl, all_view] + await self.write_acl(acl) + + self.print_step(3, "TH1 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH1) + + self.print_step(4, "TH2 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH2) + + self.print_step(5, "TH3 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH3) + + self.print_step(6, "TH0 writes ACL TH1 view on EP1") + th1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[TH1_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + acl = [TH0_admin_acl, th1_view] + await self.write_acl(acl) + self.print_step(7, "TH1 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH1) + + self.print_step(8, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH2) + + self.print_step(9, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH3) + + self.print_step(10, "TH0 writes ACL TH2 view on EP1") + th2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[TH2_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, th2_view] + await self.write_acl(acl) + self.print_step(11, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH1) + + self.print_step(12, "TH2 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH2) + + self.print_step(13, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH3) + + + self.print_step(14, "TH0 writes ACL TH3 view on EP1") + th3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[TH3_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, th3_view] + await self.write_acl(acl) + self.print_step(15, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH1) + + self.print_step(16, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH2) + + self.print_step(17, "TH3 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH3) + + self.print_step(18, "TH0 writes ACL TH1 TH2 view on EP1") + th12_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[TH1_nodeid, TH2_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, th12_view] + await self.write_acl(acl) + self.print_step(19, "TH1 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH1) + + self.print_step(20, "TH2 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH2) + + self.print_step(21, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH3) + + + self.print_step(22, "TH0 writes ACL TH1 TH3 view on EP1") + th13_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[TH1_nodeid, TH3_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, th13_view] + await self.write_acl(acl) + self.print_step(23, "TH1 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH1) + + self.print_step(24, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH2) + + self.print_step(25, "TH3 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH3) + + + self.print_step(26, "TH0 writes ACL TH2 TH3 view on EP1") + th23_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[TH2_nodeid, TH3_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, th23_view] + await self.write_acl(acl) + self.print_step(27, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH1) + + self.print_step(28, "TH2 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH2) + + self.print_step(29, "TH3 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH3) + + + self.print_step(30, "TH0 writes ACL TH1 TH2 TH3 view on EP1") + th123_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[TH1_nodeid, TH2_nodeid, TH3_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, th123_view] + await self.write_acl(acl) + self.print_step(31, "TH1 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH1) + + self.print_step(32, "TH2 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH2) + + self.print_step(33, "TH3 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH3) + + self.print_step(34, "TH0 writes ACL cat1v1 view on EP1") + cat1v1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[acl_subject(cat1v1)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + acl = [TH0_admin_acl, cat1v1_view] + await self.write_acl(acl) + + self.print_step(35, "TH1 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH1) + + self.print_step(36, "TH2 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH2) + + self.print_step(37, "TH3 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH3) + + self.print_step(38, "TH0 writes ACL cat1v2 view on EP1") + cat1v2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[acl_subject(cat1v2)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, cat1v2_view] + await self.write_acl(acl) + + self.print_step(39, "TH1 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH1) + + self.print_step(40, "TH2 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH2) + + self.print_step(41, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH3) + + + self.print_step(42, "TH0 writes ACL cat1v3 view on EP1") + cat1v3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[acl_subject(cat1v3)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, cat1v3_view] + await self.write_acl(acl) + + self.print_step(43, "TH1 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH1) + + self.print_step(44, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH2) + + self.print_step(45, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH3) + + + self.print_step(46, "TH0 writes ACL cat2v1 view on EP1") + cat2v1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[acl_subject(cat2v1)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, cat2v1_view] + await self.write_acl(acl) + + self.print_step(47, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH1) + + self.print_step(48, "TH2 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH2) + + self.print_step(49, "TH3 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH3) + + self.print_step(50, "TH0 writes ACL cat2v2 view on EP1") + cat2v2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[acl_subject(cat2v2)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, cat2v2_view] + await self.write_acl(acl) + + self.print_step(51, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH1) + + self.print_step(52, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH2) + + self.print_step(53, "TH3 reads EP1 descriptor - expect SUCCESS") + await self.read_descriptor_expect_success(TH3) + + + self.print_step(54, "TH0 writes ACL cat2v3 view on EP1") + cat2v3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, + authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + subjects=[acl_subject(cat2v3)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + + acl = [TH0_admin_acl, cat2v3_view] + await self.write_acl(acl) + + self.print_step(55, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH1) + + self.print_step(56, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH2) + + self.print_step(57, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + await self.read_descriptor_expect_unsupported_access(TH3) + + self.print_step(58, "TH0 writes ACL back to default") + + acl = [TH0_admin_acl] + await self.write_acl(acl) + +if __name__ == "__main__": + default_matter_test_main() diff --git a/src/python_testing/matter_testing_support.py b/src/python_testing/matter_testing_support.py index e558d5389ba2da..5f8a17397ace1a 100644 --- a/src/python_testing/matter_testing_support.py +++ b/src/python_testing/matter_testing_support.py @@ -21,6 +21,7 @@ from chip import ChipDeviceCtrl import chip.clusters as Clusters from chip.ChipStack import * +from chip.interaction_model import Status, InteractionModelError from chip.storage import PersistentStorage import chip.logging import chip.native @@ -39,6 +40,7 @@ import uuid import asyncio +from mobly import asserts from mobly import base_test from mobly.config_parser import TestRunConfig, ENV_MOBLY_LOGPATH from mobly import logger @@ -58,7 +60,7 @@ _DEFAULT_STORAGE_PATH = "admin_storage.json" _DEFAULT_LOG_PATH = "/tmp/matter_testing/logs" _DEFAULT_CONTROLLER_NODE_ID = 112233 -_DEFAULT_DUT_NODE_ID = 111 +_DEFAULT_DUT_NODE_ID = 0x12344321 _DEFAULT_TRUST_ROOT_INDEX = 1 # Mobly cannot deal with user config passing of ctypes objects, @@ -268,6 +270,37 @@ async def read_single_attribute(self, dev_ctrl: ChipDeviceCtrl, node_id: int, en data = result[endpoint] return list(data.values())[0][attribute] + async def read_single_attribute_check_success(self, cluster: object, attribute: object, dev_ctrl: ChipDeviceCtrl=None, node_id: int=None, endpoint: int=0) -> object: + if dev_ctrl is None: + dev_ctrl = self.default_controller + if node_id is None: + node_id = self.dut_node_id + + result = await dev_ctrl.ReadAttribute(node_id, [(endpoint, attribute)]) + attr_ret = result[endpoint][cluster][attribute] + err_msg = "Error reading {}:{}".format(str(cluster), str(attribute)) + asserts.assert_true(attr_ret is not None, err_msg) + asserts.assert_false(isinstance(attr_ret, Clusters.Attribute.ValueDecodeFailure), err_msg) + return attr_ret + + async def read_single_attribute_expect_error(self, cluster: object, attribute: object, error: Status, dev_ctrl: ChipDeviceCtrl=None, node_id: int=None, endpoint: int=0) -> object: + if dev_ctrl is None: + dev_ctrl = self.default_controller + if node_id is None: + node_id = self.dut_node_id + + result = await dev_ctrl.ReadAttribute(node_id, [(endpoint, attribute)]) + attr_ret = result[endpoint][cluster][attribute] + err_msg = "Did not see expected error when reading {}:{}".format(str(cluster), str(attribute)) + asserts.assert_true(attr_ret is not None, err_msg) + asserts.assert_true(isinstance(attr_ret, Clusters.Attribute.ValueDecodeFailure), err_msg) + asserts.assert_true(isinstance(attr_ret.Reason, InteractionModelError), err_msg) + asserts.assert_equal(attr_ret.Reason.status, error, err_msg) + return attr_ret + + def print_step(self, stepnum: int, title:str) -> None: + logging.info('***** Test Step %d : %s', stepnum, title) + def generate_mobly_test_config(matter_test_config: MatterTestConfig): test_run_config = TestRunConfig() From 1703ae6dc6b55b9699dbe0beb09fa42868b53214 Mon Sep 17 00:00:00 2001 From: Cecille Freeman Date: Fri, 16 Dec 2022 12:52:25 -0500 Subject: [PATCH 2/6] Use EP0 only --- src/python_testing/TC_ACE_1_3.py | 148 +++++++++++++++---------------- 1 file changed, 73 insertions(+), 75 deletions(-) diff --git a/src/python_testing/TC_ACE_1_3.py b/src/python_testing/TC_ACE_1_3.py index 43a711018233a3..f9ce8bb70520ef 100644 --- a/src/python_testing/TC_ACE_1_3.py +++ b/src/python_testing/TC_ACE_1_3.py @@ -36,14 +36,12 @@ async def write_acl(self, acl): async def read_descriptor_expect_success(self, th): cluster = Clusters.Objects.Descriptor attribute = Clusters.Descriptor.Attributes.DeviceTypeList - endpoint = 1 - await self.read_single_attribute_check_success(dev_ctrl=th, endpoint=1, cluster=cluster, attribute=attribute) + await self.read_single_attribute_check_success(dev_ctrl=th, endpoint=0, cluster=cluster, attribute=attribute) async def read_descriptor_expect_unsupported_access(self, th): cluster = Clusters.Objects.Descriptor attribute = Clusters.Descriptor.Attributes.DeviceTypeList - endpoint = 1 - await self.read_single_attribute_expect_error(dev_ctrl=th, endpoint=1, cluster=cluster, attribute=attribute, error=Status.UnsupportedAccess) + await self.read_single_attribute_expect_error(dev_ctrl=th, endpoint=0, cluster=cluster, attribute=attribute, error=Status.UnsupportedAccess) @async_test_body async def test_TC_ACE_1_3(self): @@ -77,257 +75,257 @@ async def test_TC_ACE_1_3(self): paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path), catTags=[cat1v1, cat2v2]) - self.print_step(2, "TH0 write sACL all view on EP1") + self.print_step(2, "TH0 writes ACL all view on PIXIT.ACE.TESTENDPOINT") TH0_admin_acl = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kAdminister, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[TH0_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0, cluster=0x001f)]) all_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, all_view] await self.write_acl(acl) - self.print_step(3, "TH1 reads EP1 descriptor - expect SUCCESS") + self.print_step(3, "TH1 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH1) - self.print_step(4, "TH2 reads EP1 descriptor - expect SUCCESS") + self.print_step(4, "TH2 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH2) - self.print_step(5, "TH3 reads EP1 descriptor - expect SUCCESS") + self.print_step(5, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(6, "TH0 writes ACL TH1 view on EP1") + self.print_step(6, "TH0 writes ACL TH1 view on EP0") th1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[TH1_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th1_view] await self.write_acl(acl) - self.print_step(7, "TH1 reads EP1 descriptor - expect SUCCESS") + self.print_step(7, "TH1 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH1) - self.print_step(8, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(8, "TH2 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH2) - self.print_step(9, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(9, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) - self.print_step(10, "TH0 writes ACL TH2 view on EP1") + self.print_step(10, "TH0 writes ACL TH2 view on EP0") th2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[TH2_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th2_view] await self.write_acl(acl) - self.print_step(11, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(11, "TH1 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH1) - self.print_step(12, "TH2 reads EP1 descriptor - expect SUCCESS") + self.print_step(12, "TH2 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH2) - self.print_step(13, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(13, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) - self.print_step(14, "TH0 writes ACL TH3 view on EP1") + self.print_step(14, "TH0 writes ACL TH3 view on EP0") th3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[TH3_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th3_view] await self.write_acl(acl) - self.print_step(15, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(15, "TH1 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH1) - self.print_step(16, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(16, "TH2 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH2) - self.print_step(17, "TH3 reads EP1 descriptor - expect SUCCESS") + self.print_step(17, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(18, "TH0 writes ACL TH1 TH2 view on EP1") + self.print_step(18, "TH0 writes ACL TH1 TH2 view on EP0") th12_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[TH1_nodeid, TH2_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th12_view] await self.write_acl(acl) - self.print_step(19, "TH1 reads EP1 descriptor - expect SUCCESS") + self.print_step(19, "TH1 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH1) - self.print_step(20, "TH2 reads EP1 descriptor - expect SUCCESS") + self.print_step(20, "TH2 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH2) - self.print_step(21, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(21, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) - self.print_step(22, "TH0 writes ACL TH1 TH3 view on EP1") + self.print_step(22, "TH0 writes ACL TH1 TH3 view on EP0") th13_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[TH1_nodeid, TH3_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th13_view] await self.write_acl(acl) - self.print_step(23, "TH1 reads EP1 descriptor - expect SUCCESS") + self.print_step(23, "TH1 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH1) - self.print_step(24, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(24, "TH2 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH2) - self.print_step(25, "TH3 reads EP1 descriptor - expect SUCCESS") + self.print_step(25, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(26, "TH0 writes ACL TH2 TH3 view on EP1") + self.print_step(26, "TH0 writes ACL TH2 TH3 view on EP0") th23_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[TH2_nodeid, TH3_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th23_view] await self.write_acl(acl) - self.print_step(27, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(27, "TH1 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH1) - self.print_step(28, "TH2 reads EP1 descriptor - expect SUCCESS") + self.print_step(28, "TH2 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH2) - self.print_step(29, "TH3 reads EP1 descriptor - expect SUCCESS") + self.print_step(29, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(30, "TH0 writes ACL TH1 TH2 TH3 view on EP1") + self.print_step(30, "TH0 writes ACL TH1 TH2 TH3 view on EP0") th123_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[TH1_nodeid, TH2_nodeid, TH3_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th123_view] await self.write_acl(acl) - self.print_step(31, "TH1 reads EP1 descriptor - expect SUCCESS") + self.print_step(31, "TH1 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH1) - self.print_step(32, "TH2 reads EP1 descriptor - expect SUCCESS") + self.print_step(32, "TH2 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH2) - self.print_step(33, "TH3 reads EP1 descriptor - expect SUCCESS") + self.print_step(33, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(34, "TH0 writes ACL cat1v1 view on EP1") + self.print_step(34, "TH0 writes ACL cat1v1 view on EP0") cat1v1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat1v1)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v1_view] await self.write_acl(acl) - self.print_step(35, "TH1 reads EP1 descriptor - expect SUCCESS") + self.print_step(35, "TH1 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH1) - self.print_step(36, "TH2 reads EP1 descriptor - expect SUCCESS") + self.print_step(36, "TH2 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH2) - self.print_step(37, "TH3 reads EP1 descriptor - expect SUCCESS") + self.print_step(37, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(38, "TH0 writes ACL cat1v2 view on EP1") + self.print_step(38, "TH0 writes ACL cat1v2 view on EP0") cat1v2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat1v2)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v2_view] await self.write_acl(acl) - self.print_step(39, "TH1 reads EP1 descriptor - expect SUCCESS") + self.print_step(39, "TH1 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH1) - self.print_step(40, "TH2 reads EP1 descriptor - expect SUCCESS") + self.print_step(40, "TH2 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH2) - self.print_step(41, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(41, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) - self.print_step(42, "TH0 writes ACL cat1v3 view on EP1") + self.print_step(42, "TH0 writes ACL cat1v3 view on EP0") cat1v3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat1v3)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v3_view] await self.write_acl(acl) - self.print_step(43, "TH1 reads EP1 descriptor - expect SUCCESS") + self.print_step(43, "TH1 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH1) - self.print_step(44, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(44, "TH2 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH2) - self.print_step(45, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(45, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) - self.print_step(46, "TH0 writes ACL cat2v1 view on EP1") + self.print_step(46, "TH0 writes ACL cat2v1 view on EP0") cat2v1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat2v1)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat2v1_view] await self.write_acl(acl) - self.print_step(47, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(47, "TH1 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH1) - self.print_step(48, "TH2 reads EP1 descriptor - expect SUCCESS") + self.print_step(48, "TH2 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH2) - self.print_step(49, "TH3 reads EP1 descriptor - expect SUCCESS") + self.print_step(49, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(50, "TH0 writes ACL cat2v2 view on EP1") + self.print_step(50, "TH0 writes ACL cat2v2 view on EP0") cat2v2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat2v2)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat2v2_view] await self.write_acl(acl) - self.print_step(51, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(51, "TH1 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH1) - self.print_step(52, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(52, "TH2 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH2) - self.print_step(53, "TH3 reads EP1 descriptor - expect SUCCESS") + self.print_step(53, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(54, "TH0 writes ACL cat2v3 view on EP1") + self.print_step(54, "TH0 writes ACL cat2v3 view on EP0") cat2v3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat2v3)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=1)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat2v3_view] await self.write_acl(acl) - self.print_step(55, "TH1 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(55, "TH1 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH1) - self.print_step(56, "TH2 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(56, "TH2 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH2) - self.print_step(57, "TH3 reads EP1 descriptor - expect UNSUPPORTED_ACCESS") + self.print_step(57, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) self.print_step(58, "TH0 writes ACL back to default") From 0ec0c161fa69ce9125eb3d8521815ec826d9adbb Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 16 Dec 2022 17:53:16 +0000 Subject: [PATCH 3/6] Restyled by autopep8 --- src/python_testing/TC_ACE_1_3.py | 25 ++++++++------------ src/python_testing/matter_testing_support.py | 6 ++--- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/python_testing/TC_ACE_1_3.py b/src/python_testing/TC_ACE_1_3.py index f9ce8bb70520ef..2688bd4b92cb43 100644 --- a/src/python_testing/TC_ACE_1_3.py +++ b/src/python_testing/TC_ACE_1_3.py @@ -22,9 +22,10 @@ from mobly import asserts -def acl_subject(cat:int) -> int: +def acl_subject(cat: int) -> int: return 0xFFFFFFFD00000000 | cat + class TC_ACE_1_3(MatterBaseTest): async def write_acl(self, acl): @@ -54,7 +55,7 @@ async def test_TC_ACE_1_3(self): cat2v1 = cat2_id | 0x0001 cat2v2 = cat2_id | 0x0002 cat2v3 = cat2_id | 0x0003 - logging.info('cat1v1 0x%x', cat1v1); + logging.info('cat1v1 0x%x', cat1v1) self.print_step(1, "Commissioning, already done") TH0 = self.default_controller @@ -129,7 +130,6 @@ async def test_TC_ACE_1_3(self): self.print_step(13, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) - self.print_step(14, "TH0 writes ACL TH3 view on EP0") th3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, @@ -164,7 +164,6 @@ async def test_TC_ACE_1_3(self): self.print_step(21, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) - self.print_step(22, "TH0 writes ACL TH1 TH3 view on EP0") th13_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, @@ -182,7 +181,6 @@ async def test_TC_ACE_1_3(self): self.print_step(25, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(26, "TH0 writes ACL TH2 TH3 view on EP0") th23_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, @@ -200,7 +198,6 @@ async def test_TC_ACE_1_3(self): self.print_step(29, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(30, "TH0 writes ACL TH1 TH2 TH3 view on EP0") th123_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, @@ -222,7 +219,7 @@ async def test_TC_ACE_1_3(self): cat1v1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat1v1)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v1_view] await self.write_acl(acl) @@ -239,7 +236,7 @@ async def test_TC_ACE_1_3(self): cat1v2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat1v2)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v2_view] await self.write_acl(acl) @@ -253,12 +250,11 @@ async def test_TC_ACE_1_3(self): self.print_step(41, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) - self.print_step(42, "TH0 writes ACL cat1v3 view on EP0") cat1v3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat1v3)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v3_view] await self.write_acl(acl) @@ -272,12 +268,11 @@ async def test_TC_ACE_1_3(self): self.print_step(45, "TH3 reads EP0 descriptor - expect UNSUPPORTED_ACCESS") await self.read_descriptor_expect_unsupported_access(TH3) - self.print_step(46, "TH0 writes ACL cat2v1 view on EP0") cat2v1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat2v1)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat2v1_view] await self.write_acl(acl) @@ -295,7 +290,7 @@ async def test_TC_ACE_1_3(self): cat2v2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat2v2)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat2v2_view] await self.write_acl(acl) @@ -309,12 +304,11 @@ async def test_TC_ACE_1_3(self): self.print_step(53, "TH3 reads EP0 descriptor - expect SUCCESS") await self.read_descriptor_expect_success(TH3) - self.print_step(54, "TH0 writes ACL cat2v3 view on EP0") cat2v3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, authMode=Clusters.AccessControl.Enums.AuthMode.kCase, subjects=[acl_subject(cat2v3)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat2v3_view] await self.write_acl(acl) @@ -333,5 +327,6 @@ async def test_TC_ACE_1_3(self): acl = [TH0_admin_acl] await self.write_acl(acl) + if __name__ == "__main__": default_matter_test_main() diff --git a/src/python_testing/matter_testing_support.py b/src/python_testing/matter_testing_support.py index 5f8a17397ace1a..27fc3d50335734 100644 --- a/src/python_testing/matter_testing_support.py +++ b/src/python_testing/matter_testing_support.py @@ -270,7 +270,7 @@ async def read_single_attribute(self, dev_ctrl: ChipDeviceCtrl, node_id: int, en data = result[endpoint] return list(data.values())[0][attribute] - async def read_single_attribute_check_success(self, cluster: object, attribute: object, dev_ctrl: ChipDeviceCtrl=None, node_id: int=None, endpoint: int=0) -> object: + async def read_single_attribute_check_success(self, cluster: object, attribute: object, dev_ctrl: ChipDeviceCtrl = None, node_id: int = None, endpoint: int = 0) -> object: if dev_ctrl is None: dev_ctrl = self.default_controller if node_id is None: @@ -283,7 +283,7 @@ async def read_single_attribute_check_success(self, cluster: object, attribute: asserts.assert_false(isinstance(attr_ret, Clusters.Attribute.ValueDecodeFailure), err_msg) return attr_ret - async def read_single_attribute_expect_error(self, cluster: object, attribute: object, error: Status, dev_ctrl: ChipDeviceCtrl=None, node_id: int=None, endpoint: int=0) -> object: + async def read_single_attribute_expect_error(self, cluster: object, attribute: object, error: Status, dev_ctrl: ChipDeviceCtrl = None, node_id: int = None, endpoint: int = 0) -> object: if dev_ctrl is None: dev_ctrl = self.default_controller if node_id is None: @@ -298,7 +298,7 @@ async def read_single_attribute_expect_error(self, cluster: object, attribute: o asserts.assert_equal(attr_ret.Reason.status, error, err_msg) return attr_ret - def print_step(self, stepnum: int, title:str) -> None: + def print_step(self, stepnum: int, title: str) -> None: logging.info('***** Test Step %d : %s', stepnum, title) From f04b276b8ddb61eb3fca7bf80408b64c0eb13693 Mon Sep 17 00:00:00 2001 From: Cecille Freeman Date: Fri, 13 Jan 2023 15:22:25 -0500 Subject: [PATCH 4/6] Base code name changes Why use less words when more do? --- src/python_testing/TC_ACE_1_3.py | 60 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/python_testing/TC_ACE_1_3.py b/src/python_testing/TC_ACE_1_3.py index 2688bd4b92cb43..70aaf34474dfab 100644 --- a/src/python_testing/TC_ACE_1_3.py +++ b/src/python_testing/TC_ACE_1_3.py @@ -77,12 +77,12 @@ async def test_TC_ACE_1_3(self): catTags=[cat1v1, cat2v2]) self.print_step(2, "TH0 writes ACL all view on PIXIT.ACE.TESTENDPOINT") - TH0_admin_acl = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kAdminister, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + TH0_admin_acl = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[TH0_nodeid], targets=[Clusters.AccessControl.Structs.Target(endpoint=0, cluster=0x001f)]) - all_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + all_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, all_view] @@ -98,8 +98,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_success(TH3) self.print_step(6, "TH0 writes ACL TH1 view on EP0") - th1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + th1_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[TH1_nodeid], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th1_view] @@ -114,8 +114,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_unsupported_access(TH3) self.print_step(10, "TH0 writes ACL TH2 view on EP0") - th2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + th2_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[TH2_nodeid], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -131,8 +131,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_unsupported_access(TH3) self.print_step(14, "TH0 writes ACL TH3 view on EP0") - th3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + th3_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[TH3_nodeid], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -148,8 +148,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_success(TH3) self.print_step(18, "TH0 writes ACL TH1 TH2 view on EP0") - th12_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + th12_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[TH1_nodeid, TH2_nodeid], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -165,8 +165,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_unsupported_access(TH3) self.print_step(22, "TH0 writes ACL TH1 TH3 view on EP0") - th13_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + th13_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[TH1_nodeid, TH3_nodeid], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -182,8 +182,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_success(TH3) self.print_step(26, "TH0 writes ACL TH2 TH3 view on EP0") - th23_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + th23_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[TH2_nodeid, TH3_nodeid], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -199,8 +199,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_success(TH3) self.print_step(30, "TH0 writes ACL TH1 TH2 TH3 view on EP0") - th123_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + th123_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[TH1_nodeid, TH2_nodeid, TH3_nodeid], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -216,8 +216,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_success(TH3) self.print_step(34, "TH0 writes ACL cat1v1 view on EP0") - cat1v1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + cat1v1_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[acl_subject(cat1v1)], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v1_view] @@ -233,8 +233,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_success(TH3) self.print_step(38, "TH0 writes ACL cat1v2 view on EP0") - cat1v2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + cat1v2_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[acl_subject(cat1v2)], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -251,8 +251,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_unsupported_access(TH3) self.print_step(42, "TH0 writes ACL cat1v3 view on EP0") - cat1v3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + cat1v3_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[acl_subject(cat1v3)], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -269,8 +269,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_unsupported_access(TH3) self.print_step(46, "TH0 writes ACL cat2v1 view on EP0") - cat2v1_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + cat2v1_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[acl_subject(cat2v1)], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -287,8 +287,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_success(TH3) self.print_step(50, "TH0 writes ACL cat2v2 view on EP0") - cat2v2_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + cat2v2_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[acl_subject(cat2v2)], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) @@ -305,8 +305,8 @@ async def test_TC_ACE_1_3(self): await self.read_descriptor_expect_success(TH3) self.print_step(54, "TH0 writes ACL cat2v3 view on EP0") - cat2v3_view = Clusters.AccessControl.Structs.AccessControlEntry(privilege=Clusters.AccessControl.Enums.Privilege.kView, - authMode=Clusters.AccessControl.Enums.AuthMode.kCase, + cat2v3_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, subjects=[acl_subject(cat2v3)], targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) From 268f93e90cba9a676d98e37c77156a0be49d0e1a Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Mon, 16 Jan 2023 18:06:43 +0000 Subject: [PATCH 5/6] Restyled by autopep8 --- src/python_testing/TC_ACE_1_3.py | 90 ++++++++++++++++---------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/src/python_testing/TC_ACE_1_3.py b/src/python_testing/TC_ACE_1_3.py index 70aaf34474dfab..000a844504f420 100644 --- a/src/python_testing/TC_ACE_1_3.py +++ b/src/python_testing/TC_ACE_1_3.py @@ -78,13 +78,13 @@ async def test_TC_ACE_1_3(self): self.print_step(2, "TH0 writes ACL all view on PIXIT.ACE.TESTENDPOINT") TH0_admin_acl = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[TH0_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0, cluster=0x001f)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[TH0_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0, cluster=0x001f)]) all_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, all_view] await self.write_acl(acl) @@ -99,9 +99,9 @@ async def test_TC_ACE_1_3(self): self.print_step(6, "TH0 writes ACL TH1 view on EP0") th1_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[TH1_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[TH1_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th1_view] await self.write_acl(acl) self.print_step(7, "TH1 reads EP0 descriptor - expect SUCCESS") @@ -115,9 +115,9 @@ async def test_TC_ACE_1_3(self): self.print_step(10, "TH0 writes ACL TH2 view on EP0") th2_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[TH2_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[TH2_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th2_view] await self.write_acl(acl) @@ -132,9 +132,9 @@ async def test_TC_ACE_1_3(self): self.print_step(14, "TH0 writes ACL TH3 view on EP0") th3_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[TH3_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[TH3_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th3_view] await self.write_acl(acl) @@ -149,9 +149,9 @@ async def test_TC_ACE_1_3(self): self.print_step(18, "TH0 writes ACL TH1 TH2 view on EP0") th12_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[TH1_nodeid, TH2_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[TH1_nodeid, TH2_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th12_view] await self.write_acl(acl) @@ -166,9 +166,9 @@ async def test_TC_ACE_1_3(self): self.print_step(22, "TH0 writes ACL TH1 TH3 view on EP0") th13_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[TH1_nodeid, TH3_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[TH1_nodeid, TH3_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th13_view] await self.write_acl(acl) @@ -183,9 +183,9 @@ async def test_TC_ACE_1_3(self): self.print_step(26, "TH0 writes ACL TH2 TH3 view on EP0") th23_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[TH2_nodeid, TH3_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[TH2_nodeid, TH3_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th23_view] await self.write_acl(acl) @@ -200,9 +200,9 @@ async def test_TC_ACE_1_3(self): self.print_step(30, "TH0 writes ACL TH1 TH2 TH3 view on EP0") th123_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[TH1_nodeid, TH2_nodeid, TH3_nodeid], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[TH1_nodeid, TH2_nodeid, TH3_nodeid], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, th123_view] await self.write_acl(acl) @@ -217,9 +217,9 @@ async def test_TC_ACE_1_3(self): self.print_step(34, "TH0 writes ACL cat1v1 view on EP0") cat1v1_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[acl_subject(cat1v1)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[acl_subject(cat1v1)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v1_view] await self.write_acl(acl) @@ -234,9 +234,9 @@ async def test_TC_ACE_1_3(self): self.print_step(38, "TH0 writes ACL cat1v2 view on EP0") cat1v2_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[acl_subject(cat1v2)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[acl_subject(cat1v2)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v2_view] await self.write_acl(acl) @@ -252,9 +252,9 @@ async def test_TC_ACE_1_3(self): self.print_step(42, "TH0 writes ACL cat1v3 view on EP0") cat1v3_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[acl_subject(cat1v3)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[acl_subject(cat1v3)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat1v3_view] await self.write_acl(acl) @@ -270,9 +270,9 @@ async def test_TC_ACE_1_3(self): self.print_step(46, "TH0 writes ACL cat2v1 view on EP0") cat2v1_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[acl_subject(cat2v1)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[acl_subject(cat2v1)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat2v1_view] await self.write_acl(acl) @@ -288,9 +288,9 @@ async def test_TC_ACE_1_3(self): self.print_step(50, "TH0 writes ACL cat2v2 view on EP0") cat2v2_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[acl_subject(cat2v2)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[acl_subject(cat2v2)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat2v2_view] await self.write_acl(acl) @@ -306,9 +306,9 @@ async def test_TC_ACE_1_3(self): self.print_step(54, "TH0 writes ACL cat2v3 view on EP0") cat2v3_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView, - authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, - subjects=[acl_subject(cat2v3)], - targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) + authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase, + subjects=[acl_subject(cat2v3)], + targets=[Clusters.AccessControl.Structs.Target(endpoint=0)]) acl = [TH0_admin_acl, cat2v3_view] await self.write_acl(acl) From c1ee02b95ad8e24bda0866732e0538ba83316a51 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Mon, 16 Jan 2023 18:06:44 +0000 Subject: [PATCH 6/6] Restyled by isort --- src/python_testing/TC_ACE_1_3.py | 7 ++++--- src/python_testing/matter_testing_support.py | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/python_testing/TC_ACE_1_3.py b/src/python_testing/TC_ACE_1_3.py index 000a844504f420..dd3639d7c0b476 100644 --- a/src/python_testing/TC_ACE_1_3.py +++ b/src/python_testing/TC_ACE_1_3.py @@ -15,10 +15,11 @@ # limitations under the License. # -from matter_testing_support import MatterBaseTest, default_matter_test_main, async_test_body -from chip.interaction_model import Status, InteractionModelError -import chip.clusters as Clusters import logging + +import chip.clusters as Clusters +from chip.interaction_model import InteractionModelError, Status +from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main from mobly import asserts diff --git a/src/python_testing/matter_testing_support.py b/src/python_testing/matter_testing_support.py index c8a7c06fa3f407..89e52736e86556 100644 --- a/src/python_testing/matter_testing_support.py +++ b/src/python_testing/matter_testing_support.py @@ -41,9 +41,8 @@ import chip.clusters as Clusters import chip.logging import chip.native - from chip.ChipStack import * -from chip.interaction_model import Status, InteractionModelError +from chip.interaction_model import InteractionModelError, Status from chip.storage import PersistentStorage from chip.utils import CommissioningBuildingBlocks from mobly import asserts, base_test, logger, signals, utils