Add without-netconfig argument

jcronenberg · Aug 12, 2024 · d6f6517 · d6f6517
1 parent 395b064
commit d6f6517
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/rust/migrate-wicked/src/infiniband.rs b/rust/migrate-wicked/src/infiniband.rs
@@ -74,6 +74,7 @@ mod tests {
             continue_migration: false,
             dry_run: false,
             activate_connections: true,
+            without_netconfig: true,
             netconfig_path: "".to_string(),
         });
     }

diff --git a/rust/migrate-wicked/src/main.rs b/rust/migrate-wicked/src/main.rs
@@ -36,6 +36,9 @@ struct GlobalOpts {
     #[arg(long, global = true, default_value_t = LevelFilter::Warn, value_parser = clap::builder::PossibleValuesParser::new(["TRACE", "DEBUG", "INFO", "WARN", "ERROR"]).map(|s| s.parse::<LevelFilter>().unwrap()),)]
     pub log_level: LevelFilter,
 
+    #[arg(long, global = true, env = "MIGRATE_WICKED_WITHOUT_NETCONFIG")]
+    pub without_netconfig: bool,
+
     #[arg(long, global = true, default_value_t = String::from("/etc/sysconfig/network/config"), env = "MIGRATE_WICKED_NETCONFIG_PATH")]
     pub netconfig_path: String,
 }
@@ -88,6 +91,7 @@ async fn run_command(cli: Cli) -> anyhow::Result<()> {
                     continue_migration: true,
                     dry_run: false,
                     activate_connections: true,
+                    without_netconfig: cli.global_opts.without_netconfig,
                     netconfig_path: cli.global_opts.netconfig_path,
                 })
                 .expect("MIGRATION_SETTINGS was set too early");
@@ -125,6 +129,7 @@ async fn run_command(cli: Cli) -> anyhow::Result<()> {
                     continue_migration,
                     dry_run,
                     activate_connections,
+                    without_netconfig: cli.global_opts.without_netconfig,
                     netconfig_path: cli.global_opts.netconfig_path,
                 })
                 .expect("MIGRATION_SETTINGS was set too early");
@@ -161,6 +166,7 @@ struct MigrationSettings {
     continue_migration: bool,
     dry_run: bool,
     activate_connections: bool,
+    without_netconfig: bool,
     netconfig_path: String,
 }
 
@@ -170,6 +176,7 @@ impl Default for MigrationSettings {
             continue_migration: false,
             dry_run: false,
             activate_connections: true,
+            without_netconfig: false,
             netconfig_path: "".to_string(),
         }
     }

diff --git a/rust/migrate-wicked/src/reader.rs b/rust/migrate-wicked/src/reader.rs
@@ -84,15 +84,17 @@ pub fn read(paths: Vec<String>) -> Result<InterfacesResult, anyhow::Error> {
         warning: None,
     };
 
-    match read_netconfig(settings.netconfig_path.clone()) {
-        Ok(netconfig) => result.netconfig = netconfig,
-        Err(e) => {
-            if !settings.continue_migration {
-                return Err(e);
-            };
-            log::warn!("Failed to read netconfig: {}", e);
-        }
-    };
+    if !settings.without_netconfig {
+        match read_netconfig(settings.netconfig_path.clone()) {
+            Ok(netconfig) => result.netconfig = netconfig,
+            Err(e) => {
+                if !settings.continue_migration {
+                    return Err(e);
+                };
+                log::warn!("Failed to read netconfig: {}", e);
+            }
+        };
+    }
 
     for path in paths {
         let path: PathBuf = path.into();

diff --git a/rust/migrate-wicked/src/wireless.rs b/rust/migrate-wicked/src/wireless.rs
@@ -185,6 +185,7 @@ mod tests {
             continue_migration: false,
             dry_run: false,
             activate_connections: true,
+            without_netconfig: true,
             netconfig_path: "".to_string(),
         });
     }

diff --git a/rust/migrate-wicked/tests/test.sh b/rust/migrate-wicked/tests/test.sh
@@ -46,6 +46,9 @@ for test_dir in ${TEST_DIRS}; do
     if [ -d $test_dir/netconfig ]; then
         migrate_args+=" --netconfig-path $test_dir/netconfig/config"
         show_args+=" --netconfig-path $test_dir/netconfig/config"
+    else
+        migrate_args+=" --without-netconfig"
+        show_args+=" --without-netconfig"
     fi
 
     $MIGRATE_WICKED_BIN show $show_args $test_dir/wicked_xml