feat(antctl): impl network_id option while adding node

maidsafe · Dec 9, 2024 · e74bfe5 · e74bfe5
1 parent 244d0d5
commit e74bfe5
Show file tree

Hide file tree

Showing 10 changed files with 447 additions and 3 deletions.
diff --git a/ant-node-manager/src/add_services/config.rs b/ant-node-manager/src/add_services/config.rs
@@ -79,6 +79,7 @@ pub struct InstallNodeServiceCtxBuilder {
     pub log_dir_path: PathBuf,
     pub log_format: Option<LogFormat>,
     pub name: String,
+    pub network_id: Option<u8>,
     pub max_archived_log_files: Option<usize>,
     pub max_log_files: Option<usize>,
     pub metrics_port: Option<u16>,
@@ -105,6 +106,10 @@ impl InstallNodeServiceCtxBuilder {
         ];
 
         push_arguments_from_peers_args(&self.peers_args, &mut args);
+        if let Some(id) = self.network_id {
+            args.push(OsString::from("--network-id"));
+            args.push(OsString::from(id.to_string()));
+        }
         if self.home_network {
             args.push(OsString::from("--home-network"));
         }
@@ -185,6 +190,7 @@ pub struct AddNodeServiceOptions {
     pub max_archived_log_files: Option<usize>,
     pub max_log_files: Option<usize>,
     pub metrics_port: Option<PortRange>,
+    pub network_id: Option<u8>,
     pub node_ip: Option<Ipv4Addr>,
     pub node_port: Option<PortRange>,
     pub owner: Option<String>,
@@ -314,10 +320,11 @@ mod tests {
             home_network: false,
             log_dir_path: PathBuf::from("/logs"),
             log_format: None,
-            name: "test-node".to_string(),
             max_archived_log_files: None,
             max_log_files: None,
             metrics_port: None,
+            name: "test-node".to_string(),
+            network_id: None,
             node_ip: None,
             node_port: None,
             owner: None,
@@ -349,10 +356,11 @@ mod tests {
             home_network: false,
             log_dir_path: PathBuf::from("/logs"),
             log_format: None,
-            name: "test-node".to_string(),
             max_archived_log_files: None,
             max_log_files: None,
             metrics_port: None,
+            name: "test-node".to_string(),
+            network_id: None,
             node_ip: None,
             node_port: None,
             owner: None,
@@ -385,10 +393,11 @@ mod tests {
             home_network: false,
             log_dir_path: PathBuf::from("/logs"),
             log_format: None,
-            name: "test-node".to_string(),
             max_archived_log_files: Some(10),
             max_log_files: Some(10),
             metrics_port: None,
+            name: "test-node".to_string(),
+            network_id: Some(5),
             node_ip: None,
             node_port: None,
             owner: None,
@@ -510,6 +519,8 @@ mod tests {
             "http://localhost:8080",
             "--testnet",
             "--ignore-cache",
+            "--network-id",
+            "5",
             "--home-network",
             "--log-format",
             "json",

diff --git a/ant-node-manager/src/add_services/mod.rs b/ant-node-manager/src/add_services/mod.rs
@@ -210,6 +210,7 @@ pub async fn add_node(
             max_log_files: options.max_log_files,
             metrics_port: metrics_free_port,
             name: service_name.clone(),
+            network_id: options.network_id,
             node_ip: options.node_ip,
             node_port,
             owner: owner.clone(),
@@ -246,6 +247,7 @@ pub async fn add_node(
                     max_archived_log_files: options.max_archived_log_files,
                     max_log_files: options.max_log_files,
                     metrics_port: metrics_free_port,
+                    network_id: options.network_id,
                     node_ip: options.node_ip,
                     node_port,
                     number: node_number,