From 60a42351e274ccd159414dc36c58fcea4b1061fa Mon Sep 17 00:00:00 2001
From: Xuewei Niu <niuxuewei.nxw@antgroup.com>
Date: Mon, 25 Dec 2023 15:24:41 +0800
Subject: [PATCH] runtime-rs: DAN supports vhost-user-net device

DAN reads vhost-user-net device from JSON config. It only supports VMM
running as server right now.

Fixes: #8625

Signed-off-by: Xuewei Niu <niuxuewei.nxw@antgroup.com>
---
 .../crates/resource/src/network/dan.rs        | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/runtime-rs/crates/resource/src/network/dan.rs b/src/runtime-rs/crates/resource/src/network/dan.rs
index d59875bca1..0a0183b180 100644
--- a/src/runtime-rs/crates/resource/src/network/dan.rs
+++ b/src/runtime-rs/crates/resource/src/network/dan.rs
@@ -33,9 +33,10 @@ use tokio::sync::RwLock;
 use super::network_entity::NetworkEntity;
 use super::utils::address::{ip_family_from_ip_addr, parse_ip_cidr};
 use super::{EndpointState, NetnsGuard, Network};
-use crate::network::endpoint::TapEndpoint;
+use crate::network::endpoint::{TapEndpoint, VhostUserEndpoint};
 use crate::network::network_info::network_info_from_dan::NetworkInfoFromDan;
 use crate::network::utils::generate_private_mac_addr;
+use crate::network::Endpoint;
 
 /// Directly attachable network
 pub struct Dan {
@@ -78,16 +79,24 @@ impl DanInner {
         let mut entity_list = Vec::with_capacity(config.devices.len());
         for (idx, device) in config.devices.iter().enumerate() {
             let name = format!("eth{}", idx);
-            let endpoint = match &device.device {
-                // TODO: Support VhostUserNet protocol
+            let endpoint: Arc<dyn Endpoint> = match &device.device {
                 Device::VhostUser {
                     path,
-                    queue_num: _,
-                    queue_size: _,
-                } => {
-                    warn!(sl!(), "A DAN device whose type is \"vhost-user\" and socket path is {} is ignored.", path);
-                    continue;
-                }
+                    queue_num,
+                    queue_size,
+                } => Arc::new(
+                    VhostUserEndpoint::new(
+                        dev_mgr,
+                        idx as u32,
+                        &name,
+                        &device.guest_mac,
+                        path,
+                        *queue_num,
+                        *queue_size,
+                    )
+                    .await
+                    .with_context(|| format!("create a vhost user endpoint, path: {}", path))?,
+                ),
                 Device::HostTap {
                     tap_name,
                     queue_num,
@@ -104,7 +113,7 @@ impl DanInner {
                         dev_mgr,
                     )
                     .await
-                    .with_context(|| format!("New a {} tap endpoint", tap_name))?,
+                    .with_context(|| format!("create a {} tap endpoint", tap_name))?,
                 ),
             };