1 files changed, 18 insertions, 14 deletions

diff --git a/src/cmd/new.rs b/src/cmd/new.rs
index 57f69ae..5484c08 100644
--- a/src/cmd/new.rs
+++ b/src/cmd/new.rs
@@ -3,13 +3,13 @@
 use crate::cloudinit::{CloudInitConfig, CloudInitError};
 use crate::image::{ImageError, VirtualMachineImage};
 use crate::install::{virt_install, VirtInstallArgs, VirtInstallError};
+use crate::libvirt::{Libvirt, VirtError};
 use crate::spec::Specification;
+use crate::util::wait_for_ssh;
 
 use bytesize::GIB;
 use log::info;
-use std::net::TcpStream;
-
-const SSH_PORT: i32 = 22;
+use tempfile::tempdir;
 
 /// Errors returned by this module.
 #[derive(Debug, thiserror::Error)]
@@ -25,6 +25,14 @@ pub enum NewError {
     /// Problem with libvirt.
     #[error(transparent)]
     VirtInstallError(#[from] VirtInstallError),
+
+    /// Problem with virsh.
+    #[error(transparent)]
+    VirshError(#[from] std::io::Error),
+
+    /// Problem from libvirt server.
+    #[error(transparent)]
+    VirtError(#[from] VirtError),
 }
 
 /// The `new` sub-command.
@@ -32,6 +40,7 @@ pub enum NewError {
 /// Create all the new virtual machines specified by the caller. Wait
 /// until each VM's SSH port listens for connections.
 pub fn new(specs: &[Specification]) -> Result<(), NewError> {
+    let libvirt = Libvirt::connect("qemu:///system")?;
     for spec in specs {
         info!("creating new VM {}", spec.name);
 
@@ -49,23 +58,18 @@ pub fn new(specs: &[Specification]) -> Result<(), NewError> {
         image.resize(spec.image_size_gib * GIB)?;
 
         info!("creating VM");
+        let dir = tempdir()?;
+        let iso = dir.path().join("cloudinit.iso");
         let mut args = VirtInstallArgs::new(&spec.name, &image, &init);
         args.set_memory(spec.memory_mib);
         args.set_vcpus(spec.cpus);
-        virt_install(&args)?;
+        virt_install(&args, &iso)?;
 
         info!("waiting for {} to open its SSH port", spec.name);
-        wait_for_port(&spec.name, SSH_PORT)?;
+        wait_for_ssh(&spec.name);
+
+        libvirt.detach_cloud_init_iso(&spec.name)?;
     }
 
     Ok(())
 }
-
-fn wait_for_port(name: &str, port: i32) -> Result<(), NewError> {
-    let addr = format!("{}:{}", name, port);
-    loop {
-        if TcpStream::connect(&addr).is_ok() {
-            return Ok(());
-        }
-    }
-}