External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-03-20 07:58:55 +00:00
Code

ch-remote: Add "create" command to ch-remote

Browse Source 
Tested by:
1. Path: ch-remote --api-socket .. create test-config.json
2. stdin with "-" path: ch-remote --api-socket .. create - < test-config.json
2. stding with implicit "-": ch-remote --api-socket .. create < test-config.json

Fixes: #4250

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-06-28 16:54:59 +01:00
parent cb53a8b40c
commit b0afeeeb65
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/bin/ch-remote.rs
View File

@ -12,6 +12,7 @@ use api_client::Error as ApiClientError;
use clap::{Arg, ArgMatches, Command}; use clap::{Arg, ArgMatches, Command};
use option_parser::{ByteSized, ByteSizedParseError}; use option_parser::{ByteSized, ByteSizedParseError};
use std::fmt; use std::fmt;
use std::io::Read;
use std::os::unix::net::UnixStream; use std::os::unix::net::UnixStream;
use std::process; use std::process;
@ -31,6 +32,8 @@ enum Error {
AddVdpaConfig(vmm::config::Error), AddVdpaConfig(vmm::config::Error),
AddVsockConfig(vmm::config::Error), AddVsockConfig(vmm::config::Error),
Restore(vmm::config::Error), Restore(vmm::config::Error),
ReadingStdin(std::io::Error),
ReadingFile(std::io::Error),
} }
impl fmt::Display for Error { impl fmt::Display for Error {
@ -51,6 +54,8 @@ impl fmt::Display for Error {
AddVdpaConfig(e) => write!(f, "Error parsing vDPA device syntax: {}", e), AddVdpaConfig(e) => write!(f, "Error parsing vDPA device syntax: {}", e),
AddVsockConfig(e) => write!(f, "Error parsing vsock syntax: {}", e), AddVsockConfig(e) => write!(f, "Error parsing vsock syntax: {}", e),
Restore(e) => write!(f, "Error parsing restore syntax: {}", e), Restore(e) => write!(f, "Error parsing restore syntax: {}", e),
ReadingStdin(e) => write!(f, "Error reading from stdin: {}", e),
ReadingFile(e) => write!(f, "Error reading from file: {}", e),
} }
} }
} }
@ -309,6 +314,20 @@ fn send_migration_api_command(
.map_err(Error::ApiClient) .map_err(Error::ApiClient)
} }
fn create_api_command(socket: &mut UnixStream, path: &str) -> Result<(), Error> {
let mut data = String::default();
if path == "-" {
std::io::stdin()
.read_to_string(&mut data)
.map_err(Error::ReadingStdin)?;
} else {
let mut f = std::fs::File::open(path).map_err(Error::ReadingFile)?;
f.read_to_string(&mut data).map_err(Error::ReadingFile)?;
};
simple_api_command(socket, "PUT", "create", Some(&data)).map_err(Error::ApiClient)
}
fn do_command(matches: &ArgMatches) -> Result<(), Error> { fn do_command(matches: &ArgMatches) -> Result<(), Error> {
let mut socket = let mut socket =
UnixStream::connect(matches.value_of("api-socket").unwrap()).map_err(Error::Connect)?; UnixStream::connect(matches.value_of("api-socket").unwrap()).map_err(Error::Connect)?;
@ -464,6 +483,14 @@ fn do_command(matches: &ArgMatches) -> Result<(), Error> {
.value_of("receive_migration_config") .value_of("receive_migration_config")
.unwrap(), .unwrap(),
), ),
Some("create") => create_api_command(
&mut socket,
matches
.subcommand_matches("create")
.unwrap()
.value_of("path")
.unwrap(),
),
Some(c) => simple_api_command(&mut socket, "PUT", c, None).map_err(Error::ApiClient), Some(c) => simple_api_command(&mut socket, "PUT", c, None).map_err(Error::ApiClient),
None => unreachable!(), None => unreachable!(),
} }
@ -646,6 +673,11 @@ fn main() {
.index(1) .index(1)
.help("<receiver_url>"), .help("<receiver_url>"),
), ),
)
.subcommand(
Command::new("create")
.about("Create VM from a JSON configuration")
.arg(Arg::new("path").index(1).default_value("-")),
); );
let matches = app.get_matches(); let matches = app.get_matches();