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

Jump to bottom

[OTA-R] Use delayedActionTime to delay QueryImage when supplied #18832

Merged
merged 2 commits into from
May 26, 2022
Merged

[OTA-R] Use delayedActionTime to delay QueryImage when supplied #18832

merged 2 commits into from
May 26, 2022

Conversation

isiu-apple
Copy link
Contributor

@isiu-apple isiu-apple commented May 26, 2022 •
edited
Loading

Problem

As per test event 9 TC-SU-2.2 step 5 failed. The step asked to launch the OTA provider by giving the flag to wait 3 min before DUT sends another QueryImage, but it sends the message after 2 min instead.

See Spec section: 11.20.3.2. Querying the OTA Provider, subsection Handling Busy value in Status field.

Fixes: #18432

OTA-P command:
out/apps/ota-provider/chip-ota-provider-app -f ~/Downloads/test2.ota --passcode 20202021 --discriminator 3840 --KVS /tmp/chip_kvs_provider -q busy -t 180

OTA-R command:
out/apps/ota-requestor/chip-ota-requestor-app --discriminator 30 --secured-device-port 5560 --KVS /tmp/chip_kvs_requestor

Chip-tool announce OTA provider command:
out/apps/chip-tool/chip-tool otasoftwareupdaterequestor announce-ota-provider 0x00000000ABCD 0 0 0 0x0000001234567890 0

Change overview

If DelayedActionTime is supplied in the QueryImage response and OTA-P was Busy or NotAvailable, take DelayedActionTime into account when scheduling a delayed QueryImage retry.

Testing

  • Launched OTA-P by supplying the -q busy flag for busy and -t 180 for DelayedActionTime of 3 minutes.
  • Ensured QueryImage response's delayedActionTime field is 180 seconds.
  • Ensured OTA-R delays the QueryImage by 180 seconds.

Issue #18432 OTA-P with fix.txt
Issue #18432 OTA-R with fix.txt
Issue #18432 chiptool with fix.txt

@boring-cyborg boring-cyborg bot added the app label May 26, 2022
@isiu-apple isiu-apple self-assigned this May 26, 2022
@isiu-apple isiu-apple added the ota label May 26, 2022
@github-actions
Copy link

github-actions bot commented May 26, 2022 •
edited
Loading

PR #18832: Size comparison from c0295ae to 50cc3fc

Increases (12 builds for cc13x2_26x2, cyw30739, efr32, linux, nrfconnect)
platform target config section c0295ae 50cc3fc change % change
cc13x2_26x2 lock-ftd LP_CC2652R7 (read only) 675879 675911 32 0.0
.text 581060 581092 32 0.0
lock-mtd LP_CC2652R7 (read only) 625279 625311 32 0.0
.text 530572 530604 32 0.0
pump-app LP_CC2652R7 (read only) 675699 675731 32 0.0
.text 586684 586716 32 0.0
pump-controller-app LP_CC2652R7 (read only) 653643 653659 16 0.0
.text 569888 569904 16 0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 571010 571034 24 0.0
.app_xip_area 466084 466108 24 0.0
efr32 lighting-app BRD4161A (read only) 911292 911356 64 0.0
.text 911284 911348 64 0.0
BRD4161A+rpc (read only) 945448 945512 64 0.0
.text 945440 945504 64 0.0
BRD4161A+rs911x (read only) 785876 785940 64 0.0
.text 785868 785932 64 0.0
lock-app BRD4161A+wf200 (read only) 946424 946456 32 0.0
.text 946416 946448 32 0.0
window-app BRD4161A (read only) 896212 896276 64 0.0
.text 896204 896268 64 0.0
linux ota-requestor-app debug (read only) 2095345 2095457 112 0.0
.text 1759538 1759650 112 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1181335 1181367 32 0.0
text 810280 810308 28 0.0
Decreases (3 builds for cc13x2_26x2)
platform target config section c0295ae 50cc3fc change % change
cc13x2_26x2 lock-ftd LP_CC2652R7 (read/write) 166960 166928 -32 -0.0
pump-app LP_CC2652R7 (read/write) 168564 168532 -32 -0.0
pump-controller-app LP_CC2652R7 (read/write) 190220 190204 -16 -0.0
Full report (37 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section c0295ae 50cc3fc change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 666855 666855 0 0.0
(read/write) 184992 184992 0 0.0
.bss 74828 74828 0 0.0
.data 3400 3400 0 0.0
.rodata 99903 99903 0 0.0
.text 566724 566724 0 0.0
lock-ftd LP_CC2652R7 (read only) 675879 675911 32 0.0
(read/write) 166960 166928 -32 -0.0
.bss 72876 72876 0 0.0
.data 3236 3236 0 0.0
.rodata 94335 94335 0 0.0
.text 581060 581092 32 0.0
lock-mtd LP_CC2652R7 (read only) 625279 625311 32 0.0
(read/write) 145708 145708 0 0.0
.bss 68612 68612 0 0.0
.data 3236 3236 0 0.0
.rodata 94215 94215 0 0.0
.text 530572 530604 32 0.0
pump-app LP_CC2652R7 (read only) 675699 675731 32 0.0
(read/write) 168564 168532 -32 -0.0
.bss 73276 73276 0 0.0
.data 3272 3272 0 0.0
.rodata 88531 88531 0 0.0
.text 586684 586716 32 0.0
pump-controller-app LP_CC2652R7 (read only) 653643 653659 16 0.0
(read/write) 190220 190204 -16 -0.0
.bss 73132 73132 0 0.0
.data 3232 3232 0 0.0
.rodata 83275 83275 0 0.0
.text 569888 569904 16 0.0
shell LP_CC2652R7 (read only) 659870 659870 0 0.0
(read/write) 187536 187536 0 0.0
.bss 77188 77188 0 0.0
.data 3404 3404 0 0.0
.rodata 96870 96870 0 0.0
.text 562776 562776 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 621510 621510 0 0.0
.app_xip_area 524788 524788 0 0.0
.bss 79364 79364 0 0.0
.data 704 704 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 626810 626810 0 0.0
.app_xip_area 531560 531560 0 0.0
.bss 77924 77924 0 0.0
.data 672 672 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 571010 571034 24 0.0
.app_xip_area 466084 466108 24 0.0
.bss 87304 87304 0 0.0
.data 584 584 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 911292 911356 64 0.0
(read/write) 133436 133436 0 0.0
.bss 131384 131384 0 0.0
.data 2052 2052 0 0.0
.text 911284 911348 64 0.0
BRD4161A+rpc (read only) 945448 945512 64 0.0
(read/write) 150128 150128 0 0.0
.bss 147872 147872 0 0.0
.data 2256 2256 0 0.0
.text 945440 945504 64 0.0
BRD4161A+rs911x (read only) 785876 785940 64 0.0
(read/write) 129704 129704 0 0.0
.bss 127644 127644 0 0.0
.data 2060 2060 0 0.0
.text 785868 785932 64 0.0
lock-app BRD4161A+wf200 (read only) 946424 946456 32 0.0
(read/write) 124180 124180 0 0.0
.bss 122156 122156 0 0.0
.data 2024 2024 0 0.0
.text 946416 946448 32 0.0
window-app BRD4161A (read only) 896212 896276 64 0.0
(read/write) 133496 133496 0 0.0
.bss 131448 131448 0 0.0
.data 2048 2048 0 0.0
.text 896204 896268 64 0.0
esp32 all-clusters-app c3devkit (read only) 1000574 1000574 0 0.0
(read/write) 1478914 1478914 0 0.0
.dram0.bss 69392 69392 0 0.0
.dram0.data 14616 14616 0 0.0
.flash.rodata 209472 209472 0 0.0
.flash.text 1000574 1000574 0 0.0
.iram0.text 62954 62954 0 0.0
m5stack (read only) 1055615 1055615 0 0.0
(read/write) 480952 480952 0 0.0
.dram0.bss 74904 74904 0 0.0
.dram0.data 34200 34200 0 0.0
.flash.rodata 239852 239852 0 0.0
.flash.text 1050231 1050231 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 680744 680744 0 0.0
.bss 80424 80424 0 0.0
.data 2008 2008 0 0.0
.text 596608 596608 0 0.0
lock k32w061+release (read/write) 728684 728684 0 0.0
.bss 80856 80856 0 0.0
.data 1976 1976 0 0.0
.text 644148 644148 0 0.0
linux all-clusters-app debug (read only) 2746601 2746601 0 0.0
(read/write) 178240 178240 0 0.0
.bss 86496 86496 0 0.0
.data 2032 2032 0 0.0
.data.rel.ro 83560 83560 0 0.0
.dynamic 608 608 0 0.0
.got 4496 4496 0 0.0
.init 27 27 0 0.0
.init_array 1016 1016 0 0.0
.rodata 240093 240093 0 0.0
.text 2332914 2332914 0 0.0
bridge-app debug+rpc (read only) 2023793 2023793 0 0.0
(read/write) 147896 147896 0 0.0
.bss 73120 73120 0 0.0
.data 3936 3936 0 0.0
.data.rel.ro 65272 65272 0 0.0
.dynamic 592 592 0 0.0
.got 4272 4272 0 0.0
.init 27 27 0 0.0
.init_array 688 688 0 0.0
.rodata 168096 168096 0 0.0
.text 1699538 1699538 0 0.0
chip-tool debug (read only) 9600277 9600277 0 0.0
(read/write) 596016 596016 0 0.0
.bss 23936 23936 0 0.0
.data 1120 1120 0 0.0
.data.rel.ro 564656 564656 0 0.0
.dynamic 624 624 0 0.0
.got 5008 5008 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 492413 492413 0 0.0
.text 7730245 7730245 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9340884 9340884 0 0.0
(read/write) 662145 662145 0 0.0
.bss 42225 42225 0 0.0
.data 1176 1176 0 0.0
.data.rel.ro 599960 599960 0 0.0
.dynamic 560 560 0 0.0
.got 14936 14936 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 456300 456300 0 0.0
.text 7372004 7372004 0 0.0
lighting-app debug+rpc (read only) 2314065 2314065 0 0.0
(read/write) 153536 153536 0 0.0
.bss 74944 74944 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 70776 70776 0 0.0
.dynamic 608 608 0 0.0
.got 4344 4344 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 186760 186760 0 0.0
.text 1961938 1961938 0 0.0
lock-app debug (read only) 2238953 2238953 0 0.0
(read/write) 148600 148600 0 0.0
.bss 73632 73632 0 0.0
.data 1568 1568 0 0.0
.data.rel.ro 67704 67704 0 0.0
.dynamic 592 592 0 0.0
.got 4336 4336 0 0.0
.init 27 27 0 0.0
.init_array 752 752 0 0.0
.rodata 198120 198120 0 0.0
.text 1880898 1880898 0 0.0
ota-provider-app debug (read only) 2066337 2066337 0 0.0
(read/write) 141360 141360 0 0.0
.bss 73024 73024 0 0.0
.data 1768 1768 0 0.0
.data.rel.ro 60776 60776 0 0.0
.dynamic 608 608 0 0.0
.got 4504 4504 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 179768 179768 0 0.0
.text 1728002 1728002 0 0.0
ota-requestor-app debug (read only) 2095345 2095457 112 0.0
(read/write) 144200 144200 0 0.0
.bss 73728 73728 0 0.0
.data 1960 1960 0 0.0
.data.rel.ro 62872 62872 0 0.0
.dynamic 592 592 0 0.0
.got 4344 4344 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 175776 175776 0 0.0
.text 1759538 1759650 112 0.0
shell debug (read only) 2553969 2553969 0 0.0
(read/write) 201744 201744 0 0.0
.bss 117416 117416 0 0.0
.data 1376 1376 0 0.0
.data.rel.ro 77208 77208 0 0.0
.dynamic 608 608 0 0.0
.got 4192 4192 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 220626 220626 0 0.0
.text 2174258 2174258 0 0.0
thermostat-no-ble arm64 (read only) 2359676 2359676 0 0.0
(read/write) 177377 177377 0 0.0
.bss 88177 88177 0 0.0
.data 1520 1520 0 0.0
.data.rel.ro 79872 79872 0 0.0
.dynamic 560 560 0 0.0
.got 4768 4768 0 0.0
.init 24 24 0 0.0
.init_array 376 376 0 0.0
.rodata 147404 147404 0 0.0
.text 1983312 1983312 0 0.0
tv-app debug (read only) 2875001 2875001 0 0.0
(read/write) 280368 280368 0 0.0
.bss 191304 191304 0 0.0
.data 4672 4672 0 0.0
.data.rel.ro 78120 78120 0 0.0
.dynamic 592 592 0 0.0
.got 4728 4728 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 221728 221728 0 0.0
.text 2470786 2470786 0 0.0
tv-casting-app debug (read only) 5432729 5432729 0 0.0
(read/write) 226256 226256 0 0.0
.bss 78888 78888 0 0.0
.data 2400 2400 0 0.0
.data.rel.ro 138736 138736 0 0.0
.dynamic 608 608 0 0.0
.got 4728 4728 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 339264 339264 0 0.0
.text 4734114 4734114 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2417352 2417352 0 0.0
.bss 202852 202852 0 0.0
.data 5872 5872 0 0.0
.text 1379996 1379996 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1181335 1181367 32 0.0
bss 139560 139560 0 0.0
rodata 152656 152656 0 0.0
text 810280 810308 28 0.0
p6 all-clusters-app default (read/write) 2536592 2536592 0 0.0
.bss 137352 137352 0 0.0
.data 2800 2800 0 0.0
.text 1494856 1494856 0 0.0
light-app default (read/write) 2419880 2419880 0 0.0
.bss 129688 129688 0 0.0
.data 2600 2600 0 0.0
.text 1378144 1378144 0 0.0
lock-app default (read/write) 2434144 2434144 0 0.0
.bss 129496 129496 0 0.0
.data 2568 2568 0 0.0
.text 1392408 1392408 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 779400 779400 0 0.0
bss 70824 70824 0 0.0
noinit 40416 40416 0 0.0
text 551116 551116 0 0.0
lighting-app tlsr9518adk80d (read/write) 799424 799424 0 0.0
bss 71076 71076 0 0.0
noinit 40416 40416 0 0.0
text 567850 567850 0 0.0

@somu1710 somu1710 mentioned this pull request May 26, 2022
Closed
@Damian-Nordic Damian-Nordic merged commit b9e5d19 into project-chip:master May 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

@carol-apple carol-apple carol-apple approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@hawk248 hawk248 Awaiting requested review from hawk248

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kghost kghost Awaiting requested review from kghost

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@rgoliver rgoliver Awaiting requested review from rgoliver

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees

@isiu-apple isiu-apple

Labels
app ota review - approved
Projects
None yet
Milestone
No milestone
3 participants
@isiu-apple @carol-apple @Damian-Nordic