feat: allow use to add a VM on virtual networks

Sponsored-by: author

5 files changed, 34 insertions, 6 deletions

diff --git a/src/cmd/config.rs b/src/cmd/config.rs
index 396f089..0a78a64 100644
--- a/src/cmd/config.rs
+++ b/src/cmd/config.rs
@@ -6,7 +6,9 @@ use crate::config::Configuration;
 
 /// The `config` sub-command.
 ///
-/// Write the actual run-time configuration to stdout.
+/// Write the actual run-time configuration to stdout as JSON. We
+/// convert the config to JSON to make it clear we parse it the right
+/// way.
 pub fn config(config: &Configuration) -> Result<(), std::io::Error> {
     let config = serde_json::to_vec(&config).unwrap();
     std::io::stdout().write_all(&config)?;
diff --git a/src/cmd/spec.rs b/src/cmd/spec.rs
index b41f234..7922cb5 100644
--- a/src/cmd/spec.rs
+++ b/src/cmd/spec.rs
@@ -6,11 +6,11 @@ use crate::spec::Specification;
 
 /// The `spec` sub-command.
 ///
-/// Write the actual VM specifications to stdout.
+/// Write the actual VM specifications to stdout as JSON. We convert
+/// the spec to JSON to make it more clear that we parse the config
+/// and spec in the right way.
 pub fn spec(specs: &[Specification]) -> Result<(), std::io::Error> {
-    for spec in specs {
-        let spec = serde_yaml::to_vec(&spec).unwrap();
-        std::io::stdout().write_all(&spec)?;
-    }
+    let spec = serde_json::to_vec(specs).unwrap();
+    std::io::stdout().write_all(&spec)?;
     Ok(())
 }
diff --git a/src/config.rs b/src/config.rs
index 7a38942..4786bdb 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -29,6 +29,9 @@ pub struct Configuration {
     /// Should new VM be started automatically on host boot?
     pub default_autostart: Option<bool>,
 
+    /// List of default networks to add to hosts.
+    pub default_networks: Option<Vec<String>>,
+
     /// Directory where new VM images should be created, if given.
     pub image_directory: Option<PathBuf>,
 
diff --git a/src/install.rs b/src/install.rs
index 94c703c..c84f30a 100644
--- a/src/install.rs
+++ b/src/install.rs
@@ -40,6 +40,7 @@ pub struct VirtInstallArgs {
     vcpus: u64,
     image: VirtualMachineImage,
     init: CloudInitConfig,
+    networks: Vec<String>,
 }
 
 impl VirtInstallArgs {
@@ -51,6 +52,7 @@ impl VirtInstallArgs {
             vcpus: 1,
             image: image.clone(),
             init: init.clone(),
+            networks: vec![],
         }
     }
 
@@ -88,12 +90,31 @@ impl VirtInstallArgs {
     pub fn init(&self) -> &CloudInitConfig {
         &self.init
     }
+
+    /// Add another network to add to the VM.
+    pub fn add_network(&mut self, network: &str) {
+        self.networks.push(network.to_string());
+    }
+
+    /// Return list of networks to add to the VM.
+    pub fn networks(&self) -> Vec<String> {
+        self.networks.clone()
+    }
 }
 
 /// Create new VM with virt-install.
 pub fn virt_install(args: &VirtInstallArgs, iso: &Path) -> Result<PathBuf, VirtInstallError> {
     args.init().create_iso(&iso)?;
 
+    let networks: Vec<String> = if args.networks.is_empty() {
+        vec!["--network=default".to_string()]
+    } else {
+        args.networks
+            .iter()
+            .map(|s| format!("--network={}", s))
+            .collect()
+    };
+
     let r = Command::new("virt-install")
         .arg("--name")
         .arg(args.name())
@@ -115,6 +136,7 @@ pub fn virt_install(args: &VirtInstallArgs, iso: &Path) -> Result<PathBuf, VirtI
         .arg("--graphics=spice")
         .arg("--noautoconsole")
         .arg("--quiet")
+        .args(&networks)
         .output()
         .map_err(VirtInstallError::Run)?;
     if !r.status.success() {
diff --git a/src/spec.rs b/src/spec.rs
index bf622c0..1470fdb 100644
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -31,6 +31,7 @@ struct OneVmInputSpecification {
     pub cpus: Option<u64>,
     pub generate_host_certificate: Option<bool>,
     pub autostart: Option<bool>,
+    pub networks: Option<Vec<String>>,
     pub ca_key: Option<PathBuf>,
 }