mirror of
https://github.com/edera-dev/krata.git
synced 2025-08-02 12:50:54 +00:00
hypha: name domain with uuid
This commit is contained in:
parent
228e42a779
commit
80311db549
@ -4,6 +4,7 @@ use crate::image::{ImageCompiler, ImageInfo};
|
|||||||
use ocipkg::ImageName;
|
use ocipkg::ImageName;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
use uuid::Uuid;
|
||||||
use xenclient::{DomainConfig, XenClient};
|
use xenclient::{DomainConfig, XenClient};
|
||||||
|
|
||||||
pub struct Controller {
|
pub struct Controller {
|
||||||
@ -50,8 +51,11 @@ impl Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn launch(&mut self) -> Result<u32> {
|
pub fn launch(&mut self) -> Result<u32> {
|
||||||
|
let uuid = Uuid::new_v4();
|
||||||
|
let name = format!("hypha-{uuid}");
|
||||||
let _image_info = self.compile()?;
|
let _image_info = self.compile()?;
|
||||||
let config = DomainConfig {
|
let config = DomainConfig {
|
||||||
|
name: &name,
|
||||||
max_vcpus: self.vcpus,
|
max_vcpus: self.vcpus,
|
||||||
mem_mb: self.mem,
|
mem_mb: self.mem,
|
||||||
kernel_path: self.kernel_path.as_str(),
|
kernel_path: self.kernel_path.as_str(),
|
||||||
|
@ -33,7 +33,7 @@ impl ImageCache {
|
|||||||
{
|
{
|
||||||
let manifest_text = fs::read_to_string(&manifest_path)?;
|
let manifest_text = fs::read_to_string(&manifest_path)?;
|
||||||
let manifest: ImageManifest = serde_json::from_str(&manifest_text)?;
|
let manifest: ImageManifest = serde_json::from_str(&manifest_text)?;
|
||||||
let config_text = fs::read_to_string(&manifest_path)?;
|
let config_text = fs::read_to_string(&config_path)?;
|
||||||
let config: ImageConfiguration = serde_json::from_str(&config_text)?;
|
let config: ImageConfiguration = serde_json::from_str(&config_text)?;
|
||||||
debug!("cache hit digest={}", digest);
|
debug!("cache hit digest={}", digest);
|
||||||
Some(ImageInfo::new(squashfs_path.clone(), manifest, config)?)
|
Some(ImageInfo::new(squashfs_path.clone(), manifest, config)?)
|
||||||
|
@ -13,6 +13,7 @@ fn main() -> Result<(), XenClientError> {
|
|||||||
let initrd_path = args.get(2).expect("argument not specified");
|
let initrd_path = args.get(2).expect("argument not specified");
|
||||||
let mut client = XenClient::open()?;
|
let mut client = XenClient::open()?;
|
||||||
let config = DomainConfig {
|
let config = DomainConfig {
|
||||||
|
name: "xenclient-test",
|
||||||
max_vcpus: 1,
|
max_vcpus: 1,
|
||||||
mem_mb: 512,
|
mem_mb: 512,
|
||||||
kernel_path: kernel_image_path.as_str(),
|
kernel_path: kernel_image_path.as_str(),
|
||||||
|
@ -79,6 +79,7 @@ impl From<EventChannelError> for XenClientError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub struct DomainConfig<'a> {
|
pub struct DomainConfig<'a> {
|
||||||
|
pub name: &'a str,
|
||||||
pub max_vcpus: u32,
|
pub max_vcpus: u32,
|
||||||
pub mem_mb: u64,
|
pub mem_mb: u64,
|
||||||
pub kernel_path: &'a str,
|
pub kernel_path: &'a str,
|
||||||
@ -153,7 +154,8 @@ impl XenClient {
|
|||||||
format!("{}/uuid", vm_path).as_str(),
|
format!("{}/uuid", vm_path).as_str(),
|
||||||
&Uuid::from_bytes(domain.handle).to_string(),
|
&Uuid::from_bytes(domain.handle).to_string(),
|
||||||
)?;
|
)?;
|
||||||
tx.write_string(format!("{}/name", vm_path).as_str(), "mycelium")?;
|
tx.write_string(format!("{}/name", dom_path).as_str(), config.name)?;
|
||||||
|
tx.write_string(format!("{}/name", vm_path).as_str(), config.name)?;
|
||||||
tx.write_string(format!("{}/type", libxl_path).as_str(), "pv")?;
|
tx.write_string(format!("{}/type", libxl_path).as_str(), "pv")?;
|
||||||
tx.commit()?;
|
tx.commit()?;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user