Merge pull request #7306 from justxuewei/none-network-model

runtime-rs: Do not scan network if network model is "none"
This commit is contained in:
Chao Wu 2023-07-12 14:53:52 +08:00 committed by GitHub
commit f6a51a8a78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,7 +49,13 @@ struct NetworkWithNetnsInner {
impl NetworkWithNetnsInner { impl NetworkWithNetnsInner {
async fn new(config: &NetworkWithNetNsConfig, d: Arc<RwLock<DeviceManager>>) -> Result<Self> { async fn new(config: &NetworkWithNetNsConfig, d: Arc<RwLock<DeviceManager>>) -> Result<Self> {
let entity_list = if config.netns_path.is_empty() { let entity_list = if config.netns_path.is_empty() {
warn!(sl!(), "skip to scan for empty netns"); warn!(sl!(), "Skip to scan network for empty netns");
vec![]
} else if config.network_model.as_str() == "none" {
warn!(
sl!(),
"Skip to scan network from netns due to the none network model"
);
vec![] vec![]
} else { } else {
// get endpoint // get endpoint