Skip to content

Commit 779bd5c

Browse files
Removed on-network-ip from commisioning and parameters from src/python_testing (project-chip#38252)
1 parent 18f49aa commit 779bd5c

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

src/python_testing/matter_testing_infrastructure/chip/testing/commissioning.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ async def commission_device(
117117
Returns:
118118
True if the commissioning process completes successfully. False otherwise,
119119
except in case of an error which logs the exception details.
120-
121-
Note:
122-
The "on-network-ip" method is deprecated as it's not supported in long-term
123-
environments.
124120
"""
125121

126122
if commissioning_info.tc_version_to_simulate is not None and commissioning_info.tc_user_response_to_simulate is not None:
@@ -165,18 +161,6 @@ async def commission_device(
165161
except ChipStackError as e:
166162
logging.error("Commissioning failed: %s" % e)
167163
return False
168-
elif commissioning_info.commissioning_method == "on-network-ip":
169-
try:
170-
logging.warning("==== USING A DIRECT IP COMMISSIONING METHOD NOT SUPPORTED IN THE LONG TERM ====")
171-
await dev_ctrl.CommissionIP(
172-
ipaddr=commissioning_info.commissionee_ip_address_just_for_testing,
173-
setupPinCode=info.passcode,
174-
nodeid=node_id,
175-
)
176-
return True
177-
except ChipStackError as e:
178-
logging.error("Commissioning failed: %s" % e)
179-
return False
180164
else:
181165
raise ValueError("Invalid commissioning method %s!" % commissioning_info.commissioning_method)
182166

src/python_testing/matter_testing_infrastructure/chip/testing/matter_testing.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,11 +1923,11 @@ def parse_matter_test_args(argv: Optional[List[str]] = None) -> MatterTestConfig
19231923

19241924
commission_group.add_argument('-m', '--commissioning-method', type=str,
19251925
metavar='METHOD_NAME',
1926-
choices=["on-network", "ble-wifi", "ble-thread", "on-network-ip"],
1926+
choices=["on-network", "ble-wifi", "ble-thread"],
19271927
help='Name of commissioning method to use')
19281928
commission_group.add_argument('--in-test-commissioning-method', type=str,
19291929
metavar='METHOD_NAME',
1930-
choices=["on-network", "ble-wifi", "ble-thread", "on-network-ip"],
1930+
choices=["on-network", "ble-wifi", "ble-thread"],
19311931
help='Name of commissioning method to use, for commissioning tests')
19321932
commission_group.add_argument('-d', '--discriminator', type=int_decimal_or_hex,
19331933
metavar='LONG_DISCRIMINATOR',
@@ -1939,9 +1939,6 @@ def parse_matter_test_args(argv: Optional[List[str]] = None) -> MatterTestConfig
19391939
dest='passcodes',
19401940
default=[],
19411941
help='PAKE passcode to use', nargs="+")
1942-
commission_group.add_argument('-i', '--ip-addr', type=str,
1943-
metavar='RAW_IP_ADDRESS',
1944-
help='IP address to use (only for method "on-network-ip". ONLY FOR LOCAL TESTING!', nargs="+")
19451942

19461943
commission_group.add_argument('--wifi-ssid', type=str,
19471944
metavar='SSID',

0 commit comments

Comments
 (0)