fix merge

zfctl/src/daemon_command.rs

@@ -87,6 +87,37 @@ pub(crate) enum DaemonCommand {
         #[arg(short = 'i', long = "id")]
         id: Option<RuntimeId>,
     },
+    /// List all the Zenoh-Flow runtimes reachable on the Zenoh network.
+    List,
+    /// Returns the status of the provided Zenoh-Flow runtime.
+    ///
+    /// The status consists of general information regarding the runtime and the
+    /// machine it runs on:
+    /// - the name associated with the Zenoh-Flow runtime,
+    /// - the number of CPUs the machine running the Zenoh-Flow runtime has,
+    /// - the total amount of RAM the machine running the Zenoh-Flow runtime has,
+    /// - for each data flow the Zenoh-Flow runtime manages (partially or not):
+    ///   - its unique identifier,
+    ///   - its name,
+    ///   - its status.
+    #[command(verbatim_doc_comment)]
+    #[command(group(
+        ArgGroup::new("exclusive")
+            .args(&["runtime_id", "runtime_name"])
+            .required(true)
+            .multiple(false)
+    ))]
+    Status {
+        /// The unique identifier of the Zenoh-Flow runtime to contact.
+        #[arg(short = 'i', long = "id")]
+        runtime_id: Option<RuntimeId>,
+        /// The name of the Zenoh-Flow runtime to contact.
+        ///
+        /// Note that if several runtimes share the same name, the first to
+        /// answer will be selected.
+        #[arg(short = 'n', long = "name")]
+        runtime_name: Option<String>,
+    },
 }
 
 impl DaemonCommand {
@@ -245,7 +276,6 @@ impl DaemonCommand {
                                 }
                             }
                         }
-
                         Err(e) => tracing::error!("Reply to daemon status failed with: {:?}", e),
                     }
                 }