github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 08:17:37 +00:00
Code Issues Projects Releases Wiki Activity

oci: add Default and Clone to oci spec objects

Browse Source 
Add the clone and default feature to oci
spec objects.

Signed-off-by: fupan.lfp <fupan.lfp@antfin.com>
This commit is contained in:
fupan.lfp 2020-03-19 20:12:58 +08:00
parent 7df8edef1b
commit ded27f48d5
2 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/agent/oci/src/lib.rs
View File

@ -27,7 +27,7 @@ where
*d == T::default() *d == T::default()
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Spec { pub struct Spec {
#[serde( #[serde(
default, default,
@ -69,7 +69,7 @@ impl Spec {
pub type LinuxRlimit = POSIXRlimit; pub type LinuxRlimit = POSIXRlimit;
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Process { pub struct Process {
#[serde(default)] #[serde(default)]
pub terminal: bool, pub terminal: bool,
@ -112,7 +112,7 @@ pub struct Process {
pub selinux_label: String, pub selinux_label: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxCapabilities { pub struct LinuxCapabilities {
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
pub bounding: Vec<String>, pub bounding: Vec<String>,
@ -126,7 +126,7 @@ pub struct LinuxCapabilities {
pub ambient: Vec<String>, pub ambient: Vec<String>,
} }
#[derive(Default, Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Box { pub struct Box {
#[serde(default)] #[serde(default)]
pub height: u32, pub height: u32,
@ -134,7 +134,7 @@ pub struct Box {
pub width: u32, pub width: u32,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct User { pub struct User {
#[serde(default)] #[serde(default)]
pub uid: u32, pub uid: u32,
@ -150,7 +150,7 @@ pub struct User {
pub username: String, pub username: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Root { pub struct Root {
#[serde(default, skip_serializing_if = "String::is_empty")] #[serde(default, skip_serializing_if = "String::is_empty")]
pub path: String, pub path: String,
@ -158,7 +158,7 @@ pub struct Root {
pub readonly: bool, pub readonly: bool,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Mount { pub struct Mount {
#[serde(default)] #[serde(default)]
pub destination: String, pub destination: String,
@ -170,7 +170,7 @@ pub struct Mount {
pub options: Vec<String>, pub options: Vec<String>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Hook { pub struct Hook {
#[serde(default, skip_serializing_if = "String::is_empty")] #[serde(default, skip_serializing_if = "String::is_empty")]
pub path: String, pub path: String,
@ -182,7 +182,7 @@ pub struct Hook {
pub timeout: Option<i32>, pub timeout: Option<i32>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Hooks { pub struct Hooks {
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
pub prestart: Vec<Hook>, pub prestart: Vec<Hook>,
@ -192,7 +192,7 @@ pub struct Hooks {
pub poststop: Vec<Hook>, pub poststop: Vec<Hook>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Linux { pub struct Linux {
#[serde(default, rename = "uidMappings", skip_serializing_if = "Vec::is_empty")] #[serde(default, rename = "uidMappings", skip_serializing_if = "Vec::is_empty")]
pub uid_mappings: Vec<LinuxIDMapping>, pub uid_mappings: Vec<LinuxIDMapping>,
@ -238,7 +238,7 @@ pub struct Linux {
pub intel_rdt: Option<LinuxIntelRdt>, pub intel_rdt: Option<LinuxIntelRdt>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxNamespace { pub struct LinuxNamespace {
#[serde(default, skip_serializing_if = "String::is_empty")] #[serde(default, skip_serializing_if = "String::is_empty")]
pub r#type: LinuxNamespaceType, pub r#type: LinuxNamespaceType,
@ -256,7 +256,7 @@ pub const USERNAMESPACE: &str = "user";
pub const UTSNAMESPACE: &str = "uts"; pub const UTSNAMESPACE: &str = "uts";
pub const CGROUPNAMESPACE: &str = "cgroup"; pub const CGROUPNAMESPACE: &str = "cgroup";
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxIDMapping { pub struct LinuxIDMapping {
#[serde(default, rename = "containerID")] #[serde(default, rename = "containerID")]
pub container_id: u32, pub container_id: u32,
@ -266,7 +266,7 @@ pub struct LinuxIDMapping {
pub size: u32, pub size: u32,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct POSIXRlimit { pub struct POSIXRlimit {
#[serde(default)] #[serde(default)]
pub r#type: String, pub r#type: String,
@ -276,7 +276,7 @@ pub struct POSIXRlimit {
pub soft: u64, pub soft: u64,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxHugepageLimit { pub struct LinuxHugepageLimit {
#[serde(default, rename = "pageSize", skip_serializing_if = "String::is_empty")] #[serde(default, rename = "pageSize", skip_serializing_if = "String::is_empty")]
pub page_size: String, pub page_size: String,
@ -284,7 +284,7 @@ pub struct LinuxHugepageLimit {
pub limit: u64, pub limit: u64,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxInterfacePriority { pub struct LinuxInterfacePriority {
#[serde(default, skip_serializing_if = "String::is_empty")] #[serde(default, skip_serializing_if = "String::is_empty")]
pub name: String, pub name: String,
@ -292,7 +292,7 @@ pub struct LinuxInterfacePriority {
pub priority: u32, pub priority: u32,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxBlockIODevice { pub struct LinuxBlockIODevice {
#[serde(default)] #[serde(default)]
pub major: i64, pub major: i64,
@ -300,7 +300,7 @@ pub struct LinuxBlockIODevice {
pub minor: i64, pub minor: i64,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxWeightDevice { pub struct LinuxWeightDevice {
pub blk: LinuxBlockIODevice, pub blk: LinuxBlockIODevice,
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
@ -313,14 +313,14 @@ pub struct LinuxWeightDevice {
pub leaf_weight: Option<u16>, pub leaf_weight: Option<u16>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxThrottleDevice { pub struct LinuxThrottleDevice {
pub blk: LinuxBlockIODevice, pub blk: LinuxBlockIODevice,
#[serde(default)] #[serde(default)]
pub rate: u64, pub rate: u64,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxBlockIO { pub struct LinuxBlockIO {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub weight: Option<u16>, pub weight: Option<u16>,
@ -362,7 +362,7 @@ pub struct LinuxBlockIO {
pub throttle_write_iops_device: Vec<LinuxThrottleDevice>, pub throttle_write_iops_device: Vec<LinuxThrottleDevice>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxMemory { pub struct LinuxMemory {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub limit: Option<i64>, pub limit: Option<i64>,
@ -384,7 +384,7 @@ pub struct LinuxMemory {
pub disable_oom_killer: Option<bool>, pub disable_oom_killer: Option<bool>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxCPU { pub struct LinuxCPU {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub shares: Option<u64>, pub shares: Option<u64>,
@ -410,13 +410,13 @@ pub struct LinuxCPU {
pub mems: String, pub mems: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxPids { pub struct LinuxPids {
#[serde(default)] #[serde(default)]
pub limit: i64, pub limit: i64,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxNetwork { pub struct LinuxNetwork {
#[serde(default, skip_serializing_if = "Option::is_none", rename = "classID")] #[serde(default, skip_serializing_if = "Option::is_none", rename = "classID")]
pub class_id: Option<u32>, pub class_id: Option<u32>,
@ -424,7 +424,7 @@ pub struct LinuxNetwork {
pub priorities: Vec<LinuxInterfacePriority>, pub priorities: Vec<LinuxInterfacePriority>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxRdma { pub struct LinuxRdma {
#[serde( #[serde(
default, default,
@ -440,7 +440,7 @@ pub struct LinuxRdma {
pub hca_objects: Option<u32>, pub hca_objects: Option<u32>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxResources { pub struct LinuxResources {
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
pub devices: Vec<LinuxDeviceCgroup>, pub devices: Vec<LinuxDeviceCgroup>,
@ -464,7 +464,7 @@ pub struct LinuxResources {
pub rdma: HashMap<String, LinuxRdma>, pub rdma: HashMap<String, LinuxRdma>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxDevice { pub struct LinuxDevice {
#[serde(default, skip_serializing_if = "String::is_empty")] #[serde(default, skip_serializing_if = "String::is_empty")]
pub path: String, pub path: String,
@ -482,7 +482,7 @@ pub struct LinuxDevice {
pub gid: Option<u32>, pub gid: Option<u32>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxDeviceCgroup { pub struct LinuxDeviceCgroup {
#[serde(default)] #[serde(default)]
pub allow: bool, pub allow: bool,
@ -496,7 +496,7 @@ pub struct LinuxDeviceCgroup {
pub access: String, pub access: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Solaris { pub struct Solaris {
#[serde(default, skip_serializing_if = "String::is_empty")] #[serde(default, skip_serializing_if = "String::is_empty")]
pub milestone: String, pub milestone: String,
@ -520,13 +520,13 @@ pub struct Solaris {
pub capped_memory: Option<SolarisCappedMemory>, pub capped_memory: Option<SolarisCappedMemory>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct SolarisCappedCPU { pub struct SolarisCappedCPU {
#[serde(default, skip_serializing_if = "String::is_empty")] #[serde(default, skip_serializing_if = "String::is_empty")]
pub ncpus: String, pub ncpus: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct SolarisCappedMemory { pub struct SolarisCappedMemory {
#[serde(default, skip_serializing_if = "String::is_empty")] #[serde(default, skip_serializing_if = "String::is_empty")]
pub physical: String, pub physical: String,
@ -534,7 +534,7 @@ pub struct SolarisCappedMemory {
pub swap: String, pub swap: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct SolarisAnet { pub struct SolarisAnet {
#[serde(default, skip_serializing_if = "String::is_empty", rename = "linkname")] #[serde(default, skip_serializing_if = "String::is_empty", rename = "linkname")]
pub link_name: String, pub link_name: String,
@ -572,7 +572,7 @@ pub struct SolarisAnet {
pub mac_address: String, pub mac_address: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct Windows<T> { pub struct Windows<T> {
#[serde( #[serde(
default, default,
@ -594,7 +594,7 @@ pub struct Windows<T> {
pub network: Option<WindowsNetwork>, pub network: Option<WindowsNetwork>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct WindowsResources { pub struct WindowsResources {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub memory: Option<WindowsMemoryResources>, pub memory: Option<WindowsMemoryResources>,
@ -604,13 +604,13 @@ pub struct WindowsResources {
pub storage: Option<WindowsStorageResources>, pub storage: Option<WindowsStorageResources>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct WindowsMemoryResources { pub struct WindowsMemoryResources {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub limit: Option<u64>, pub limit: Option<u64>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct WindowsCPUResources { pub struct WindowsCPUResources {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub count: Option<u64>, pub count: Option<u64>,
@ -620,7 +620,7 @@ pub struct WindowsCPUResources {
pub maximum: Option<u64>, pub maximum: Option<u64>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct WindowsStorageResources { pub struct WindowsStorageResources {
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub iops: Option<u64>, pub iops: Option<u64>,
@ -634,7 +634,7 @@ pub struct WindowsStorageResources {
pub sandbox_size: Option<u64>, pub sandbox_size: Option<u64>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct WindowsNetwork { pub struct WindowsNetwork {
#[serde( #[serde(
default, default,
@ -658,7 +658,7 @@ pub struct WindowsNetwork {
pub network_shared_container_name: String, pub network_shared_container_name: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct WindowsHyperV { pub struct WindowsHyperV {
#[serde( #[serde(
default, default,
@ -668,14 +668,14 @@ pub struct WindowsHyperV {
pub utility_vm_path: String, pub utility_vm_path: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct VM { pub struct VM {
pub hypervisor: VMHypervisor, pub hypervisor: VMHypervisor,
pub kernel: VMKernel, pub kernel: VMKernel,
pub image: VMImage, pub image: VMImage,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct VMHypervisor { pub struct VMHypervisor {
#[serde(default)] #[serde(default)]
pub path: String, pub path: String,
@ -683,7 +683,7 @@ pub struct VMHypervisor {
pub parameters: String, pub parameters: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct VMKernel { pub struct VMKernel {
#[serde(default)] #[serde(default)]
pub path: String, pub path: String,
@ -693,7 +693,7 @@ pub struct VMKernel {
pub initrd: String, pub initrd: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct VMImage { pub struct VMImage {
#[serde(default)] #[serde(default)]
pub path: String, pub path: String,
@ -701,7 +701,7 @@ pub struct VMImage {
pub format: String, pub format: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxSeccomp { pub struct LinuxSeccomp {
#[serde(default, rename = "defaultAction")] #[serde(default, rename = "defaultAction")]
pub default_action: LinuxSeccompAction, pub default_action: LinuxSeccompAction,
@ -750,7 +750,7 @@ pub const OPGREATEREQUAL: &str = "SCMP_CMP_GE";
pub const OPGREATERTHAN: &str = "SCMP_CMP_GT"; pub const OPGREATERTHAN: &str = "SCMP_CMP_GT";
pub const OPMASKEDEQUAL: &str = "SCMP_CMP_MASKED_EQ"; pub const OPMASKEDEQUAL: &str = "SCMP_CMP_MASKED_EQ";
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxSeccompArg { pub struct LinuxSeccompArg {
#[serde(default)] #[serde(default)]
pub index: u32, pub index: u32,
@ -762,7 +762,7 @@ pub struct LinuxSeccompArg {
pub op: LinuxSeccompOperator, pub op: LinuxSeccompOperator,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxSyscall { pub struct LinuxSyscall {
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
pub names: Vec<String>, pub names: Vec<String>,
@ -772,7 +772,7 @@ pub struct LinuxSyscall {
pub args: Vec<LinuxSeccompArg>, pub args: Vec<LinuxSeccompArg>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct LinuxIntelRdt { pub struct LinuxIntelRdt {
#[serde( #[serde(
default, default,
@ -782,7 +782,7 @@ pub struct LinuxIntelRdt {
pub l3_cache_schema: String, pub l3_cache_schema: String,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
pub struct State { pub struct State {
#[serde( #[serde(
default, default,

14
src/agent/src/sandbox.rs
View File

@ -282,7 +282,7 @@ mod tests {
use super::Sandbox; use super::Sandbox;
use crate::{mount::BareMount, skip_if_not_root}; use crate::{mount::BareMount, skip_if_not_root};
use nix::mount::MsFlags; use nix::mount::MsFlags;
use protocols::oci::{Linux, Root, Spec}; use oci::{Linux, Root, Spec};
use rustjail::container::LinuxContainer; use rustjail::container::LinuxContainer;
use rustjail::specconv::CreateOpts; use rustjail::specconv::CreateOpts;
use slog::Logger; use slog::Logger;
@ -489,13 +489,13 @@ mod tests {
} }
fn create_dummy_opts() -> CreateOpts { fn create_dummy_opts() -> CreateOpts {
let mut root = Root::new(); let mut root = Root::default();
root.Path = String::from("/"); root.path = String::from("/");
let linux = Linux::new(); let linux = Linux::default();
let mut spec = Spec::new(); let mut spec = Spec::default();
spec.Root = Some(root).into(); spec.root = Some(root).into();
spec.Linux = Some(linux).into(); spec.linux = Some(linux).into();
CreateOpts { CreateOpts {
cgroup_name: "".to_string(), cgroup_name: "".to_string(),