fix(vm-network): fix iptables rules (#2388)

fluencelabs · Sep 30, 2024 · 757eacf · 757eacf
1 parent 9e70b08
commit 757eacf
Show file tree

Hide file tree

Showing 9 changed files with 152 additions and 119 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/peer-metrics/src/info.rs b/crates/peer-metrics/src/info.rs
@@ -87,6 +87,7 @@ pub struct SystemInfo {
 #[derive(Default, Debug, Clone, Hash, Eq, PartialEq, EncodeLabelSet)]
 pub struct VmInfo {
     pub allow_gpu: u8,
+    pub interface: String,
     pub public_ip: String,
     pub host_ssh_port: u16,
     pub vm_ssh_port: u16,

diff --git a/crates/server-config/src/node_config.rs b/crates/server-config/src/node_config.rs
@@ -647,6 +647,8 @@ pub struct VmConfig {
 
 #[derive(Clone, Deserialize, Serialize, Debug, PartialEq, Eq)]
 pub struct VmNetworkConfig {
+    #[serde(default)]
+    pub interface: Option<String>,
     #[serde(default = "default_bridge_name")]
     pub bridge_name: String,
     pub public_ip: Ipv4Addr,

diff --git a/crates/server-config/src/resolved_config.rs b/crates/server-config/src/resolved_config.rs
@@ -861,6 +861,7 @@ mod tests {
             libvirt_uri = "qemu:///system"
             allow_gpu = true
             [vm.network]
+            interface = "eth0"
             bridge_name = "br422442"
             public_ip = "1.1.1.1"
             vm_ip = "2.2.2.2"
@@ -883,6 +884,7 @@ mod tests {
                     libvirt_uri: "qemu:///system".to_string(),
                     allow_gpu: true,
                     network: VmNetworkConfig {
+                        interface: Some("eth0".to_string()),
                         bridge_name: "br422442".to_string(),
                         public_ip: Ipv4Addr::new(1, 1, 1, 1),
                         vm_ip: Ipv4Addr::new(2, 2, 2, 2),

diff --git a/crates/vm-network-utils/Cargo.toml b/crates/vm-network-utils/Cargo.toml
@@ -3,13 +3,10 @@ name = "vm-network-utils"
 version = "0.1.0"
 edition = "2021"
 
-[[bin]]
-name = 'vm-network-utils'
-path = "bin/main.rs"
-
 [target.'cfg(target_os = "linux")'.dependencies]
 iptables = "0.5.2"
 
 [dependencies]
 thiserror = { workspace = true }
-tracing = { workspace = true }
+tracing = { workspace = true }
+netdev = "0.31.0"
diff --git a/crates/vm-network-utils/bin/main.rs b/crates/vm-network-utils/bin/main.rs