[controller] Network commissioning support on Controller #4622

erjiaqing · 2021-02-03T04:04:12Z

Problem

Add network provisioning cluster define for provisioning use, also adds support on controller side.

Support on end device side will be a seperate PR later.

This PR also fixs support for ByteString in encoder for interaction model.

Summary of Changes

See above.

Fixes #3945

LuDuda

@erjiaqing thank you for doing this! LGTM 👍

Few questions - more about specification..:

How controller obtains Thread Operational Credentials (is it out of the spec, and we should use MeshCop connection to Thread Border Router)?
How Controller will know if the device operates on WiFi or Thread? Or the user will always need to know that and configure it manually?

LuDuda · 2021-02-03T15:16:07Z

src/app/encoder.cpp

+ .Put8(kSeqNum)
+ .Put8(ZCL_ADD_THREAD_NETWORK_COMMAND_ID)
+ .Put(static_cast<uint8_t>(operationalDatasetStrLen))
+ .Put(reinterpret_cast<char *>(operationalDataset))


Just a question.. Why we send Operational Dataset in a form of a string and not in the binary form of Operational Dataset TLV?

@vivien-apple I think we need BYTE_STRING type support in encoder and dispatcher. (item 1 in #4503 )

Right. String are not a first class citizen of the encoder at the moment. I need to have a look at them at some point, since I think I have seen some bugs even for regular strings...

todo · 2021-02-04T07:34:54Z

</description>

connectedhomeip/src/app/zap-templates/zcl/provisioning.xml

Lines 61 to 71 in f1b7b31

 <description>TODO</description> 

 <code>0xaaaa</code> 

 <define>NWPROV_CLUSTER</define> 

 <client tick="false" init="false">true</client> 

 <server tick="false" init="false">true</server> 

 <command source="client" code="0x00" name="ScanNetworks" optional="false" cli="chip nwprov scannetworks"> 

 <description>TODO</description> 

 <arg name="SSID" type="OCTET_STRING"/> 

 <arg name="Breadcrumb" type="INT64U"/> 

 <arg name="TimeoutMs" type="INT32U"/> 

 </command>

This comment was generated by todo based on a `TODO` comment in `f1b7b31` in #4622. cc @erjiaqing.

todo · 2021-02-04T07:34:57Z

</description>

connectedhomeip/src/app/zap-templates/zcl/provisioning.xml

Lines 67 to 77 in f1b7b31

 <description>TODO</description> 

 <arg name="SSID" type="OCTET_STRING"/> 

 <arg name="Breadcrumb" type="INT64U"/> 

 <arg name="TimeoutMs" type="INT32U"/> 

 </command> 

 <command source="server" code="0x01" name="ScanNetworksResp" optional="false" cli="chip nwprov scannetworksresponse"> 

 <description>TODO</description> 

 <arg name="ErrorCode" type="INT8U"/> 

 <arg name="DebugText" type="CHAR_STRING"/> 

 <arg name="WiFiScanResults" type="WiFiInterfaceScanResult" array="true"/> 

 <arg name="ThreadScanResults" type="ThreadInterfaceScanResult" array="true"/>

This comment was generated by todo based on a `TODO` comment in `f1b7b31` in #4622. cc @erjiaqing.

todo · 2021-02-04T07:35:00Z

</description>

connectedhomeip/src/app/zap-templates/zcl/provisioning.xml

Lines 73 to 83 in f1b7b31

 <description>TODO</description> 

 <arg name="ErrorCode" type="INT8U"/> 

 <arg name="DebugText" type="CHAR_STRING"/> 

 <arg name="WiFiScanResults" type="WiFiInterfaceScanResult" array="true"/> 

 <arg name="ThreadScanResults" type="ThreadInterfaceScanResult" array="true"/> 

 </command> 

 <command source="client" code="0x02" name="AddWiFiNetwork" optional="false" cli="chip nwprov addwifinetwork"> 

 <description>TODO</description> 

 <arg name="SSID" type="OCTET_STRING"/> 

 <arg name="Credentials" type="OCTET_STRING"/> 

 <arg name="Breadcrumb" type="INT64U"/>

This comment was generated by todo based on a `TODO` comment in `f1b7b31` in #4622. cc @erjiaqing.

…controller

src/app/zap-templates/partials/header.zapt

src/app/zap-templates/templates/chip/CHIPClustersObjc-src.zapt

src/app/zap-templates/zcl/provisioning.xml

examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

…controller

erjiaqing · 2021-02-18T13:48:36Z

@vivien-apple All comment resolved, PTAL.

github-actions · 2021-02-18T14:29:59Z

Size increase report for "nrfconnect-example-build" from e76ed54

File	Section	File	VM
chip-shell.elf	text	480	480
chip-shell.elf	rodata	72	68
chip-shell.elf	bss	0	27
chip-shell.elf	log_const_sections	12	12
chip-shell.elf	init_array	4	4
chip-shell.elf	[LOAD #3 [RW]]	0	-27
chip-lighting.elf	text	416	416
chip-lighting.elf	rodata	72	68
chip-lighting.elf	[LOAD #3 [RW]]	0	19
chip-lighting.elf	bss	0	13
chip-lighting.elf	init_array	4	4
chip-lighting.elf	shell_root_cmds_sections	-4	-4
chip-lock.elf	text	420	420
chip-lock.elf	rodata	64	68
chip-lock.elf	[LOAD #3 [RW]]	0	23
chip-lock.elf	bss	0	9
chip-lock.elf	init_array	4	4
chip-lock.elf	shell_root_cmds_sections	-8	-8

Full report output

BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-shell.elf and ./pull_artifact/chip-shell.elf:

sections,vmsize,filesize
.debug_info,0,36436
.debug_line,0,5482
.debug_abbrev,0,5010
.debug_str,0,2513
.debug_loc,0,1475
.strtab,0,1442
.symtab,0,1008
text,480,480
.debug_frame,0,452
.debug_ranges,0,296
.debug_aranges,0,216
rodata,68,72
bss,27,0
log_const_sections,12,12
init_array,4,4
.shstrtab,0,-2
[LOAD #3 [RW]],-27,0

Comparing ./master_artifact/chip-lighting.elf and ./pull_artifact/chip-lighting.elf:

sections,vmsize,filesize
.debug_info,0,37146
.debug_line,0,5508
.debug_abbrev,0,5270
.debug_str,0,2566
.debug_loc,0,1466
.strtab,0,1425
.symtab,0,976
.debug_frame,0,436
text,416,416
.debug_ranges,0,328
.debug_aranges,0,216
rodata,68,72
[LOAD #3 [RW]],19,0
bss,13,0
init_array,4,4
.shstrtab,0,-1
shell_root_cmds_sections,-4,-4

Comparing ./master_artifact/chip-lock.elf and ./pull_artifact/chip-lock.elf:

sections,vmsize,filesize
.debug_info,0,37146
.debug_line,0,5508
.debug_abbrev,0,5270
.debug_str,0,2566
.debug_loc,0,1458
.strtab,0,1425
.symtab,0,976
.debug_frame,0,436
text,420,420
.debug_ranges,0,328
.debug_aranges,0,216
rodata,68,64
[LOAD #3 [RW]],23,0
bss,9,0
init_array,4,4
.shstrtab,0,-1
shell_root_cmds_sections,-8,-8

github-actions · 2021-02-18T14:41:15Z

Size increase report for "esp32-example-build" from e76ed54

File	Section	File	VM
chip-all-clusters-app.elf	.flash.text	328	328
chip-all-clusters-app.elf	.flash.rodata	64	64
chip-all-clusters-app.elf	.dram0.bss	0	8

Full report output

BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-pigweed-app.elf and ./pull_artifact/chip-pigweed-app.elf:

sections,vmsize,filesize

Comparing ./master_artifact/chip-all-clusters-app.elf and ./pull_artifact/chip-all-clusters-app.elf:

sections,vmsize,filesize
.debug_info,0,75369
.debug_line,0,10368
.debug_abbrev,0,6259
.debug_str,0,2755
.strtab,0,1335
.debug_loc,0,836
.symtab,0,512
.debug_frame,0,480
.shstrtab,0,369
.flash.text,328,328
.debug_aranges,0,216
.xt.prop._ZN4chip11DeviceLayer8Internal31GenericConfigurationManagerImplINS0_24ConfigurationManagerImplEE25_IncrementLifetimeCounterEv,0,76
.flash.rodata,64,64
.xt.prop._ZTVN4chip24LifetimePersistedCounterE,0,52
.xt.prop._ZTVN4chip30MonotonicallyIncreasingCounterE,0,52
.xt.prop._ZN4chip11DeviceLayer8Internal31GenericConfigurationManagerImplINS0_24ConfigurationManagerImplEE12_GetVendorIdERt,0,40
.dram0.bss,8,0
.xt.prop._ZTVN4chip11DeviceLayer37DeviceNetworkProvisioningDelegateImplE,0,1
[Unmapped],0,-64
.debug_ranges,0,-160

erjiaqing · 2021-02-22T16:17:02Z

@woody-apple PTAL
~~BTW, the pullapprove says "CLA must be agreed to by all contributors", but why?~~

…ject-chip#4622)" This reverts commit 1a78a5f.

erjiaqing added 3 commits February 3, 2021 11:55

Add network provisioning cluster xml

40fe28a

Update cluster according to spec

c4a4c88

Add Network Provisioning Support in Controller

a7b4a8c

boring-cyborg bot added app controller darwin examples labels Feb 3, 2021

restyled-io bot mentioned this pull request Feb 3, 2021

Restyle [controller] Network provisioning support on Controller #4623

Closed

woody-apple requested a review from vivien-apple February 3, 2021 04:13

erjiaqing and others added 2 commits February 3, 2021 13:26

Fix type

0b0cf1d

Restyled by prettier-json

9c877da

pullapprove bot requested review from andy31415, BroderickCarlin, bzbarsky-apple, chrisdecenzo, hawk248, jelderton, mspang, saurabhst, shana-apple, wehale and woody-apple February 3, 2021 05:33

yunhanw-google self-requested a review February 3, 2021 06:23

andy31415 approved these changes Feb 3, 2021

View reviewed changes

LuDuda approved these changes Feb 3, 2021

View reviewed changes

yunhanw-google approved these changes Feb 3, 2021

View reviewed changes

Fix python type

f1b7b31

erjiaqing requested a review from vivien-apple February 5, 2021 11:16

mspang approved these changes Feb 5, 2021

View reviewed changes

erjiaqing added 2 commits February 7, 2021 09:46

Merge remote-tracking branch 'chip/master' into network_provisioning_…

9fea1a3

…controller

run gen

8c124a3

erjiaqing force-pushed the network_provisioning_controller branch from f277155 to 8c124a3 Compare February 7, 2021 03:02

restyled-commits added 2 commits February 7, 2021 03:02

Restyled by clang-format

6d84f2a

Restyled by prettier-json

2a15345

restyled-io bot mentioned this pull request Feb 7, 2021

Restyle [controller] Network provisioning support on Controller #4707

Closed

Merge remote-tracking branch 'chip/master' into network_provisioning_…

c07a01f

…controller

vivien-apple requested changes Feb 10, 2021

View reviewed changes

pullapprove bot requested a review from msandstedt February 11, 2021 01:43

erjiaqing and others added 6 commits February 18, 2021 20:47

Merge remote-tracking branch 'chip/master' into network_provisioning_…

a16570d

…controller

Provisioning -> Commissioning

bc58c62

Update zap

429d3ea

Regenerate files

5709bff

Create controller-clusters.zap

dfc0eea

Restyled by prettier-json

1846f29

restyled-io bot mentioned this pull request Feb 18, 2021

Restyle [controller] Network provisioning support on Controller #4920

Closed

erjiaqing requested a review from vivien-apple February 18, 2021 13:48

erjiaqing changed the title ~~[controller] Network provisioning support on Controller~~ [controller] Network commissioning support on Controller Feb 18, 2021

msandstedt approved these changes Feb 18, 2021

View reviewed changes

fix

4d60c7c

vivien-apple approved these changes Feb 22, 2021

View reviewed changes

jelderton approved these changes Feb 22, 2021

View reviewed changes

jelderton merged commit 1a78a5f into project-chip:master Feb 22, 2021

kpschoedel added a commit to kpschoedel/connectedhomeip that referenced this pull request Mar 17, 2021

Revert "[controller] Network commissioning support on Controller (pro…

2f9eb56

…ject-chip#4622)" This reverts commit 1a78a5f.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[controller] Network commissioning support on Controller #4622

[controller] Network commissioning support on Controller #4622

erjiaqing commented Feb 3, 2021 •

edited

Loading

LuDuda left a comment

LuDuda Feb 3, 2021

erjiaqing Feb 3, 2021

vivien-apple Feb 4, 2021

todo bot commented Feb 4, 2021

todo bot commented Feb 4, 2021

todo bot commented Feb 4, 2021

erjiaqing commented Feb 18, 2021

github-actions bot commented Feb 18, 2021

github-actions bot commented Feb 18, 2021

erjiaqing commented Feb 22, 2021 •

edited

Loading

[controller] Network commissioning support on Controller #4622

[controller] Network commissioning support on Controller #4622

Conversation

erjiaqing commented Feb 3, 2021 • edited Loading

Problem

Summary of Changes

LuDuda left a comment

Choose a reason for hiding this comment

LuDuda Feb 3, 2021

Choose a reason for hiding this comment

erjiaqing Feb 3, 2021

Choose a reason for hiding this comment

vivien-apple Feb 4, 2021

Choose a reason for hiding this comment

todo bot commented Feb 4, 2021

</description>

This comment was generated by todo based on a TODO comment in f1b7b31 in #4622. cc @erjiaqing.

todo bot commented Feb 4, 2021

</description>

This comment was generated by todo based on a TODO comment in f1b7b31 in #4622. cc @erjiaqing.

todo bot commented Feb 4, 2021

</description>

This comment was generated by todo based on a TODO comment in f1b7b31 in #4622. cc @erjiaqing.

erjiaqing commented Feb 18, 2021

github-actions bot commented Feb 18, 2021

github-actions bot commented Feb 18, 2021

erjiaqing commented Feb 22, 2021 • edited Loading

erjiaqing commented Feb 3, 2021 •

edited

Loading

This comment was generated by todo based on a `TODO` comment in `f1b7b31` in #4622. cc @erjiaqing.

This comment was generated by todo based on a `TODO` comment in `f1b7b31` in #4622. cc @erjiaqing.

This comment was generated by todo based on a `TODO` comment in `f1b7b31` in #4622. cc @erjiaqing.

erjiaqing commented Feb 22, 2021 •

edited

Loading