fix: add delay after networkd reload to ensure config is applied

README.md

@@ -615,6 +615,8 @@ The module reports the status of any attached modems. For this purpose the modul
 
 The network status is refreshed in an interval which can be configured by `REFRESH_NETWORK_STATUS_INTERVAL_SECS` environment variable. The default is 60s.
 
+When reloading network configuration via the [reload network daemon](#reload-network-daemon) endpoint, the service waits for networkd to apply the new configuration before reporting status. The delay can be configured via `RELOAD_NETWORK_DELAY_MS` environment variable (default: 500ms).
+
 **NOTE**: Currently reporting status of modems is no supported!
 
 #### Feature availability

src/lib.rs

@@ -0,0 +1,6 @@
+pub mod bootloader_env;
+pub mod common;
+pub mod reboot_reason;
+pub mod systemd;
+pub mod twin;
+pub mod web_service;

src/main.rs

@@ -1,14 +1,7 @@
-pub mod bootloader_env;
-pub mod common;
-pub mod reboot_reason;
-pub mod systemd;
-pub mod twin;
-pub mod web_service;
-
 use env_logger::{Builder, Env, Target};
 use log::{error, info};
+use omnect_device_service::twin::Twin;
 use std::{io::Write, process};
-use twin::Twin;
 
 #[tokio::main]
 async fn main() -> process::ExitCode {

src/twin/firmware_update/update_validation.rs

@@ -207,13 +207,11 @@ impl UpdateValidation {
     }
 
     async fn report_impl(status: UpdateValidationStatus) {
-        if cfg!(not(feature = "mock")) {
-            web_service::publish(
-                web_service::PublishChannel::UpdateValidationStatusV1,
-                json!({"status": status}),
-            )
-            .await;
-        }
+        web_service::publish(
+            web_service::PublishChannel::UpdateValidationStatusV1,
+            json!({"status": status}),
+        )
+        .await;
     }
 
     fn start_timeout(&mut self) -> Result<()> {

src/twin/network.rs

@@ -95,7 +95,16 @@ impl Feature for Network {
                     unit::UnitAction::Reload,
                     systemd_zbus::Mode::Fail,
                 )
-                .await?
+                .await?;
+
+                // Wait for networkd to apply configuration after reload.
+                // The reload job completion only means networkd received the signal,
+                // not that it finished applying the new configuration internally.
+                let delay_ms = env::var("RELOAD_NETWORK_DELAY_MS")
+                    .unwrap_or("500".to_string())
+                    .parse::<u64>()
+                    .unwrap_or(500);
+                tokio::time::sleep(Duration::from_millis(delay_ms)).await;
             }
             _ => bail!("unexpected command"),
         }

src/web_service.rs

@@ -62,6 +62,7 @@ pub enum PublishChannel {
     UpdateValidationStatusV1,
 }
 
+#[cfg(not(feature = "mock"))]
 impl PublishChannel {
     fn to_status_string(&self) -> String {
         match self {
@@ -412,6 +413,7 @@ impl WebService {
     }
 }
 
+#[cfg(not(feature = "mock"))]
 pub async fn publish(channel: PublishChannel, value: serde_json::Value) {
     if *IS_WEBSERVICE_DISABLED.wait() {
         debug!("publish: skip since feature not enabled");
@@ -443,6 +445,9 @@ pub async fn publish(channel: PublishChannel, value: serde_json::Value) {
     }
 }
 
+#[cfg(feature = "mock")]
+pub async fn publish(_channel: PublishChannel, _value: serde_json::Value) {}
+
 async fn republish_to_endpoint(endpoint: &PublishEndpoint) -> HttpResponse {
     for (channel, value) in PUBLISH_CHANNEL_MAP.lock().await.iter() {
         let msg = json!({"channel": channel, "data": value}).to_string();

testfiles/positive/omnect-os-initramfs.json

@@ -0,0 +1 @@
+{}