ChipDeviceCtrl: Remove deprecated CommissionIP function (#41114)
* ChipDeviceCtrl: Remove deprecated CommissionIP function
* remove note
* Restyled by isort
* remove address override
* fix CI call to mobile-device-test
* fix commission with code call
* clean up more cirque stuff
* Restyled by isort
* ruff
* A few more
* remove some unused stuff
* remove bad defaults
* more argument fixes
---------
Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/docs/development_controllers/matter-repl/matter-repl.md b/docs/development_controllers/matter-repl/matter-repl.md
index 06a4f43..2c14a0c 100644
--- a/docs/development_controllers/matter-repl/matter-repl.md
+++ b/docs/development_controllers/matter-repl/matter-repl.md
@@ -203,8 +203,6 @@
```
--controller-nodeid INTEGER NodeId of the controller.
--device-nodeid INTEGER NodeId of the device.
- -a, --address TEXT Skip commissionee discovery, commission the
- device with the IP directly.
-t, --timeout INTEGER The program will return with timeout after
specified seconds.
diff --git a/src/controller/python/matter/ChipDeviceCtrl.py b/src/controller/python/matter/ChipDeviceCtrl.py
index 3003a86..4b208eb 100644
--- a/src/controller/python/matter/ChipDeviceCtrl.py
+++ b/src/controller/python/matter/ChipDeviceCtrl.py
@@ -2574,7 +2574,6 @@
'''
The ChipDeviceCommissioner binding, named as ChipDeviceController
'''
- # TODO: This class contains DEPRECATED functions, we should update the test scripts to avoid the usage of those functions.
def __init__(self,
opCredsContext: ctypes.c_void_p,
@@ -2633,8 +2632,8 @@
async def Commission(self, nodeid) -> int:
'''
Start the auto-commissioning process on a node after establishing a PASE connection.
- This function is intended to be used in conjunction with `EstablishPASESessionBLE` or
- `EstablishPASESessionIP`. It can be called either before or after the DevicePairingDelegate
+ This function is intended to be used in conjunction with one of the EstablishPASESession
+ functions. It can be called either before or after the DevicePairingDelegate
receives the OnPairingComplete call. Commissioners that want to perform simple
auto-commissioning should use the supplied "CommissionWithCode" function, which will
establish the PASE connection and commission automatically.
@@ -3008,27 +3007,6 @@
return await asyncio.futures.wrap_future(ctx.future)
- async def CommissionIP(self, ipaddr: str, setupPinCode: int, nodeid: int) -> int:
- '''
- DEPRECATED, DO NOT USE! Use `CommissionOnNetwork` or `CommissionWithCode`
-
- Raises:
- ChipStackError: On failure.
-
- Returns:
- Effective Node ID of the device (as defined by the assigned NOC)
- '''
- self.CheckIsActive()
-
- async with self._commissioning_context as ctx:
- self._enablePairingCompleteCallback(True)
- await self._ChipStack.CallAsync(
- lambda: self._dmLib.pychip_DeviceController_ConnectIP(
- self.devCtrl, ipaddr.encode("utf-8"), setupPinCode, nodeid)
- )
-
- return await asyncio.futures.wrap_future(ctx.future)
-
def NOCChainCallback(self, nocChain):
'''
Callback function for handling the NOC chain result.
diff --git a/src/controller/python/tests/scripts/base.py b/src/controller/python/tests/scripts/base.py
index e722bc9..df7ebbe 100644
--- a/src/controller/python/tests/scripts/base.py
+++ b/src/controller/python/tests/scripts/base.py
@@ -45,6 +45,7 @@
from matter.ChipStack import ChipStack
from matter.crypto import p256keypair
from matter.exceptions import ChipStackException
+from matter.setup_payload import SetupPayload
from matter.storage import PersistentStorageJSON
from matter.utils import CommissioningBuildingBlocks
@@ -317,17 +318,6 @@
await self.devCtrl.Commission(nodeid)
return self.devCtrl.CheckTestCommissionerCallbacks() and self.devCtrl.CheckTestCommissionerPaseConnection(nodeid)
- async def TestCommissioning(self, ip: str, setuppin: int, nodeid: int):
- self.logger.info("Commissioning device {}".format(ip))
- try:
- await self.devCtrl.CommissionIP(ip, setuppin, nodeid)
- except ChipStackException:
- self.logger.exception(
- "Failed to finish commissioning device {}".format(ip))
- return False
- self.logger.info("Commissioning finished.")
- return True
-
async def TestCommissioningWithSetupPayload(self, setupPayload: str, nodeid: int, discoveryType: int = 2):
self.logger.info("Commissioning device with setup payload {}".format(setupPayload))
try:
@@ -339,17 +329,17 @@
self.logger.info("Commissioning finished.")
return True
- async def TestOnNetworkCommissioning(self, discriminator: int, setuppin: int, nodeid: int, ip_override: str = None):
+ async def TestOnNetworkCommissioning(self, discriminator: int, setuppin: int, nodeid: int):
self.logger.info("Testing discovery")
device = await self.TestDiscovery(discriminator=discriminator)
+
+ qr = SetupPayload().GenerateQrCode(passcode=setuppin, discriminator=discriminator)
+
if not device:
self.logger.info("Failed to discover any devices.")
return False
- address = device.addresses[0]
- if ip_override:
- address = ip_override
self.logger.info("Testing commissioning")
- if not await self.TestCommissioning(address, setuppin, nodeid):
+ if not await self.TestCommissioningWithSetupPayload(qr, nodeid):
self.logger.info("Failed to finish commissioning")
return False
return True
@@ -778,7 +768,7 @@
return True
- async def TestMultiFabric(self, ip: str, setuppin: int, nodeid: int):
+ async def TestMultiFabric(self, setup_code: str, nodeid: int):
self.logger.info("Opening Commissioning Window")
await self.devCtrl.SendCommand(
@@ -796,10 +786,9 @@
self.controllerNodeId, self.paaTrustStorePath)
try:
- await self.devCtrl2.CommissionIP(ip, setuppin, nodeid)
+ await self.devCtrl2.CommissionWithCode(setupPayload=setup_code, nodeid=nodeid)
except ChipStackException:
- self.logger.exception(
- "Failed to finish key exchange with device {}".format(ip))
+ self.logger.exception("Failed to finish key exchange with device")
return False
#
diff --git a/src/controller/python/tests/scripts/commissioning_test.py b/src/controller/python/tests/scripts/commissioning_test.py
index ac79545..fc9a446 100755
--- a/src/controller/python/tests/scripts/commissioning_test.py
+++ b/src/controller/python/tests/scripts/commissioning_test.py
@@ -60,16 +60,6 @@
metavar="<timeout-second>",
)
optParser.add_option(
- "-a",
- "--address",
- action="store",
- dest="deviceAddress",
- default='',
- type='str',
- help="Address of the device",
- metavar="<device-addr>",
- )
- optParser.add_option(
"--setup-payload",
action="store",
dest="setupPayload",
@@ -131,20 +121,14 @@
FailIfNot(test.SetNetworkCommissioningParameters(dataset=TEST_THREAD_NETWORK_DATASET_TLV),
"Failed to finish network commissioning")
- if options.deviceAddress:
- logger.info("Testing commissioning (IP)")
- FailIfNot(await test.TestCommissioning(ip=options.deviceAddress,
- setuppin=20202021,
- nodeid=options.nodeid),
- "Failed to finish commissioning")
- elif options.setupPayload:
+ if options.setupPayload:
logger.info("Testing commissioning (w/ Setup Payload)")
FailIfNot(await test.TestCommissioningWithSetupPayload(setupPayload=options.setupPayload,
nodeid=options.nodeid,
discoveryType=options.discoveryType),
"Failed to finish commissioning")
else:
- TestFail("Must provide device address or setup payload to commissioning the device")
+ TestFail("Must provide device setup payload to commissioning the device")
logger.info("Testing on off cluster")
FailIfNot(await test.TestOnOffCluster(nodeid=options.nodeid,
diff --git a/src/controller/python/tests/scripts/failsafe_tests.py b/src/controller/python/tests/scripts/failsafe_tests.py
index 9e4d4bb..7c16480 100755
--- a/src/controller/python/tests/scripts/failsafe_tests.py
+++ b/src/controller/python/tests/scripts/failsafe_tests.py
@@ -59,14 +59,20 @@
metavar="<timeout-second>",
)
optParser.add_option(
- "-a",
- "--address",
+ "-d",
+ "--discriminator",
action="store",
- dest="deviceAddress",
- default='',
- type='str',
- help="Address of the device",
- metavar="<device-addr>",
+ dest="discriminator",
+ type='int',
+ help="Discriminator of the device",
+ )
+ optParser.add_option(
+ "-c",
+ "--passcode",
+ action="store",
+ dest="passcode",
+ type='int',
+ help="Passcode of the device",
)
optParser.add_option(
"-p",
@@ -95,9 +101,9 @@
"Failed to finish network commissioning")
logger.info("Testing commissioning")
- FailIfNot(await test.TestCommissioning(ip=options.deviceAddress,
- setuppin=20202021,
- nodeid=1),
+ FailIfNot(await test.TestOnNetworkCommissioning(discriminator=options.discriminator,
+ setuppin=options.passcode,
+ nodeid=1),
"Failed to finish key exchange")
FailIfNot(await test.TestFailsafe(nodeid=1), "Failed failsafe test")
diff --git a/src/controller/python/tests/scripts/icd_device_test.py b/src/controller/python/tests/scripts/icd_device_test.py
index e93ee5d..2dfffb6 100755
--- a/src/controller/python/tests/scripts/icd_device_test.py
+++ b/src/controller/python/tests/scripts/icd_device_test.py
@@ -57,25 +57,6 @@
metavar="<timeout-second>",
)
optParser.add_option(
- "-a",
- "--address",
- action="store",
- dest="deviceAddress",
- default='',
- type='str',
- help="Address of the device",
- metavar="<device-addr>",
- )
- optParser.add_option(
- "--setup-payload",
- action="store",
- dest="setupPayload",
- default='',
- type='str',
- help="Setup Payload (manual pairing code or QR code content)",
- metavar="<setup-payload>"
- )
- optParser.add_option(
"--nodeid",
action="store",
dest="nodeid",
@@ -91,7 +72,13 @@
default=TEST_DISCRIMINATOR,
type=int,
help="Discriminator of the device",
- metavar="<nodeid>"
+ )
+ optParser.add_option(
+ "--passcode",
+ action="store",
+ dest="passcode",
+ type=int,
+ help="setup passcdoe",
)
optParser.add_option(
"-p",
@@ -133,9 +120,9 @@
devCtrl = test.devCtrl
devCtrl.EnableICDRegistration(devCtrl.GenerateICDRegistrationParameters())
logger.info("Testing commissioning")
- FailIfNot(await test.TestCommissioning(ip=options.deviceAddress,
- setuppin=20202021,
- nodeid=options.nodeid),
+ FailIfNot(await test.TestOnNetworkCommissioning(discriminator=options.discriminator,
+ setuppin=options.passcode,
+ nodeid=options.nodeid),
"Failed to finish key exchange")
logger.info("Commissioning completed")
diff --git a/src/controller/python/tests/scripts/mobile-device-test.py b/src/controller/python/tests/scripts/mobile-device-test.py
index 52d7b82..742c710 100755
--- a/src/controller/python/tests/scripts/mobile-device-test.py
+++ b/src/controller/python/tests/scripts/mobile-device-test.py
@@ -48,6 +48,7 @@
from network_commissioning import NetworkCommissioningTests
import matter.logging
+from matter.setup_payload import SetupPayload
from matter.tracing import TracingContext
# The thread network dataset tlv for testing, splitted into T-L-V.
@@ -76,23 +77,18 @@
ALL_TESTS = ['network_commissioning', 'datamodel']
-async def ethernet_commissioning(test: BaseTestHelper, discriminator: int, setup_pin: int, address_override: str, device_nodeid: int):
+async def ethernet_commissioning(test: BaseTestHelper, discriminator: int, setup_pin: int, device_nodeid: int):
logger.info("Testing discovery")
device = await test.TestDiscovery(discriminator=discriminator)
FailIfNot(device, "Failed to discover any devices.")
- address = device.addresses[0]
-
# FailIfNot(test.SetNetworkCommissioningParameters(dataset=TEST_THREAD_NETWORK_DATASET_TLV),
# "Failed to finish network commissioning")
- if address_override:
- address = address_override
+ qr = SetupPayload().GenerateQrCode(passcode=setup_pin, discriminator=discriminator)
logger.info("Testing commissioning")
- FailIfNot(await test.TestCommissioning(ip=address,
- setuppin=setup_pin,
- nodeid=device_nodeid),
+ FailIfNot(await test.TestCommissioningWithSetupPayload(setupPayload=qr, nodeid=device_nodeid),
"Failed to finish key exchange")
logger.info("Testing multi-controller setup on the same fabric")
@@ -101,9 +97,7 @@
logger.info("Testing CATs used on controllers")
FailIfNot(await test.TestControllerCATValues(nodeid=device_nodeid), "Failed the controller CAT test")
- ok = await test.TestMultiFabric(ip=address,
- setuppin=20202021,
- nodeid=1)
+ ok = await test.TestMultiFabric(setup_code=qr, nodeid=1)
FailIfNot(ok, "Failed to commission multi-fabric")
FailIfNot(await test.TestAddUpdateRemoveFabric(nodeid=device_nodeid),
@@ -173,7 +167,7 @@
asyncio.run(test.TestFabricSensitive(nodeid=device_nodeid))
-def do_tests(controller_nodeid, device_nodeid, address, timeout, discriminator, setup_pin, paa_trust_store_path):
+def do_tests(controller_nodeid, device_nodeid, timeout, discriminator, setup_pin, paa_trust_store_path):
timeoutTicker = TestTimeout(timeout)
timeoutTicker.start()
@@ -182,8 +176,7 @@
matter.logging.RedirectToPythonLogging()
- asyncio.run(ethernet_commissioning(test, discriminator, setup_pin, address,
- device_nodeid))
+ asyncio.run(ethernet_commissioning(test, discriminator, setup_pin, device_nodeid))
logger.info("Testing resolve")
FailIfNot(test.TestResolve(nodeid=device_nodeid),
@@ -216,10 +209,6 @@
default=TEST_DEVICE_NODE_ID,
type=int,
help="NodeId of the device.")
-@click.option("--address", "-a",
- default='',
- type=str,
- help="Skip commissionee discovery, commission the device with the IP directly.")
@click.option("--timeout", "-t",
default=240,
type=int,
@@ -270,7 +259,7 @@
@click.option('--fail-on-skipped',
is_flag=True,
help="Fail the test if any test cases are skipped")
-def run(controller_nodeid, device_nodeid, address, timeout, discriminator, setup_pin, enable_test, disable_test, log_level,
+def run(controller_nodeid, device_nodeid, timeout, discriminator, setup_pin, enable_test, disable_test, log_level,
log_format, print_test_list, paa_trust_store_path, trace_to, app_pid, fail_on_skipped):
coloredlogs.install(level=log_level, fmt=log_format, logger=logger)
@@ -295,7 +284,7 @@
for destination in trace_to:
tracing_ctx.StartFromString(destination)
- do_tests(controller_nodeid, device_nodeid, address, timeout,
+ do_tests(controller_nodeid, device_nodeid, timeout,
discriminator, setup_pin, paa_trust_store_path)
diff --git a/src/controller/python/tests/scripts/subscription_resumption_capacity_test_ctrl1.py b/src/controller/python/tests/scripts/subscription_resumption_capacity_test_ctrl1.py
index dc126a1..7009b3d 100755
--- a/src/controller/python/tests/scripts/subscription_resumption_capacity_test_ctrl1.py
+++ b/src/controller/python/tests/scripts/subscription_resumption_capacity_test_ctrl1.py
@@ -45,16 +45,6 @@
metavar="<timeout-second>",
)
optParser.add_option(
- "-a",
- "--address",
- action="store",
- dest="deviceAddress",
- default='',
- type='str',
- help="Address of the device",
- metavar="<device-addr>",
- )
- optParser.add_option(
"--nodeid",
action="store",
dest="nodeid",
@@ -110,7 +100,7 @@
nodeid=112233, paaTrustStorePath=options.paaTrustStorePath, testCommissioner=True)
FailIfNot(
- await test.TestOnNetworkCommissioning(options.discriminator, options.setuppin, options.nodeid, options.deviceAddress),
+ await test.TestOnNetworkCommissioning(options.discriminator, options.setuppin, options.nodeid),
"Failed on on-network commissioning")
FailIfNot(
diff --git a/src/controller/python/tests/scripts/subscription_resumption_capacity_test_ctrl2.py b/src/controller/python/tests/scripts/subscription_resumption_capacity_test_ctrl2.py
index 2f50e80..9229777 100755
--- a/src/controller/python/tests/scripts/subscription_resumption_capacity_test_ctrl2.py
+++ b/src/controller/python/tests/scripts/subscription_resumption_capacity_test_ctrl2.py
@@ -122,7 +122,7 @@
nodeid=112244, paaTrustStorePath=options.paaTrustStorePath, testCommissioner=True)
FailIfNot(
- await test.TestOnNetworkCommissioning(options.discriminator, options.setuppin, options.nodeid, options.deviceAddress),
+ await test.TestOnNetworkCommissioning(options.discriminator, options.setuppin, options.nodeid),
"Failed on on-network commissioning")
FailIfNot(
diff --git a/src/controller/python/tests/scripts/subscription_resumption_test.py b/src/controller/python/tests/scripts/subscription_resumption_test.py
index b7420c8..31a4d96 100755
--- a/src/controller/python/tests/scripts/subscription_resumption_test.py
+++ b/src/controller/python/tests/scripts/subscription_resumption_test.py
@@ -112,7 +112,7 @@
nodeid=112233, paaTrustStorePath=options.paaTrustStorePath, testCommissioner=True)
FailIfNot(
- await test.TestOnNetworkCommissioning(options.discriminator, options.setuppin, options.nodeid, options.deviceAddress),
+ await test.TestOnNetworkCommissioning(options.discriminator, options.setuppin, options.nodeid),
"Failed on on-network commissioning")
FailIfNot(
diff --git a/src/controller/python/tests/scripts/subscription_resumption_timeout_test.py b/src/controller/python/tests/scripts/subscription_resumption_timeout_test.py
index 39e5133..9341aae 100755
--- a/src/controller/python/tests/scripts/subscription_resumption_timeout_test.py
+++ b/src/controller/python/tests/scripts/subscription_resumption_timeout_test.py
@@ -47,16 +47,6 @@
metavar="<timeout-second>",
)
optParser.add_option(
- "-a",
- "--address",
- action="store",
- dest="deviceAddress",
- default='',
- type='str',
- help="Address of the device",
- metavar="<device-addr>",
- )
- optParser.add_option(
"--nodeid",
action="store",
dest="nodeid",
@@ -103,7 +93,7 @@
nodeid=112233, paaTrustStorePath=options.paaTrustStorePath, testCommissioner=True)
FailIfNot(
- await test.TestOnNetworkCommissioning(options.discriminator, options.setuppin, options.nodeid, options.deviceAddress),
+ await test.TestOnNetworkCommissioning(options.discriminator, options.setuppin, options.nodeid),
"Failed on on-network commissioning")
try:
diff --git a/src/test_driver/linux-cirque/CommissioningTest.py b/src/test_driver/linux-cirque/CommissioningTest.py
index ed3dbb0..c0e9753 100755
--- a/src/test_driver/linux-cirque/CommissioningTest.py
+++ b/src/test_driver/linux-cirque/CommissioningTest.py
@@ -140,19 +140,6 @@
CHIP_REPO, "out/debug/linux_x64_gcc/controller/python/matter_repl-1.0.0-py3-none-any.whl")))
command = ("gdb -return-child-result -q -ex run -ex bt --args python3 "
- "{} -t 150 -a {} --paa-trust-store-path {} --discriminator {} --nodeid {}").format(
- os.path.join(
- CHIP_REPO, "src/controller/python/tests/scripts/commissioning_test.py"),
- servers[0]['ip'],
- os.path.join(CHIP_REPO, MATTER_DEVELOPMENT_PAA_ROOT_CERTS),
- servers[0]['discriminator'],
- servers[0]['nodeid'])
- ret = self.execute_device_cmd(req_device_id, command)
-
- self.assertEqual(ret['return_code'], '0',
- "Test failed: non-zero return code")
-
- command = ("gdb -return-child-result -q -ex run -ex bt --args python3 "
"{} -t 150 --paa-trust-store-path {} --discriminator {} --setup-payload {} --nodeid {} --discovery-type {}").format(
os.path.join(
CHIP_REPO, "src/controller/python/tests/scripts/commissioning_test.py"),
diff --git a/src/test_driver/linux-cirque/FailsafeTest.py b/src/test_driver/linux-cirque/FailsafeTest.py
index 152dd27..e8b9a66 100755
--- a/src/test_driver/linux-cirque/FailsafeTest.py
+++ b/src/test_driver/linux-cirque/FailsafeTest.py
@@ -37,6 +37,7 @@
os.path.dirname(__file__)), "..", "..", "..")
TEST_EXTPANID = "fedcba9876543210"
TEST_DISCRIMINATOR = 3840
+TEST_PASSCODE = 20202021
MATTER_DEVELOPMENT_PAA_ROOT_CERTS = "credentials/development/paa-root-certs"
DEVICE_CONFIG = {
@@ -73,8 +74,6 @@
self.run_controller_test()
def run_controller_test(self):
- ethernet_ip = [device['description']['ipv6_addr'] for device in self.non_ap_devices
- if device['type'] == 'CHIPEndDevice'][0]
server_ids = [device['id'] for device in self.non_ap_devices
if device['type'] == 'CHIPEndDevice']
req_ids = [device['id'] for device in self.non_ap_devices
@@ -98,10 +97,11 @@
self.execute_device_cmd(req_device_id, "pip3 install --break-system-packages {}".format(os.path.join(
CHIP_REPO, "out/debug/linux_x64_gcc/controller/python/matter_repl-1.0.0-py3-none-any.whl")))
- command = "gdb -return-child-result -q -ex run -ex bt --args python3 {} -t 150 -a {} --paa-trust-store-path {}".format(
+ command = "gdb -return-child-result -q -ex run -ex bt --args python3 {} -t 150 -d {} -c {} --paa-trust-store-path {}".format(
os.path.join(
CHIP_REPO, "src/controller/python/tests/scripts/failsafe_tests.py"),
- ethernet_ip,
+ TEST_DISCRIMINATOR,
+ TEST_PASSCODE,
os.path.join(CHIP_REPO, MATTER_DEVELOPMENT_PAA_ROOT_CERTS))
ret = self.execute_device_cmd(req_device_id, command)
diff --git a/src/test_driver/linux-cirque/IcdDeviceTest.py b/src/test_driver/linux-cirque/IcdDeviceTest.py
index 6c33dc9..d23c389 100755
--- a/src/test_driver/linux-cirque/IcdDeviceTest.py
+++ b/src/test_driver/linux-cirque/IcdDeviceTest.py
@@ -41,6 +41,7 @@
TEST_DISCRIMINATOR3 = 1203
TEST_DISCRIMINATOR4 = 2145
TEST_DISCOVERY_TYPE = [0, 1, 2]
+TEST_PASSCODE = 20202021
MATTER_DEVELOPMENT_PAA_ROOT_CERTS = "credentials/development/paa-root-certs"
TEST_EVENT_KEY_HEX = "00112233445566778899aabbccddeeff"
@@ -79,8 +80,6 @@
self.run_controller_test()
def run_controller_test(self):
- ethernet_ip = [device['description']['ipv6_addr'] for device in self.non_ap_devices
- if device['type'] == 'CHIPEndDevice'][0]
server_ids = [device['id'] for device in self.non_ap_devices
if device['type'] == 'CHIPEndDevice']
req_ids = [device['id'] for device in self.non_ap_devices
@@ -105,9 +104,10 @@
CHIP_REPO, "out/debug/linux_x64_gcc/controller/python/matter_repl-1.0.0-py3-none-any.whl")))
command = ("gdb -batch -return-child-result -q -ex run -ex \"thread apply all bt\" "
- "--args python3 {} -t 300 -a {} --paa-trust-store-path {} --test-event-key {}").format(
+ "--args python3 {} -t 300 --discriminator {} --passcode {} --paa-trust-store-path {} --test-event-key {}").format(
os.path.join(
- CHIP_REPO, "src/controller/python/tests/scripts/icd_device_test.py"), ethernet_ip,
+ CHIP_REPO, "src/controller/python/tests/scripts/icd_device_test.py"),
+ TEST_DISCRIMINATOR, TEST_PASSCODE,
os.path.join(CHIP_REPO, MATTER_DEVELOPMENT_PAA_ROOT_CERTS), TEST_EVENT_KEY_HEX)
ret = self.execute_device_cmd(req_device_id, command)
diff --git a/src/test_driver/linux-cirque/MobileDeviceTest.py b/src/test_driver/linux-cirque/MobileDeviceTest.py
index 87079d2..291f085 100755
--- a/src/test_driver/linux-cirque/MobileDeviceTest.py
+++ b/src/test_driver/linux-cirque/MobileDeviceTest.py
@@ -73,8 +73,6 @@
self.run_controller_test()
def run_controller_test(self):
- ethernet_ip = [device['description']['ipv6_addr'] for device in self.non_ap_devices
- if device['type'] == 'CHIPEndDevice'][0]
server_ids = [device['id'] for device in self.non_ap_devices
if device['type'] == 'CHIPEndDevice']
req_ids = [device['id'] for device in self.non_ap_devices
@@ -99,9 +97,9 @@
CHIP_REPO, "out/debug/linux_x64_gcc/controller/python/matter_repl-1.0.0-py3-none-any.whl")))
command = ("gdb -batch -return-child-result -q -ex run -ex \"thread apply all bt\" "
- "--args python3 {} -t 300 -a {} --paa-trust-store-path {}").format(
+ "--args python3 {} -t 300 --paa-trust-store-path {}").format(
os.path.join(
- CHIP_REPO, "src/controller/python/tests/scripts/mobile-device-test.py"), ethernet_ip,
+ CHIP_REPO, "src/controller/python/tests/scripts/mobile-device-test.py"),
os.path.join(CHIP_REPO, MATTER_DEVELOPMENT_PAA_ROOT_CERTS))
ret = self.execute_device_cmd(req_device_id, command)
diff --git a/src/test_driver/linux-cirque/SubscriptionResumptionCapacityTest.py b/src/test_driver/linux-cirque/SubscriptionResumptionCapacityTest.py
index f4bb39c..cd4ba87 100755
--- a/src/test_driver/linux-cirque/SubscriptionResumptionCapacityTest.py
+++ b/src/test_driver/linux-cirque/SubscriptionResumptionCapacityTest.py
@@ -133,10 +133,10 @@
CHIP_REPO, "out/debug/linux_x64_gcc/controller/python/matter_repl-1.0.0-py3-none-any.whl")))
command1 = ("gdb -batch -return-child-result -q -ex run -ex \"thread apply all bt\" "
- "--args python3 {} -t 300 -a {} --paa-trust-store-path {} --subscription-capacity {}").format(
+ "--args python3 {} -t 300 --paa-trust-store-path {} --subscription-capacity {}").format(
os.path.join(CHIP_REPO, "src/controller/python/tests/scripts",
"subscription_resumption_capacity_test_ctrl1.py"),
- ethernet_ip, os.path.join(CHIP_REPO, MATTER_DEVELOPMENT_PAA_ROOT_CERTS),
+ os.path.join(CHIP_REPO, MATTER_DEVELOPMENT_PAA_ROOT_CERTS),
TEST_SUBSCRIPTION_CAPACITY)
ret1 = self.execute_device_cmd(req_ids[0], command1)
diff --git a/src/test_driver/linux-cirque/SubscriptionResumptionTimeoutTest.py b/src/test_driver/linux-cirque/SubscriptionResumptionTimeoutTest.py
index a0d8053..f0368d0 100755
--- a/src/test_driver/linux-cirque/SubscriptionResumptionTimeoutTest.py
+++ b/src/test_driver/linux-cirque/SubscriptionResumptionTimeoutTest.py
@@ -84,8 +84,6 @@
self.run_subscription_resumption_timeout_test()
def run_subscription_resumption_timeout_test(self):
- ethernet_ip = [device['description']['ipv6_addr'] for device in self.non_ap_devices
- if device['type'] == 'CHIPEndDevice'][0]
server_ids = [device['id'] for device in self.non_ap_devices
if device['type'] == 'CHIPEndDevice']
req_ids = [device['id'] for device in self.non_ap_devices
@@ -111,9 +109,9 @@
CHIP_REPO, "out/debug/linux_x64_gcc/controller/python/matter_repl-1.0.0-py3-none-any.whl")))
command = ("gdb -batch -return-child-result -q -ex run -ex \"thread apply all bt\" "
- "--args python3 {} -t 300 -a {} --paa-trust-store-path {}").format(
+ "--args python3 {} -t 300 --paa-trust-store-path {}").format(
os.path.join(
- CHIP_REPO, "src/controller/python/tests/scripts/subscription_resumption_timeout_test.py"), ethernet_ip,
+ CHIP_REPO, "src/controller/python/tests/scripts/subscription_resumption_timeout_test.py"),
os.path.join(CHIP_REPO, MATTER_DEVELOPMENT_PAA_ROOT_CERTS))
ret = self.execute_device_cmd(req_device_id, command)
