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

tedge-agent must use new tedge-config #2073

Merged
merged 1 commit into from
Jul 14, 2023
Merged

tedge-agent must use new tedge-config #2073

merged 1 commit into from
Jul 14, 2023

Conversation

PradeepKiruvale
Copy link
Contributor

Proposed changes

Refactor tedge-agent to use the new tedge-config APIs to parse the configurations.

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (general improvements like code refactoring that doesn't explicitly fix a bug or add any new functionality)
  • Documentation Update (if none of the other choices apply)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Paste Link to the issue

#2019

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA (in all commits with git commit -s)
  • I ran cargo fmt as mentioned in CODING_GUIDELINES
  • I used cargo clippy as mentioned in CODING_GUIDELINES
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Further comments

@PradeepKiruvale PradeepKiruvale mentioned this pull request Jul 13, 2023
Closed
8 tasks
@codecov
Copy link

codecov bot commented Jul 14, 2023 •
edited
Loading

Codecov Report

Merging #2073 (c3dca54) into main (3dc84c4) will increase coverage by 0.0%.
The diff coverage is 24.3%.

❗ Current head c3dca54 differs from pull request most recent head a65384e. Consider uploading reports for the commit a65384e to get more accurate results

Additional details and impacted files
Impacted Files Coverage Δ
crates/core/tedge_agent/src/agent.rs 0.0% <0.0%> (ø)
...tes/core/tedge_agent/src/restart_manager/config.rs 33.3% <0.0%> (ø)
...es/core/tedge_agent/src/software_manager/config.rs 36.9% <0.0%> (-3.6%) ⬇️
...tes/core/tedge_agent/src/software_manager/error.rs 0.0% <ø> (ø)
...tes/core/tedge_agent/src/software_manager/tests.rs 93.1% <ø> (-0.1%) ⬇️
...tes/core/tedge_agent/src/software_manager/actor.rs 62.5% <90.0%> (+2.3%) ⬆️

... and 9 files with indirect coverage changes

@PradeepKiruvale PradeepKiruvale requested a review from rina23q July 14, 2023 08:34
@github-actions
Copy link
Contributor

github-actions bot commented Jul 14, 2023 •
edited
Loading

Robot Results

✅ Passed ❌ Failed ⏭️ Skipped Total Pass %
238 0 5 238 100

Passed Tests

Name ⏱️ Duration Suite
Define Child device 1 ID 0.01 s C8Y Child Alarms Rpi
Normal case when the child device does not exist on c8y cloud 3.846 s C8Y Child Alarms Rpi
Normal case when the child device already exists 1.063 s C8Y Child Alarms Rpi
Reconciliation when the new alarm message arrives, restart the mapper 1.059 s C8Y Child Alarms Rpi
Reconciliation when the alarm that is cleared 65.517 s C8Y Child Alarms Rpi
Prerequisite Parent 14.502 s Child Conf Mgmt Plugin
Prerequisite Child 0.441 s Child Conf Mgmt Plugin
Child device bootstrapping 14.865 s Child Conf Mgmt Plugin
Snapshot from device 61.526 s Child Conf Mgmt Plugin
Child device config update 61.67 s Child Conf Mgmt Plugin
Configuration types should be detected on file change (without restarting service) 46.032 s Inotify Crate
Check lock file existence in default folder 1.413 s Lock File
Check PID number in lock file 1.5350000000000001 s Lock File
Check PID number in lock file after restarting the services 1.486 s Lock File
Check starting same service twice 1.018 s Lock File
Switch off lock file creation 2.009 s Lock File
Set configuration when file exists 6.787 s Configuration Operation
Set configuration when file does not exist 5.498 s Configuration Operation
Set configuration with broken url 5.102 s Configuration Operation
Get configuration 5.918 s Configuration Operation
Get non existent configuration file 4.7219999999999995 s Configuration Operation
Get non existent configuration type 4.6899999999999995 s Configuration Operation
Update configuration plugin config via cloud 5.342 s Configuration Operation
Modify configuration plugin config via local filesystem modify inplace 4.188 s Configuration Operation
Modify configuration plugin config via local filesystem overwrite 4.65 s Configuration Operation
Update configuration plugin config via local filesystem copy 4.001 s Configuration Operation
Update configuration plugin config via local filesystem move (different directory) 4.158 s Configuration Operation
Update configuration plugin config via local filesystem move (same directory) 2.917 s Configuration Operation
Update the custom operation dynamically 50.869 s Dynamically Reload Operation
Custom operation successful 62.137 s Custom Operation
Custom operation fails 65.634 s Custom Operation
Successful firmware operation 62.882 s Firmware Operation
Install with empty firmware name 45.17 s Firmware Operation
Prerequisite Parent 15.844 s Firmware Operation Child Device
Prerequisite Child 7.992 s Firmware Operation Child Device
Child device firmware update 6.195 s Firmware Operation Child Device
Child device firmware update with cache 4.036 s Firmware Operation Child Device
Firmware plugin supports restart via service manager #1932 4.504 s Firmware Operation Child Device Retry
Update Inventory data via inventory.json 1.116 s Inventory Update
Inventory includes the agent fragment with version information 1.246 s Inventory Update
Retrieve a JWT tokens 36.071 s Jwt Request
Mapper recovers and processes output of ongoing software update request 16.494 s Recover And Publish Software Update Message
Check running collectd 0.937 s Monitor Device Collectd
Is collectd publishing MQTT messages? 0.717 s Monitor Device Collectd
Check thin-edge monitoring 3.8 s Monitor Device Collectd
Check grouping of measurements 8.857 s Monitor Device Collectd
Main device registration 1.45 s Device Registration
Child device registration 1.679 s Device Registration
Supports restarting the device 53.863 s Restart Device
Update tedge version from previous using Cumulocity 88.136 s Tedge Self Update
Test if all c8y services are up 42.159 s Service Monitoring
Test if all c8y services are down 104.2 s Service Monitoring
Test if all c8y services are using configured service type 101.814 s Service Monitoring
Test if all c8y services using default service type when service type configured as empty 162.891 s Service Monitoring
Check health status of tedge-mapper-c8y service on broker stop start 20.115 s Service Monitoring
Check health status of tedge-mapper-c8y service on broker restart 21.518 s Service Monitoring
Check health status of child device service 16.321 s Service Monitoring
Successful shell command with output 3.27 s Shell Operation
Check Successful shell command with literal double quotes output 3.17 s Shell Operation
Execute multiline shell command 3.216 s Shell Operation
Failed shell command 3.31 s Shell Operation
Software list should be populated during startup 33.167 s Software
Install software via Cumulocity 42.996 s Software
Software list should only show currently installed software and not candidates 37.341 s Software
Create and publish the tedge agent supported operations on mapper restart 37.22 s Mapper-Publishing-Agent-Supported-Ops
Agent gets the software list request once it comes up 31.393 s Mapper-Publishing-Agent-Supported-Ops
Child devices support sending simple measurements 1.571 s Child Device Telemetry
Child devices support sending custom measurements 3.431 s Child Device Telemetry
Child devices support sending custom events 1.065 s Child Device Telemetry
Child devices support sending custom events overriding the type 1.007 s Child Device Telemetry
Child devices support sending custom alarms #1699 3.06 s Child Device Telemetry
Child devices support sending inventory data via c8y topic 0.928 s Child Device Telemetry
Child device supports sending custom child device measurements directly to c8y 1.4769999999999999 s Child Device Telemetry
Check retained alarms 165.39 s Raise Alarms
Thin-edge devices support sending simple measurements 1.197 s Thin-Edge Device Telemetry
Thin-edge devices support sending simple measurements with custom type 1.027 s Thin-Edge Device Telemetry
Thin-edge devices support sending custom measurements 0.866 s Thin-Edge Device Telemetry
Thin-edge devices support sending custom events 3.061 s Thin-Edge Device Telemetry
Thin-edge devices support sending custom events overriding the type 1.015 s Thin-Edge Device Telemetry
Thin-edge devices support sending custom alarms #1699 1.131 s Thin-Edge Device Telemetry
Thin-edge device supports sending custom Thin-edge device measurements directly to c8y 1.202 s Thin-Edge Device Telemetry
Thin-edge device support sending inventory data via c8y topic 1.284 s Thin-Edge Device Telemetry
thin-edge components support a custom config-dir location via flags 26.71 s Config Dir
Validate updated data path used by tedge-agent 0.312 s Data Path Config
Validate updated data path used by c8y-firmware-plugin 10.074 s Data Path Config
Validate updated data path used by tedge-agent 0.488 s Log Path Config
Check existence of init directories 0.787 s Tedge Init
Tedge init and check creation of folders 1.014 s Tedge Init
Check ownership of the folders 1.238 s Tedge Init
Change user/group and check the change 1.379 s Tedge Init
Tedge init and check if default values are restored 1.232 s Tedge Init
Install thin-edge via apt 44.197 s Install Apt
Install latest via script (from current branch) 26.496 s Install Tedge
Install specific version via script (from current branch) 21.799 s Install Tedge
Install latest tedge via script (from main branch) 26.004 s Install Tedge
Install then uninstall latest tedge via script (from main branch) 46.319 s Install Tedge
Support starting and stopping services 31.515 s Service-Control
Supports a reconnect 47.92 s Test-Commands
Supports disconnect then connect 36.146 s Test-Commands
Update unknown setting 40.565 s Test-Commands
Update known setting 40.35 s Test-Commands
It checks MQTT messages using a pattern 63.253 s Test-Mqtt
Stop c8y-configuration-plugin 0.142 s Health C8Y-Configuration-Plugin
Update the service file 0.121 s Health C8Y-Configuration-Plugin
Reload systemd files 0.379 s Health C8Y-Configuration-Plugin
Start c8y-configuration-plugin 0.107 s Health C8Y-Configuration-Plugin
Start watchdog service 10.114 s Health C8Y-Configuration-Plugin
Check PID of c8y-configuration-plugin 0.08 s Health C8Y-Configuration-Plugin
Kill the PID 0.231 s Health C8Y-Configuration-Plugin
Recheck PID of c8y-configuration-plugin 6.547 s Health C8Y-Configuration-Plugin
Compare PID change 0.001 s Health C8Y-Configuration-Plugin
Stop watchdog service 0.099 s Health C8Y-Configuration-Plugin
Remove entry from service file 0.123 s Health C8Y-Configuration-Plugin
Stop c8y-log-plugin 0.123 s Health C8Y-Log-Plugin
Update the service file 0.103 s Health C8Y-Log-Plugin
Reload systemd files 0.439 s Health C8Y-Log-Plugin
Start c8y-log-plugin 0.087 s Health C8Y-Log-Plugin
Start watchdog service 10.183 s Health C8Y-Log-Plugin
Check PID of c8y-log-plugin 0.068 s Health C8Y-Log-Plugin
Kill the PID 0.126 s Health C8Y-Log-Plugin
Recheck PID of c8y-log-plugin 6.526 s Health C8Y-Log-Plugin
Compare PID change 0.004 s Health C8Y-Log-Plugin
Stop watchdog service 0.236 s Health C8Y-Log-Plugin
Remove entry from service file 0.143 s Health C8Y-Log-Plugin
Stop tedge-mapper 0.124 s Health Tedge Mapper C8Y
Update the service file 0.164 s Health Tedge Mapper C8Y
Reload systemd files 0.4 s Health Tedge Mapper C8Y
Start tedge-mapper 0.145 s Health Tedge Mapper C8Y
Start watchdog service 10.26 s Health Tedge Mapper C8Y
Check PID of tedge-mapper 0.067 s Health Tedge Mapper C8Y
Kill the PID 0.197 s Health Tedge Mapper C8Y
Recheck PID of tedge-mapper 6.364 s Health Tedge Mapper C8Y
Compare PID change 0.004 s Health Tedge Mapper C8Y
Stop watchdog service 0.138 s Health Tedge Mapper C8Y
Remove entry from service file 0.258 s Health Tedge Mapper C8Y
Stop tedge-agent 0.167 s Health Tedge-Agent
Update the service file 0.128 s Health Tedge-Agent
Reload systemd files 0.379 s Health Tedge-Agent
Start tedge-agent 0.128 s Health Tedge-Agent
Start watchdog service 10.202 s Health Tedge-Agent
Check PID of tedge-mapper 0.096 s Health Tedge-Agent
Kill the PID 0.242 s Health Tedge-Agent
Recheck PID of tedge-agent 6.514 s Health Tedge-Agent
Compare PID change 0.001 s Health Tedge-Agent
Stop watchdog service 0.168 s Health Tedge-Agent
Remove entry from service file 0.165 s Health Tedge-Agent
Stop tedge-mapper-az 0.112 s Health Tedge-Mapper-Az
Update the service file 0.116 s Health Tedge-Mapper-Az
Reload systemd files 0.211 s Health Tedge-Mapper-Az
Start tedge-mapper-az 0.082 s Health Tedge-Mapper-Az
Start watchdog service 10.136 s Health Tedge-Mapper-Az
Check PID of tedge-mapper-az 0.127 s Health Tedge-Mapper-Az
Kill the PID 0.399 s Health Tedge-Mapper-Az
Recheck PID of tedge-agent 6.633 s Health Tedge-Mapper-Az
Compare PID change 0.001 s Health Tedge-Mapper-Az
Stop watchdog service 0.222 s Health Tedge-Mapper-Az
Remove entry from service file 0.257 s Health Tedge-Mapper-Az
Stop tedge-mapper-collectd 0.121 s Health Tedge-Mapper-Collectd
Update the service file 0.12 s Health Tedge-Mapper-Collectd
Reload systemd files 0.508 s Health Tedge-Mapper-Collectd
Start tedge-mapper-collectd 0.127 s Health Tedge-Mapper-Collectd
Start watchdog service 10.217 s Health Tedge-Mapper-Collectd
Check PID of tedge-mapper-collectd 0.103 s Health Tedge-Mapper-Collectd
Kill the PID 0.177 s Health Tedge-Mapper-Collectd
Recheck PID of tedge-mapper-collectd 6.467 s Health Tedge-Mapper-Collectd
Compare PID change 0.001 s Health Tedge-Mapper-Collectd
Stop watchdog service 0.113 s Health Tedge-Mapper-Collectd
Remove entry from service file 0.092 s Health Tedge-Mapper-Collectd
tedge-collectd-mapper health status 5.644 s Health Tedge-Mapper-Collectd
c8y-log-plugin health status 5.994 s MQTT health endpoints
c8y-configuration-plugin health status 5.862 s MQTT health endpoints
Publish on a local insecure broker 0.246 s Basic Pub Sub
Publish on a local secure broker 1.8 s Basic Pub Sub
Publish on a local secure broker with client authentication 1.759 s Basic Pub Sub
Publish events to subscribed topic 0.248 s Custom Sub Topics Tedge-Mapper-Aws
Publish measurements to unsubscribed topic 5.289 s Custom Sub Topics Tedge-Mapper-Aws
Publish measurements to subscribed topic 0.573 s Custom Sub Topics Tedge-Mapper-Az
Publish measurements to unsubscribed topic 5.52 s Custom Sub Topics Tedge-Mapper-Az
Publish events to subscribed topic 0.311 s Custom Sub Topics Tedge-Mapper-C8Y
Publish measurements to unsubscribed topic 5.427 s Custom Sub Topics Tedge-Mapper-C8Y
Check remote mqtt broker #1773 2.854 s Remote Mqtt Broker
Apply name filter 0.299 s Filter Packages List Output
Apply maintainer filter 0.248 s Filter Packages List Output
Apply both filters 0.283 s Filter Packages List Output
No filters 0.354 s Filter Packages List Output
Both filters but name filter as empty string 0.325 s Filter Packages List Output
Both filters but maintainer filter as empty string 0.326 s Filter Packages List Output
Both filters as empty string 0.301 s Filter Packages List Output
Wrong package name 0.084 s Improve Tedge Apt Plugin Error Messages
Wrong version 0.087 s Improve Tedge Apt Plugin Error Messages
Wrong type 0.211 s Improve Tedge Apt Plugin Error Messages
tedge_connect_test_positive 0.193 s Tedge Connect Test
tedge_connect_test_negative 0.521 s Tedge Connect Test
tedge_connect_test_sm_services 7.118 s Tedge Connect Test
tedge_disconnect_test_sm_services 0.498 s Tedge Connect Test
Install thin-edge.io 21.438 s Call Tedge
call tedge -V 0.125 s Call Tedge
call tedge -h 0.112 s Call Tedge
call tedge -h -V 0.199 s Call Tedge
call tedge help 0.09 s Call Tedge
tedge config list 0.087 s Call Tedge Config List
tedge config list --all 0.066 s Call Tedge Config List
set/unset device.type 0.416 s Call Tedge Config List
set/unset device.key_path 0.41 s Call Tedge Config List
set/unset device.cert_path 0.44 s Call Tedge Config List
set/unset c8y.root_cert_path 0.525 s Call Tedge Config List
set/unset c8y.smartrest.templates 0.682 s Call Tedge Config List
set/unset c8y.topics 0.739 s Call Tedge Config List
set/unset az.root_cert_path 0.372 s Call Tedge Config List
set/unset az.topics 0.388 s Call Tedge Config List
set/unset aws.topics 0.493 s Call Tedge Config List
set/unset aws.url 0.251 s Call Tedge Config List
set/unset aws.root_cert_path 0.272 s Call Tedge Config List
set/unset aws.mapper.timestamp 0.396 s Call Tedge Config List
set/unset az.mapper.timestamp 0.349 s Call Tedge Config List
set/unset mqtt.bind.address 0.393 s Call Tedge Config List
set/unset mqtt.bind.port 0.236 s Call Tedge Config List
set/unset http.bind.port 0.312 s Call Tedge Config List
set/unset tmp.path 0.267 s Call Tedge Config List
set/unset logs.path 0.228 s Call Tedge Config List
set/unset run.path 0.237 s Call Tedge Config List
set/unset firmware.child.update.timeout 0.234 s Call Tedge Config List
set/unset c8y.url 0.225 s Call Tedge Config List
set/unset az.url 0.241 s Call Tedge Config List
set/unset mqtt.external.bind.port 0.214 s Call Tedge Config List
mqtt.external.bind.address 0.267 s Call Tedge Config List
mqtt.external.bind.interface 0.234 s Call Tedge Config List
set/unset mqtt.external.ca_path 0.259 s Call Tedge Config List
set/unset mqtt.external.cert_file 0.192 s Call Tedge Config List
set/unset mqtt.external.key_file 0.253 s Call Tedge Config List
set/unset software.plugin.default 0.224 s Call Tedge Config List
Get Put Delete 1.682 s Http File Transfer Api
Set keys should return value on stdout 0.242 s Tedge Config Get
Unset keys should not return anything on stdout and warnings on stderr 0.193 s Tedge Config Get
Invalid keys should not return anything on stdout and warnings on stderr 0.281 s Tedge Config Get
Set configuration via environment variables 0.96 s Tedge Config Get
Set configuration via environment variables for topics 0.264 s Tedge Config Get
Set unknown configuration via environment variables 0.081 s Tedge Config Get

rina23q
rina23q reviewed Jul 14, 2023
View reviewed changes
Copy link
Member

@rina23q rina23q left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need a fix.

crates/core/tedge_agent/src/software_manager/actor.rs Outdated Show resolved Hide resolved
crates/core/tedge_agent/src/software_manager/config.rs Outdated Show resolved Hide resolved
crates/common/tedge_config/src/tedge_config_cli/error.rs Outdated Show resolved Hide resolved
crates/core/tedge_agent/src/software_manager/error.rs Outdated Show resolved Hide resolved
@PradeepKiruvale PradeepKiruvale temporarily deployed to Test Pull Request July 14, 2023 10:35 — with GitHub Actions Inactive
rina23q
rina23q approved these changes Jul 14, 2023
View reviewed changes
Copy link
Member

@rina23q rina23q left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved.

The integration test failures seem not caused by this change.

@PradeepKiruvale
tedge-agent must use new tedge-config
a65384e 
Signed-off-by: Pradeep Kumar K J <pkj@softwareag.com>
@PradeepKiruvale PradeepKiruvale temporarily deployed to Test Pull Request July 14, 2023 13:18 — with GitHub Actions Inactive
@PradeepKiruvale PradeepKiruvale merged commit 67e640e into thin-edge:main Jul 14, 2023
@gligorisaev
Copy link
Contributor

QA has thoroughly checked the feature and here are the results:

  • Test for ticket exists in the test suite.
  • QA has tested the feature and it meets the required specifications.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rina23q rina23q rina23q approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PradeepKiruvale @gligorisaev @rina23q