Skip to content

Commit

Permalink
chore(TC_ACE-1.5): fix errors using flake8 Python linter
Browse files Browse the repository at this point in the history
  • Loading branch information
@gvargas-csa
gvargas-csa committed Dec 15, 2023
1 parent 9c6bbc8 commit 1030470
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions src/python_testing/TC_ACE_1_5.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
import logging
import time

import chip.clusters.enum
import chip.clusters as Clusters
from mobly import asserts
from chip import ChipDeviceCtrl
from chip.interaction_model import Status
from chip.ChipDeviceCtrl import CommissioningParameters
from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main


class TC_ACE_1_5(MatterBaseTest):

def OpenCommissioningWindow(self) -> CommissioningParameters:
Expand Down Expand Up @@ -53,25 +53,25 @@ async def write_acl(self, acl, th):
async def read_descriptor_expect_success(self, th):
cluster = Clusters.Objects.Descriptor
attribute = Clusters.Descriptor.Attributes.DeviceTypeList
result = await self.read_single_attribute_check_success(
await self.read_single_attribute_check_success(
dev_ctrl=th, endpoint=0, cluster=cluster, attribute=attribute)

async def read_basic_expect_success(self, th):
cluster = Clusters.Objects.BasicInformation
attribute = Clusters.BasicInformation.Attributes.VendorID
result = await self.read_single_attribute_check_success(
await self.read_single_attribute_check_success(
dev_ctrl=th, endpoint=0, cluster=cluster, attribute=attribute)

async def read_basic_expect_unsupported_access(self, th):
cluster = Clusters.Objects.BasicInformation
attribute = Clusters.BasicInformation.Attributes.VendorID
result = await self.read_single_attribute_expect_error(
await self.read_single_attribute_expect_error(
dev_ctrl=th, endpoint=0, cluster=cluster, attribute=attribute, error=Status.UnsupportedAccess)

async def read_descriptor_expect_unsupported_access(self, th):
cluster = Clusters.Objects.Descriptor
attribute = Clusters.Descriptor.Attributes.DeviceTypeList
result = await self.read_single_attribute_expect_error(
await self.read_single_attribute_expect_error(
dev_ctrl=th, endpoint=0, cluster=cluster, attribute=attribute, error=Status.UnsupportedAccess)

@async_test_body
Expand All @@ -83,14 +83,13 @@ async def test_TC_ACE_1_5(self):
params = self.OpenCommissioningWindow()

new_certificate_authority = self.certificate_authority_manager.NewCertificateAuthority()
fabric_admin = self.certificate_authority_manager.activeCaList[0].adminList[0]
new_fabric_admin = new_certificate_authority.NewFabricAdmin(vendorId=0xFFF1, fabricId=self.matter_test_config.fabric_id + 1)

TH1_nodeid = self.matter_test_config.controller_node_id
TH2_nodeid = self.matter_test_config.controller_node_id + 2

self.th2 = new_fabric_admin.NewController(nodeId=TH2_nodeid,
paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path))
paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path))

errcode = self.th2.CommissionOnNetwork(
nodeId=self.dut_node_id, setupPinCode=params.setupPinCode,
Expand All @@ -103,10 +102,10 @@ async def test_TC_ACE_1_5(self):

self.print_step(5, "TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 2 elements")
admin_acl = Clusters.AccessControl.Structs.AccessControlEntryStruct(
privilege = Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
authMode = Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
subjects = [TH1_nodeid],
targets = [Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0, cluster=Clusters.AccessControl.id)])
privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
subjects=[TH1_nodeid],
targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0, cluster=Clusters.AccessControl.id)])
descriptor_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(
privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
Expand All @@ -117,13 +116,13 @@ async def test_TC_ACE_1_5(self):

self.print_step(6, "TH2 writes DUT Endpoint 0 AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 2 elements")
admin_acl = Clusters.AccessControl.Structs.AccessControlEntryStruct(
fabricIndex = th2FabricIndex,
privilege = Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
authMode = Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
subjects = [TH2_nodeid],
targets = [Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0, cluster=Clusters.AccessControl.id)])
fabricIndex=th2FabricIndex,
privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
subjects=[TH2_nodeid],
targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0, cluster=Clusters.AccessControl.id)])
descriptor_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(
fabricIndex = th2FabricIndex,
fabricIndex=th2FabricIndex,
privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
subjects=[],
Expand Down Expand Up @@ -157,5 +156,6 @@ async def test_TC_ACE_1_5(self):
removeFabricCmd = Clusters.OperationalCredentials.Commands.RemoveFabric(th2FabricIndex)
await self.th1.SendCommand(nodeid=self.dut_node_id, endpoint=0, payload=removeFabricCmd)


if __name__ == "__main__":
default_matter_test_main()

0 comments on commit 1030470

Please sign in to comment.