Merge pull request #187 from Apokleos/enhance-ns-conversion

youki-dev · Jul 11, 2024 · 1b54239 · 1b54239
2 parents 80e8e8d + 83beeb4
commit 1b54239
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/runtime/linux.rs b/src/runtime/linux.rs
@@ -828,13 +828,13 @@ impl TryFrom<&str> for LinuxNamespaceType {
 
     fn try_from(namespace: &str) -> Result<Self, Self::Error> {
         match namespace {
-            "mnt" => Ok(LinuxNamespaceType::Mount),
+            "mnt" | "mount" => Ok(LinuxNamespaceType::Mount),
             "cgroup" => Ok(LinuxNamespaceType::Cgroup),
             "uts" => Ok(LinuxNamespaceType::Uts),
             "ipc" => Ok(LinuxNamespaceType::Ipc),
             "user" => Ok(LinuxNamespaceType::User),
             "pid" => Ok(LinuxNamespaceType::Pid),
-            "net" => Ok(LinuxNamespaceType::Network),
+            "net" | "network" => Ok(LinuxNamespaceType::Network),
             "time" => Ok(LinuxNamespaceType::Time),
             _ => Err(oci_error(format!(
                 "unknown namespace {namespace}, could not convert"
@@ -1525,6 +1525,10 @@ mod tests {
         let nstype_enum = LinuxNamespaceType::try_from(nstype_str).unwrap();
         assert_eq!(nstype_enum, LinuxNamespaceType::Network);
 
+        let nstype_str = "network";
+        let nstype_enum = LinuxNamespaceType::try_from(nstype_str).unwrap();
+        assert_eq!(nstype_enum, LinuxNamespaceType::Network);
+
         let nstype_str = "ipc";
         let nstype_enum = LinuxNamespaceType::try_from(nstype_str).unwrap();
         assert_eq!(nstype_enum, LinuxNamespaceType::Ipc);
@@ -1533,7 +1537,11 @@ mod tests {
         let nstype_enum = LinuxNamespaceType::try_from(nstype_str).unwrap();
         assert_eq!(nstype_enum, LinuxNamespaceType::Cgroup);
 
-        let invalid_nstype_str = "mount";
+        let nstype_str = "mount";
+        let nstype_enum = LinuxNamespaceType::try_from(nstype_str).unwrap();
+        assert_eq!(nstype_enum, LinuxNamespaceType::Mount);
+
+        let invalid_nstype_str = "xxx";
         let unknown_nstype = LinuxNamespaceType::try_from(invalid_nstype_str);
         assert!(unknown_nstype.is_err());
     }