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

Unbuntu Core - configure hook, extensions registration, and folders owner/user changes #266

Merged
merged 7 commits into from
Dec 3, 2022
Merged

Unbuntu Core - configure hook, extensions registration, and folders owner/user changes #266

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
432f3d4
Restructure data, config, and lib folders
Nox-MSFT Nov 29, 2022
1f8860b
Ubuntu Core related changes:
Nox-MSFT Nov 30, 2022
06400b9
Fix DU Agent Snap e2e validation blocking issue.
Nox-MSFT Nov 30, 2022
8026eaf
Change du-agent snap daemon to restart on failure only.
Nox-MSFT Nov 30, 2022
3fdabe2
Update curl content downloader extension to support `snap` environment
Nox-MSFT Dec 2, 2022
d41dca5
Add an option to run script unelevated (bypass adu-shell)
Nox-MSFT Dec 2, 2022
170057e
Removed dead code
Nox-MSFT Dec 3, 2022
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ set (
if (ADUC_UBUNTU_CORE_SNAP_ONLY)
set (
ADUC_FILE_USER
"snap_aziot_du"
"root"
CACHE STRING "The user for adu file ownership.")

set (
Expand Down
237 changes: 220 additions & 17 deletions docs/agent-reference/how-to-build-deviceupdate-agent-snap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
- snapd, snapcraft, and [multipass](https://snapcraft.io/docs/build-options) packages
- `snapd` is pre-installed on Ubuntu 20.04 LTS by default. For more information about `snapd`, see https://snapcraft.io/docs/installing-snapd
- To install `snapcraft` use following command:
```sh
```shell
sudo snap install snapcraft --classic
```
- To install `multipass` use following command:
```sh
```shell
sudo snap install multipass --classic
```
For more infomation about `Multipass`, see https://multipass.run/
Expand All @@ -30,7 +30,7 @@

## Build Instruction

```sh
```shell
# change directory to iot-hub-device-update project root directory
pushd <project root>
Expand All @@ -45,14 +45,14 @@ snapcraft

If build success, you can find `deviceupdate-agent_#.#_amd64.snap` at the project root directory.

### How To View Snap Packge Content
### How To View Snap Package Content

You can use `unsquashfs` command to extract `.snap` file.

```sh
```shell
# Run unsquashfs <snap file name>
# e.g., unsquashfs deviceupdate-agent.0.1_amd64.snap
unsquashfs deviceupdate-agent.0.1_adm64.nsap
unsquashfs deviceupdate-agent.0.1_adm64.snap
# The content will be extracted to 'squashfs-root' directory
# You can use 'tree' command to view the directory content
Expand All @@ -63,23 +63,100 @@ tree squashfs-root

To install the snap for testing (developer mode)

```sh
```shell
sudo snap install --devmode ./deviceupdate-agent_0.1_amd64.snap
```

> NOTE | This will installs the snap content to /snap/<'snap name'>/ directory on the host device

## Configure The Device Update Agent Snap

Specify an agent settings, such as, manufacturer, model, agent.name, agent.connectionSource, etc., in `du-config.json`, which localted in `$SNAP_DATA/config` folder.

```json
{
"schemaVersion": "1.1",
"aduShellTrustedUsers": [
"snap_aziot_du",
"snap_aziot_do"
],
"iotHubProtocol": "mqtt",
"manufacturer":"<Place your device info manufacturer here>",
"model": "<Place your device info model here>",
"agents": [
{
"name": "<Place your agent name here>",
"runas": "snap_aziot_du",
"connectionSource": {
"connectionType": "string",
"connectionData": "HostName=...HIDDEN..."
},
"manufacturer": "<Place your device property manufacturer here>",
"model": "<Place your device property model here>"
}
]
}
```

For example:
- "manufacturer":"contoso"
- "model":"vacuum-v1"
- "agents[0].name":"main"
- "agents[0].connectionSource.connectionType":"string"
- "agents[0].connectionSource.connectionData":"**enter your device connection string here**"
- "agents[0].manufacturer":"contoso"
- "agents[0].model":"vacuum-v1"

>TIP: To share file between host machine and the snap, you can use a ['home' interface](https://snapcraft.io/docs/home-interface).

- To share 'home' directory with the snap, run:
```shell
$ snap connect deviceupdate-agent:home :home
```
- Create du-config.json file in your home directory like so:
```json
{
"schemaVersion": "1.1",
"aduShellTrustedUsers": [
"snap_aziot_du",
"snap_aziot_do"
],
"iotHubProtocol": "mqtt",
"manufacturer": "contoso",
"model": "vacuum-v1",
"agents": [
{
"name": "main",
"runas": "snap_aziot_du",
"connectionSource": {
"connectionType": "string",
"connectionData": "HostName=...HIDDEN..."
},
"manufacturer": "contoso",
"model": "vacuum-v1"
}
]
}
```


## Run The Snap

To run a shell in the confined environment
To run a shell in the confined environment:

```shell
$ sudo snap run --shell deviceupdate-agent
```

Optionally, copy the prepared `du-config.json` from [host machine] home directory to `$SNAP_DATA/config` directory

```sh
snap run --shell deviceupdate-agent
```shell
$ cp <home-dir>/du-config.json $SNAP_DATA/config
Copy link
Contributor

Choose a reason for hiding this comment

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

I used vi, but a little unsure about the cp here. Is it run inside the device-update snap shell? how do we specify the ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, this should be run inside the snap shell. Customer can choose their preferred method to author the du-config.json. As long as it is placed in the right location ($SNAP_DATA/config/du-config.json)

```

Inspect some snap variables:

```sh
```shell
root@myhost:~# printenv SNAP
/snap/deviceupdate-agent/x2
Expand All @@ -90,19 +167,145 @@ root@myhost:~# printenv SNAP_DATA
/var/snap/deviceupdate-agent/x2
```

For testing purposes, you can manually run `$SNAP/usr/bin/AducIotAgent -l 0 -e` to verify that the Device Update agent is successfully connected to, and communicated with, the Azure Iot Hub.

```shell
$SNAP/usr/bin/AducIotAgent -l 0 -e
2022-11-30T15:19:17.5333Z 33853[33853] [D] Log file created: /var/log/adu/du-agent.20221130-151917.log [zlog_init]
2022-11-30T15:19:17.5338Z 33853[33853] [I] Agent (linux; 1.0.0) starting. [main]
...
2022-11-30T15:19:17.5339Z 33853[33853] [I] Supported Update Manifest version: min: 4, max: 5 [main]
2022-11-30T15:19:17.5340Z 33853[33853] [I] Attempting to create connection to IotHub using type: ADUC_ConnType_Device [ADUC_DeviceClient_Create]
2022-11-30T15:19:17.5341Z 33853[33853] [I] IotHub Protocol: MQTT [GetIotHubProtocolFromConfig]
2022-11-30T15:19:17.5341Z 33853[33853] [I] IoTHub Device Twin callback registered. [ADUC_DeviceClient_Create]
2022-11-30T15:19:17.5341Z 33853[33853] [I] Initializing PnP components. [ADUC_PnP_Components_Create]
2022-11-30T15:19:17.5341Z 33853[33853] [I] ADUC agent started. Using IoT Hub Client SDK 1.7.0 [AzureDeviceUpdateCoreInterface_Create]
2022-11-30T15:19:17.5341Z 33853[33853] [I] Calling ADUC_RegisterPlatformLayer [ADUC_MethodCall_Register]
...
2022-11-30T15:19:17.5702Z 33853[33853] [I] Agent running. [main]
...
2022-11-30T15:19:18.1976Z 33853[33853] [D] IotHub connection status: 0, reason: 6 [ADUC_ConnectionStatus_Callback]
-> 15:19:18 SUBSCRIBE | PACKET_ID: 2 | TOPIC_NAME: $iothub/twin/res/# | QOS: 0
...
2022-11-30T15:19:18.5998Z 33853[33853] [I] Processing existing Device Twin data after agent started. [ADUC_PnPDeviceTwin_Callback]
2022-11-30T15:19:18.5999Z 33853[33853] [D] Notifies components that all callback are subscribed. [ADUC_PnPDeviceTwin_Callback]
...
2022-11-30T15:19:18.6001Z 33853[33853] [D] Queueing message (t:0, c:0xbb236af0 [ADUC_D2C_Message_SendAsync]
2022-11-30T15:19:18.6002Z 33853[33853] [I] DeviceInformation component is ready - reporting properties [DeviceInfoInterface_Connected]
2022-11-30T15:19:18.6003Z 33853[33853] [I] Property manufacturer changed to contoso [RefreshDeviceInfoInterfaceData]
2022-11-30T15:19:18.6004Z 33853[33853] [I] Property model changed to vacuum-v1 [RefreshDeviceInfoInterfaceData]
2022-11-30T15:19:18.6006Z 33853[33853] [I] Property osName changed to Ubuntu Core [RefreshDeviceInfoInterfaceData]
2022-11-30T15:19:18.6007Z 33853[33853] [I] Property swVersion changed to 20 [RefreshDeviceInfoInterfaceData]
2022-11-30T15:19:18.6007Z 33853[33853] [I] Property processorArchitecture changed to x86_64 [RefreshDeviceInfoInterfaceData]
2022-11-30T15:19:18.6242Z 33853[33853] [I] Property processorManufacturer changed to GenuineIntel [RefreshDeviceInfoInterfaceData]
2022-11-30T15:19:18.6243Z 33853[33853] [I] Property totalMemory changed to 5776704 [RefreshDeviceInfoInterfaceData]
2022-11-30T15:19:18.6244Z 33853[33853] [I] Property totalStorage changed to 64768 [RefreshDeviceInfoInterfaceData]
2022-11-30T15:19:18.6245Z 33853[33853] [D] Queueing message (t:2, c:0xbb2306a0 [ADUC_D2C_Message_SendAsync]
2022-11-30T15:19:18.6245Z 33853[33853] [I] DiagnosticsInterface is connected [DiagnosticsInterface_Connected]
2022-11-30T15:19:18.7248Z 33853[33853] [D] Sending D2C message (t:0, retries:0). [ProcessMessage]
2022-11-30T15:19:18.7250Z 33853[33853] [D] Sending D2C message:
{"deviceUpdate":{"__t":"c","agent":{"deviceProperties":{"manufacturer":"contoso","model":"vacuum-v1","interfaceId":null,"contractModelId":"dtmi:azure:iot:deviceUpdateContractModel;2","aduVer":"DU;agent\/1.0.0"},"compatPropertyNames":"manufacturer,model"}}} [ADUC_D2C_Default_Message_Transport_Function]
2022-11-30T15:19:18.7250Z 33853[33853] [D] Sending D2C message (t:2, retries:0). [ProcessMessage]
2022-11-30T15:19:18.7250Z 33853[33853] [D] Sending D2C message:
{"deviceInformation":{"__t":"c","manufacturer":"contoso","model":"vacuum-v1","osName":"Ubuntu Core","swVersion":"20","processorArchitecture":"x86_64","processorManufacturer":"GenuineIntel","totalMemory":5776704,"totalStorage":64768}} [ADUC_D2C_Default_Message_Transport_Function]
...
2022-11-30T15:19:20.5271Z 33853[33853] [D] Send message completed (status:3) [OnDeviceInfoD2CMessageCompleted]
...
```

Verify that the Device Twin contains properties reported by the agent:

```json
{
"deviceId": "...",
...
"modelId": "dtmi:azure:iot:deviceUpdateModel;2",
"version": 10,
"tags": {
"ADUGroup": "ucore-test-1"
},
"properties": {
"desired": {
...
},
"reported": {
"deviceUpdate": {
"__t": "c",
"agent": {
"deviceProperties": {
"manufacturer": "contoso",
"model": "vacuum-v1",
"contractModelId": "dtmi:azure:iot:deviceUpdateContractModel;2",
"aduVer": "DU;agent/1.0.0"
},
"compatPropertyNames": "manufacturer,model"
}
},
"deviceInformation": {
"__t": "c",
"manufacturer": "contoso",
"model": "vacuum-v1",
"osName": "Ubuntu Core",
"swVersion": "20",
"processorArchitecture": "x86_64",
"processorManufacturer": "GenuineIntel",
"totalMemory": 5776704,
"totalStorage": 64768
},
...
"$version": 8
}
},
"capabilities": {
"iotEdge": true
},
"deviceScope": "ms-azure-iot-edge://ucore-test-1-638054160455707418"
}
```

## View Snap Logs using Journalctl

The name of the Device Update agent in the confined environment is `snap.deviceupdate-agent.deviceupdate-agent`.

To view the journal log, use following command:

```sh
journalctl -u snap.deviceupdate-agent.deviceupdate-agent -f --no-tail
```shell
$ journalctl -u snap.deviceupdate-agent.deviceupdate-agent -f --no-tail
```

To start the daemon:

```shell
$ sudo systemctl start snap.deviceupdate-agent.deviceupdate-agent
```

To stop the daemon:

## Configure The Snap
[TBD]
```shell
$ sudo systemctl stop snap.deviceupdate-agent.deviceupdate-agent
```

## Testing The Snap
[TBD]
To restart the daemon:

```shell
$ sudo systemctl restart snap.deviceupdate-agent.deviceupdate-agent
```
Loading