Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[controller] Add IP rendezvous feature to CHIP Device controller #4050

Merged
merged 16 commits into from
Dec 9, 2020
+202 −45
Merged

[controller] Add IP rendezvous feature to CHIP Device controller #4050

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
615466a
Add IP rendezvous to ChipDeviceController
erjiaqing Nov 30, 2020
d156140
Fix NodeId issue
erjiaqing Nov 30, 2020
8cdb2ac
Disable network provisioning for IP rendezvous
erjiaqing Dec 1, 2020
b5a9394
Update cirque tests
erjiaqing Dec 2, 2020
d6e1418
Remove bypass_rendezvous flag for cirque tests
erjiaqing Dec 2, 2020
b91fe57
Fix BLE rendezvous
erjiaqing Dec 2, 2020
010cbc6
Fix format issue
erjiaqing Dec 2, 2020
1cb6bad
Rollback most style changes in python scripts
erjiaqing Dec 2, 2020
da51b99
Address comments
erjiaqing Dec 3, 2020
aea8e46
Merge remote-tracking branch 'chip/master' into issue_4038
erjiaqing Dec 8, 2020
fe7185d
Address comments
erjiaqing Dec 8, 2020
dfbe58a
Restyled by clang-format
restyled-commits Dec 8, 2020
3905f1b
Add copyright header
erjiaqing Dec 8, 2020
2c1538b
Fix log in cirque test
erjiaqing Dec 8, 2020
5459a4f
Fix cirque test
erjiaqing Dec 8, 2020
c87550f
Add todo for mIsIPRendezvous flag
erjiaqing Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update cirque tests
@erjiaqing
erjiaqing committed Dec 2, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit b5a9394f9af6478d1d1d61f12bec19d413b3ccc8
26 changes: 18 additions & 8 deletions src/test_driver/linux-cirque/test-on-off-cluster.py
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,8 @@
}
}

SETUPPINCODE = 12345678
DISCRIMINATOR = 1 # Randomw number, not used
CHIP_PORT = 11097

CIRQUE_URL = "http://localhost:5000"
@@ -80,22 +82,30 @@ def run_data_model_test(self):
command = "chip-tool onoff {} 1"

for ip in server_ip_address:
ret = self.execute_device_cmd(tool_device_id, "chip-tool pairing bypass {} {}".format(ip, CHIP_PORT))
self.assertEqual(ret['return_code'], '0', "{} command failure: {}".format("pairing bypass", ret['output']))
ret = self.execute_device_cmd(
tool_device_id, "chip-tool pairing softap ssid_not_used passwd_not_used {} {} {} {}".format(SETUPPINCODE, DISCRIMINATOR, ip, CHIP_PORT))
self.assertEqual(ret['return_code'], '0', "{} command failure: {}".format(
"pairing bypass", ret['output']))

ret = self.execute_device_cmd(tool_device_id, command.format("on"))
self.assertEqual(ret['return_code'], '0', "{} command failure: {}".format("on", ret['output']))
self.assertEqual(
ret['return_code'], '0', "{} command failure: {}".format("on", ret['output']))

ret = self.execute_device_cmd(tool_device_id, command.format("off"))
self.assertEqual(ret['return_code'], '0', "{} command failure: {}".format("off", ret['output']))
ret = self.execute_device_cmd(
tool_device_id, command.format("off"))
self.assertEqual(
ret['return_code'], '0', "{} command failure: {}".format("off", ret['output']))

ret = self.execute_device_cmd(tool_device_id, "chip-tool pairing unpair")
self.assertEqual(ret['return_code'], '0', "{} command failure: {}".format("pairing unpair", ret['output']))
ret = self.execute_device_cmd(
tool_device_id, "chip-tool pairing unpair")
self.assertEqual(ret['return_code'], '0', "{} command failure: {}".format(
"pairing unpair", ret['output']))

time.sleep(1)

for device_id in server_ids:
self.logger.info("checking device log for {}".format(self.get_device_pretty_id(device_id)))
self.logger.info("checking device log for {}".format(
self.get_device_pretty_id(device_id)))
self.assertTrue(self.sequenceMatch(self.get_device_log(device_id).decode('utf-8'), ["LightingManager::InitiateAction(ON_ACTION)", "LightingManager::InitiateAction(OFF_ACTION)"]),
"Datamodel test failed: cannot find matching string from device {}".format(device_id))