From 1830e40326a049b1449c5d60cd4dad369a761fa9 Mon Sep 17 00:00:00 2001 From: Samuel Dai Date: Thu, 3 Apr 2025 13:59:24 +0800 Subject: [PATCH] Revert "feat(cni): refactor cni_network with RAII design (#13)" (#23) This reverts commit d46ccf6ea77c62527df7977ec2dd5fbaad6c1245. --- crates/cni/src/cni_network.rs | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/crates/cni/src/cni_network.rs b/crates/cni/src/cni_network.rs index 190ff47..0a7d09d 100644 --- a/crates/cni/src/cni_network.rs +++ b/crates/cni/src/cni_network.rs @@ -67,19 +67,11 @@ fn get_netns(ns: &str, cid: &str) -> String { fn get_path(netns: &str) -> String { format!("/var/run/netns/{}", netns) } -pub struct CNINetwork { - cid: String, - ns: String -} -impl CNINetwork{ - fn new (cid: String,ns:String) -> CNINetwork{ - return CNINetwork { cid: cid, ns: ns } - } //TODO: 创建网络和删除网络的错误处理 -pub fn create_cni_network(&self) -> Result<(String, String), Err> { +pub fn create_cni_network(cid: String, ns: String) -> Result<(String, String), Err> { // let netid = format!("{}-{}", cid, pid); - let netns = get_netns(self.ns.as_str(), self.cid.as_str()); + let netns = get_netns(ns.as_str(), cid.as_str()); let path = get_path(netns.as_str()); let mut ip = String::new(); @@ -127,12 +119,6 @@ pub fn create_cni_network(&self) -> Result<(String, String), Err> { Ok((ip, path)) } -} -impl Drop for CNINetwork { - fn drop(&mut self) { - delete_cni_network(&self.ns, &self.cid); - } -} pub fn delete_cni_network(ns: &str, cid: &str) { let netns = get_netns(ns, cid); @@ -153,7 +139,6 @@ pub fn delete_cni_network(ns: &str, cid: &str) { .output(); } - fn dir_exists(dirname: &Path) -> bool { path_exists(dirname).is_some_and(|info| info.is_dir()) }