OTA-2488: Make Virtual Secondary use the new configuration way. (#1246)

OTA-2488: Make Virtual Secondary use the new configuration way.

config/secondary/virtualsec.json

@@ -1,12 +1,25 @@
 {
-  "secondary_type" : "virtual",
-  "partial_verifying" : "false",
-  "ecu_hardware_id" : "demo-virtual",
+  "virtual": [
+                {
+                        "partial_verifying": "false",
+                        "ecu_hardware_id": "demo-virtual",
+                        "full_client_dir": "storage/demo-vsec1",
+                        "ecu_private_key": "sec.private",
+                        "ecu_public_key": "sec.public",
+                        "firmware_path": "storage/demo-vsec1/firmware.bin",
+                        "target_name_path": "storage/demo-vsec1/target_name",
+                        "metadata_path": "storage/demo-vsec1/metadata"
+                },
+                {
+                        "partial_verifying": "false",
+                        "ecu_hardware_id": "demo-virtual",
+                        "full_client_dir": "storage/demo-vsec2",
+                        "ecu_private_key": "sec.private",
+                        "ecu_public_key": "sec.public",
+                        "firmware_path": "storage/demo-vsec2/firmware.bin",
+                        "target_name_path": "storage/demo-vsec2/target_name",
+                        "metadata_path": "storage/demo-vsec2/metadata"
 
-  "full_client_dir" : "storage/demo-vsec1",
-  "ecu_private_key" : "sec.private",
-  "ecu_public_key" : "sec.public",
-  "firmware_path" : "storage/demo-vsec1/firmware.bin",
-  "target_name_path" : "storage/demo-vsec1/target_name",
-  "metadata_path" : "storage/demo-vsec1/metadata"
+                }
+  ]
 }

config/sota-local.toml

@@ -2,9 +2,6 @@
 provision_path = "credentials.zip"
 primary_ecu_hardware_id = "local-fake"
 
-[uptane]
-secondary_configs_dir = "secondary_configs"
-
 [logger]
 loglevel = 1
 
@@ -13,3 +10,6 @@ path = "storage"
 
 [pacman]
 type = "none"
+
+[uptane]
+secondary_config_file = "virtualsec.json"

config/sota-ubuntu.toml

@@ -2,9 +2,6 @@
 provision_path = "/var/sota/sota_provisioning_credentials.zip"
 primary_ecu_hardware_id = "ubuntu"
 
-[uptane]
-secondary_configs_dir = "/usr/lib/sota/secondaries"
-
 [storage]
 type = "sqlite"
 

docs/configuration.adoc

@@ -79,15 +79,16 @@ If you intend to provision with a server by using https://github.com/advancedtel
 Options for Uptane.
 
 [options="header"]
+[cols="1,1,20"]
 |==========================================================================================
 | Name                      | Default      | Description
 | `polling_sec`             | `10`         | Interval between polls (in seconds).
 | `director_server`         |              | Director server URL. If empty, set to `tls.server` with `/director` appended.
 | `repo_server`             |              | Image repository server URL. If empty, set to `tls.server` with `/repo` appended.
 | `key_source`              | `"file"`     | Where to read the device's private key from. Options: `"file"`, `"pkcs11"`.
 | `key_type`                | `"RSA2048"`  | Type of cryptographic keys to use. Options: `"ED25519"`, `"RSA2048"`, `"RSA3072"` or `"RSA4096"`.
-| `secondary_configs_dir`   | `""`         | Directory containing individual secondary json configuration files. Example here: link:{aktualizr-github-url}/config/secondary/virtualsec.json[]. This is currently only used for virtual secondaries and will be soon replaced entirely by `secondary_configs_file`.
-| `secondary_config_file`   | `""`         | A path to a json file containing configuration of Secondary ECU(s) to be registered with the primary. Example here: link:{aktualizr-github-url}/config/posix-secondary-config.json[].
+| `secondary_config_file`   | `""`         | A path to a json file containing configuration of Secondary ECU(s) to be registered with the primary.
+ Examples here: link:{aktualizr-github-url}/config/secondary/virtualsec.json[Virtual Secondary config] and link:{aktualizr-github-url}/config/posix-secondary-config.json[Posix/IP Secondary config]
 | `force_install_completion`| false        | Forces installation completion. Causes a system reboot in case of an ostree package manager. Emulates a reboot in case of a fake package manager.
 |==========================================================================================