From a40401029fd28c980018edbb602af4dc71b4e357 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Fri, 20 Feb 2026 16:44:23 -0600 Subject: [PATCH] [tests] fix inconsistent casing in Thread Nodes multicast address constants (#12484) Renames LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS to LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS and REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS to REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS across the test scripts to ensure consistent ALL_CAPS_WITH_UNDERSCORES casing for constants, adhering to PEP 8 and project conventions. --- tests/nexus/verify_6_4_1.py | 4 ++-- tests/nexus/verify_6_4_2.py | 2 +- tests/nexus/verify_utils.py | 2 +- tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands.py | 2 +- tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py | 6 +++--- tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py | 8 ++++---- tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py | 6 +++--- tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py | 4 ++-- tests/scripts/thread-cert/config.py | 4 ++-- tests/scripts/thread-cert/pktverify/consts.py | 4 ++-- tests/scripts/thread-cert/pktverify/packet_filter.py | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/nexus/verify_6_4_1.py b/tests/nexus/verify_6_4_1.py index febc37016..ed2e625aa 100644 --- a/tests/nexus/verify_6_4_1.py +++ b/tests/nexus/verify_6_4_1.py @@ -109,7 +109,7 @@ def verify(pv): "Step 4: Leader sends a fragmented ICMPv6 Echo Request to the Link-Local All Thread Nodes multicast address.") _pkt = pkts.filter_ping_request().\ filter_wpan_src64(LEADER).\ - filter_ipv6_dst(consts.LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS).\ + filter_ipv6_dst(consts.LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS).\ filter(lambda p: p.ipv6.plen > 1000).\ must_next() pkts.filter_ping_reply(identifier=_pkt.icmpv6.echo.identifier).\ @@ -125,7 +125,7 @@ def verify(pv): print("Step 5: Leader sends an ICMPv6 Echo Request to the Link-Local All Thread Nodes multicast address.") _pkt = pkts.filter_ping_request().\ filter_wpan_src64(LEADER).\ - filter_ipv6_dst(consts.LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS).\ + filter_ipv6_dst(consts.LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS).\ filter(lambda p: p.ipv6.plen < 100).\ must_next() pkts.filter_ping_reply(identifier=_pkt.icmpv6.echo.identifier).\ diff --git a/tests/nexus/verify_6_4_2.py b/tests/nexus/verify_6_4_2.py index 4ad7d87d7..be27c9828 100644 --- a/tests/nexus/verify_6_4_2.py +++ b/tests/nexus/verify_6_4_2.py @@ -71,7 +71,7 @@ def verify(pv): # The Realm-Local All Thread Nodes multicast address (FF33:40:::1) # Derived from Link-Local All Thread Nodes (FF32:40:::1) - ll_all_thread = consts.LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS + ll_all_thread = consts.LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS rl_all_thread = bytearray(ll_all_thread) rl_all_thread[1] = 0x33 REALM_LOCAL_ALL_THREAD_NODES = Ipv6Addr(rl_all_thread) diff --git a/tests/nexus/verify_utils.py b/tests/nexus/verify_utils.py index 46f5631a1..375e75fe0 100644 --- a/tests/nexus/verify_utils.py +++ b/tests/nexus/verify_utils.py @@ -154,7 +154,7 @@ def run_main(verify_func): prefix = Ipv6Addr(prefix_addr) all_thread_nodes_mcast_addr = bytearray(Ipv6Addr('ff32:40::1')) all_thread_nodes_mcast_addr[4:12] = prefix[0:8] - consts.LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS = Ipv6Addr(all_thread_nodes_mcast_addr) + consts.LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS = Ipv6Addr(all_thread_nodes_mcast_addr) pv = PacketVerifier(json_file, wireshark_prefs=wireshark_prefs) pv.add_common_vars() diff --git a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands.py b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands.py index 88c4dbf24..1afd358e5 100755 --- a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands.py +++ b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands.py @@ -36,7 +36,7 @@ import network_diag import network_layer import thread_cert from network_diag import TlvType -from pktverify.consts import DIAG_RST_URI, DIAG_GET_URI, DG_MAC_EXTENDED_ADDRESS_TLV, DG_MAC_ADDRESS_TLV, DG_MODE_TLV, DG_CONNECTIVITY_TLV, DG_ROUTE64_TLV, DG_LEADER_DATA_TLV, DG_NETWORK_DATA_TLV, DG_IPV6_ADDRESS_LIST_TLV, DG_CHANNEL_PAGES_TLV, DG_TYPE_LIST_TLV, DG_MAC_COUNTERS_TLV, DG_TIMEOUT_TLV, DG_BATTERY_LEVEL_TLV, DG_SUPPLY_VOLTAGE_TLV, DG_CHILD_TABLE_TLV, DG_CHILD_TABLE_TLV +from pktverify.consts import DIAG_RST_URI, DIAG_GET_URI, DG_MAC_EXTENDED_ADDRESS_TLV, DG_MAC_ADDRESS_TLV, DG_MODE_TLV, DG_CONNECTIVITY_TLV, DG_ROUTE64_TLV, DG_LEADER_DATA_TLV, DG_NETWORK_DATA_TLV, DG_IPV6_ADDRESS_LIST_TLV, DG_CHANNEL_PAGES_TLV, DG_TYPE_LIST_TLV, DG_MAC_COUNTERS_TLV, DG_TIMEOUT_TLV, DG_BATTERY_LEVEL_TLV, DG_SUPPLY_VOLTAGE_TLV, DG_CHILD_TABLE_TLV from pktverify.packet_verifier import PacketVerifier from pktverify.null_field import nullField diff --git a/tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py b/tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py index 4cdc83635..dee769de3 100755 --- a/tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py +++ b/tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py @@ -36,7 +36,7 @@ import network_diag import network_layer import thread_cert from network_diag import TlvType -from pktverify.consts import DIAG_RST_URI, DIAG_GET_URI, DIAG_GET_QRY_URI, DIAG_GET_ANS_URI, DG_MAC_EXTENDED_ADDRESS_TLV, DG_MAC_ADDRESS_TLV, DG_MODE_TLV, DG_CONNECTIVITY_TLV, DG_ROUTE64_TLV, DG_LEADER_DATA_TLV, DG_NETWORK_DATA_TLV, DG_IPV6_ADDRESS_LIST_TLV, DG_CHANNEL_PAGES_TLV, DG_TYPE_LIST_TLV, DG_MAC_COUNTERS_TLV, DG_TIMEOUT_TLV, DG_BATTERY_LEVEL_TLV, DG_SUPPLY_VOLTAGE_TLV, DG_CHILD_TABLE_TLV, DG_CHILD_TABLE_TLV, REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS +from pktverify.consts import DIAG_RST_URI, DIAG_GET_URI, DIAG_GET_QRY_URI, DIAG_GET_ANS_URI, DG_MAC_EXTENDED_ADDRESS_TLV, DG_MAC_ADDRESS_TLV, DG_MODE_TLV, DG_CONNECTIVITY_TLV, DG_ROUTE64_TLV, DG_LEADER_DATA_TLV, DG_NETWORK_DATA_TLV, DG_IPV6_ADDRESS_LIST_TLV, DG_CHANNEL_PAGES_TLV, DG_TYPE_LIST_TLV, DG_MAC_COUNTERS_TLV, DG_TIMEOUT_TLV, DG_BATTERY_LEVEL_TLV, DG_SUPPLY_VOLTAGE_TLV, DG_CHILD_TABLE_TLV, REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS from pktverify.packet_verifier import PacketVerifier from pktverify.null_field import nullField from pktverify.utils import colon_hex @@ -207,7 +207,7 @@ class Cert_5_7_02_CoapDiagCommands(thread_cert.TestCase): self.simulator.go(2) # 8 - Leader sends DIAG_GET.query - self.nodes[LEADER].send_network_diag_get(REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS, tlv_types) + self.nodes[LEADER].send_network_diag_get(REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS, tlv_types) self.simulator.go(2) def verify(self, pv): @@ -399,7 +399,7 @@ class Cert_5_7_02_CoapDiagCommands(thread_cert.TestCase): dut_payload_tlvs.add(DG_TYPE_LIST_TLV) dut_payload_tlvs.add(DG_ROUTE64_TLV) pkts.filter_wpan_src64(LEADER).\ - filter_ipv6_dst(REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS).\ + filter_ipv6_dst(REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS).\ filter_coap_request(DIAG_GET_QRY_URI).\ filter(lambda p: dut_payload_tlvs <= set(p.thread_diagnostic.tlv.type)).\ must_next() diff --git a/tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py b/tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py index 6e4231605..1db8506a8 100755 --- a/tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py +++ b/tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py @@ -36,7 +36,7 @@ import network_diag import network_layer import thread_cert from network_diag import TlvType -from pktverify.consts import DIAG_GET_QRY_URI, DIAG_GET_ANS_URI, DG_MAC_EXTENDED_ADDRESS_TLV, DG_MAC_ADDRESS_TLV, DG_MODE_TLV, DG_CONNECTIVITY_TLV, DG_ROUTE64_TLV, DG_LEADER_DATA_TLV, DG_NETWORK_DATA_TLV, DG_IPV6_ADDRESS_LIST_TLV, DG_CHANNEL_PAGES_TLV, DG_TYPE_LIST_TLV, DG_MAC_COUNTERS_TLV, DG_TIMEOUT_TLV, DG_CHILD_TABLE_TLV, REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS +from pktverify.consts import DIAG_GET_QRY_URI, DIAG_GET_ANS_URI, DG_MAC_EXTENDED_ADDRESS_TLV, DG_MAC_ADDRESS_TLV, DG_MODE_TLV, DG_CONNECTIVITY_TLV, DG_ROUTE64_TLV, DG_LEADER_DATA_TLV, DG_NETWORK_DATA_TLV, DG_IPV6_ADDRESS_LIST_TLV, DG_CHANNEL_PAGES_TLV, DG_TYPE_LIST_TLV, DG_MAC_COUNTERS_TLV, DG_TIMEOUT_TLV, DG_CHILD_TABLE_TLV, REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS from pktverify.packet_verifier import PacketVerifier from pktverify.utils import colon_hex @@ -133,7 +133,7 @@ class Cert_5_7_03_CoapDiagCommands_Base(thread_cert.TestCase): ] # 2 - Leader sends DIAG_GET.query - self.nodes[LEADER].send_network_diag_get(REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS, tlv_types) + self.nodes[LEADER].send_network_diag_get(REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS, tlv_types) self.simulator.go(2) def verify(self, pv): @@ -180,7 +180,7 @@ class Cert_5_7_03_CoapDiagCommands_Base(thread_cert.TestCase): # TLV Type 5 – Route64 # TLV Type 16 – Child Table _qr_pkt = pkts.filter_wpan_src64(LEADER).\ - filter_ipv6_dst(REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS).\ + filter_ipv6_dst(REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS).\ filter_coap_request(DIAG_GET_QRY_URI).\ must_next() dut_payload_tlvs = { @@ -218,7 +218,7 @@ class Cert_5_7_03_CoapDiagCommands_Base(thread_cert.TestCase): # the DIAG_GET.query to SED dut_payload_tlvs.add(DG_TYPE_LIST_TLV) pkts.filter_wpan_src64(DUT).\ - filter_ipv6_dst(REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS).\ + filter_ipv6_dst(REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS).\ filter_coap_request(DIAG_GET_QRY_URI).\ filter(lambda p: dut_payload_tlvs <= set(p.thread_diagnostic.tlv.type) diff --git a/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py b/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py index 2524e6db2..d7e34edd7 100755 --- a/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py @@ -32,7 +32,7 @@ import copy import config import thread_cert -from pktverify.consts import LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS +from pktverify.consts import LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS from pktverify.packet_verifier import PacketVerifier LEADER = 1 @@ -90,10 +90,10 @@ class Cert_6_4_1_LinkLocal_Base(thread_cert.TestCase): self.assertTrue(self.nodes[LEADER].ping(dut_addr)) self.simulator.go(1) - self.assertTrue(self.nodes[LEADER].ping(config.LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS, + self.assertTrue(self.nodes[LEADER].ping(config.LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS, size=FRAGMENTED_DATA_LEN)) self.simulator.go(1) - self.assertTrue(self.nodes[LEADER].ping(config.LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS)) + self.assertTrue(self.nodes[LEADER].ping(config.LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS)) self.simulator.go(1) if self.TOPOLOGY[MTD]['mode'] == 'rn': diff --git a/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py b/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py index addccfb96..5d97342ab 100755 --- a/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py @@ -115,12 +115,12 @@ class Cert_6_4_2_RealmLocal_Base(thread_cert.TestCase): self.simulator.go(2) self.assertTrue(self.nodes[LEADER].\ - ping(config.REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS, + ping(config.REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS, num_responses=2, size=FRAGMENTED_DATA_LEN)) self.simulator.go(2) self.assertTrue(self.nodes[LEADER].\ - ping(config.REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS, + ping(config.REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS, num_responses=2)) self.simulator.go(2) diff --git a/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py b/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py index e97a720e5..cf702ef91 100755 --- a/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py +++ b/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py @@ -31,7 +31,7 @@ import unittest import config import thread_cert -from pktverify.consts import MLE_CHILD_ID_REQUEST, MGMT_PANID_QUERY, MGMT_PANID_CONFLICT, MGMT_ED_REPORT, NM_COMMISSIONER_SESSION_ID_TLV, NM_CHANNEL_MASK_TLV, NM_PAN_ID_TLV, REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS +from pktverify.consts import MLE_CHILD_ID_REQUEST, MGMT_PANID_QUERY, MGMT_PANID_CONFLICT, MGMT_ED_REPORT, NM_COMMISSIONER_SESSION_ID_TLV, NM_CHANNEL_MASK_TLV, NM_PAN_ID_TLV, REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS from pktverify.packet_verifier import PacketVerifier COMMISSIONER = 1 @@ -123,7 +123,7 @@ class Cert_9_2_14_PanIdQuery(thread_cert.TestCase): ).must_verify(lambda p: {NM_CHANNEL_MASK_TLV, NM_PAN_ID_TLV} <= set(p.thread_meshcop.tlv.type)) # Step 4: Commissioner MUST send a multicast MGMT_PANID_QUERY.qry - _cpkts.filter_ipv6_dst(REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS).filter_coap_request( + _cpkts.filter_ipv6_dst(REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS).filter_coap_request( MGMT_PANID_QUERY).must_next().must_verify( lambda p: {NM_COMMISSIONER_SESSION_ID_TLV, NM_CHANNEL_MASK_TLV, NM_PAN_ID_TLV} <= set(p.thread_meshcop. tlv.type)) diff --git a/tests/scripts/thread-cert/config.py b/tests/scripts/thread-cert/config.py index 372e7d602..ad4bfa22b 100644 --- a/tests/scripts/thread-cert/config.py +++ b/tests/scripts/thread-cert/config.py @@ -51,8 +51,8 @@ ROUTING_LOCATOR_REGEX_PATTERN = r'.*:(0)?:0{0,2}ff:fe00:\w{1,4}$' LINK_LOCAL = 'fe80:/112' LINK_LOCAL_REGEX_PATTERN = '^fe80:.*' ALOC_FLAG_REGEX_PATTERN = '.*:fc..$' -LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS = 'ff32:40:fd00:db8:0:0:0:1' -REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS = 'ff33:40:fd00:db8:0:0:0:1' +LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS = 'ff32:40:fd00:db8:0:0:0:1' +REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS = 'ff33:40:fd00:db8:0:0:0:1' REALM_LOCAL_ALL_NODES_ADDRESS = 'ff03::1' REALM_LOCAL_ALL_ROUTERS_ADDRESS = 'ff03::2' LINK_LOCAL_ALL_NODES_ADDRESS = 'ff02::1' diff --git a/tests/scripts/thread-cert/pktverify/consts.py b/tests/scripts/thread-cert/pktverify/consts.py index 69b245a58..8fea33e00 100644 --- a/tests/scripts/thread-cert/pktverify/consts.py +++ b/tests/scripts/thread-cert/pktverify/consts.py @@ -33,8 +33,8 @@ from pktverify.bytes import Bytes DOMAIN_PREFIX = Bytes('fd00:7d03:7d03:7d03') BACKBONE_IPV6_PREFIX = Bytes('91') -LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS = Ipv6Addr('ff32:40:fd00:db8::1') -REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS = Ipv6Addr('ff33:40:fd00:db8::1') +LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS = Ipv6Addr('ff32:40:fd00:db8::1') +REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS = Ipv6Addr('ff33:40:fd00:db8::1') REALM_LOCAL_ALL_NODES_ADDRESS = Ipv6Addr('ff03::1') REALM_LOCAL_ALL_ROUTERS_ADDRESS = Ipv6Addr('ff03::2') LINK_LOCAL_ALL_NODES_MULTICAST_ADDRESS = Ipv6Addr('ff02::1') diff --git a/tests/scripts/thread-cert/pktverify/packet_filter.py b/tests/scripts/thread-cert/pktverify/packet_filter.py index a74253b45..20aa65d65 100644 --- a/tests/scripts/thread-cert/pktverify/packet_filter.py +++ b/tests/scripts/thread-cert/pktverify/packet_filter.py @@ -557,7 +557,7 @@ class PacketFilter(object): return self.filter(lambda p: p.ipv6.src == src_addr and p.ipv6.dst == dst_addr, **kwargs) def filter_LLATNMA(self, **kwargs): - return self.filter(lambda p: p.ipv6.dst == consts.LINK_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS, **kwargs) + return self.filter(lambda p: p.ipv6.dst == consts.LINK_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS, **kwargs) def filter_RLANMA(self, **kwargs): return self.filter(lambda p: p.ipv6.dst == consts.REALM_LOCAL_ALL_NODES_ADDRESS, **kwargs) @@ -566,7 +566,7 @@ class PacketFilter(object): return self.filter(lambda p: p.ipv6.dst == consts.REALM_LOCAL_ALL_ROUTERS_ADDRESS, **kwargs) def filter_RLATNMA(self, **kwargs): - return self.filter(lambda p: p.ipv6.dst == consts.REALM_LOCAL_All_THREAD_NODES_MULTICAST_ADDRESS, **kwargs) + return self.filter(lambda p: p.ipv6.dst == consts.REALM_LOCAL_ALL_THREAD_NODES_MULTICAST_ADDRESS, **kwargs) def filter_LLANMA(self, **kwargs): return self.filter(lambda p: p.ipv6.dst == consts.LINK_LOCAL_ALL_NODES_MULTICAST_ADDRESS, **kwargs)