|
20 | 20 | import math
|
21 | 21 | import queue
|
22 | 22 | import random
|
| 23 | +import string |
23 | 24 | import time
|
24 | 25 | from typing import Any, Dict, List, Set
|
25 | 26 |
|
|
37 | 38 |
|
38 | 39 |
|
39 | 40 | def generate_controller_name(fabric_index: int, controller_index: int):
|
40 |
| - return f"RD{fabric_index}{string.ascii_uppercase[controller_index]))}" |
| 41 | + return f"RD{fabric_index}{string.ascii_uppercase[controller_index]}" |
41 | 42 |
|
42 | 43 |
|
43 | 44 | class TC_RR_1_1(MatterBaseTest):
|
@@ -225,8 +226,7 @@ async def test_TC_RR_1_1(self):
|
225 | 226 | logging.info("Step 2: Setting the Label field for each fabric and BasicInformation.NodeLabel to 32 characters")
|
226 | 227 |
|
227 | 228 | for fabric in fabric_table:
|
228 |
| - # Client is client A for each fabric to set the Label field |
229 |
| - client_name = "RD%dA" % fabric.fabricIndex |
| 229 | + client_name = generate_controller_name(fabric.fabricIndex, 0) |
230 | 230 | client = client_by_name[client_name]
|
231 | 231 |
|
232 | 232 | # Send the UpdateLabel command
|
@@ -451,8 +451,7 @@ async def test_TC_RR_1_1(self):
|
451 | 451 | fabric_unique_clients: List[Any] = []
|
452 | 452 |
|
453 | 453 | for fabric in fabric_table:
|
454 |
| - # Client is client A for each fabric |
455 |
| - client_name = "RD%dA" % fabric.fabricIndex |
| 454 | + client_name = generate_controller_name(fabric.fabricIndex, 0) |
456 | 455 | fabric_unique_clients.append(client_by_name[client_name])
|
457 | 456 |
|
458 | 457 | # Step 13: Write and verify indicated_max_group_keys_per_fabric group keys to all fabrics.
|
@@ -695,8 +694,7 @@ async def send_acl(self,
|
695 | 694 | fabric_table: List[
|
696 | 695 | Clusters.OperationalCredentials.Structs.FabricDescriptorStruct]):
|
697 | 696 | for fabric in fabric_table:
|
698 |
| - # Client is client A for each fabric |
699 |
| - client_name = "RD%dA" % fabric.fabricIndex |
| 697 | + client_name = generate_controller_name(fabric.fabricIndex, 0) |
700 | 698 | client = client_by_name[client_name]
|
701 | 699 |
|
702 | 700 | acl = self.build_acl(enable_access_to_group_cluster)
|
|
0 commit comments