nat: Make tests work

Import YAML files used for tests in the NAT module. Fix path handling
for pointing to these YAML files in the code, and also fix dependencies
imports for running the tests.

Signed-off-by: Quentin Monnet <[email protected]>

Author: qmonnet

Cargo.lock

@@ -42,6 +42,9 @@ thiserror = { version = "2.0.11", default-features = false, features = [] }
 tracing = { version = "0.1.40", default-features = false, features = ["attributes"] }
 tracing-subscriber = { version = "0.3.19", default-features = false, features = []}
 
+# dev-dependencies
+tracing-test = { version = "0.2.5", default-features = false, features = [] }
+
 [profile.dev]
 panic = "unwind"
 

Cargo.toml

@@ -14,3 +14,6 @@ serde = { workspace = true, features = ["derive"] }
 serde_yml = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["default"] }
+
+[dev-dependencies]
+tracing-test = { workspace = true }

dataplane/Cargo.toml

@@ -8,6 +8,7 @@ use std::fmt::Debug;
 use std::fs;
 use std::hash::Hash;
 use std::net::IpAddr;
+use std::path::Path;
 use tracing::{error, warn};
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
@@ -216,7 +217,7 @@ impl GlobalContext {
     }
 
     #[tracing::instrument(level = "info")]
-    fn load_vpcs(&mut self, directory: &str) {
+    fn load_vpcs(&mut self, directory: &Path) {
         let paths = fs::read_dir(directory).expect("Failed to read VPCs directory");
 
         for entry in paths.flatten() {
@@ -233,7 +234,7 @@ impl GlobalContext {
     }
 
     #[tracing::instrument(level = "info")]
-    fn load_pifs(&mut self, directory: &str) {
+    fn load_pifs(&mut self, directory: &Path) {
         let paths = fs::read_dir(directory).expect("Failed to read PIFs directory");
 
         for entry in paths.flatten() {
@@ -275,7 +276,7 @@ impl GlobalContext {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use tracing::{error, info, warn};
+    use tracing::{info, warn};
     use tracing_test::traced_test;
 
     #[test]
@@ -288,8 +289,8 @@ mod tests {
             pwd = std::env::current_dir().unwrap().display()
         );
         // Load VPCs and PIFs
-        context.load_vpcs("vpcs");
-        context.load_pifs("pifs");
+        context.load_vpcs(&Path::new("src").join("nat").join("vpcs").as_path());
+        context.load_pifs(&Path::new("src").join("nat").join("pifs").as_path());
 
         // Example global lookup
         let ip: IpAddr = "11.11.0.5".parse().unwrap();

dataplane/src/nat.rs

@@ -0,0 +1,8 @@
+name: PIF1
+vni: 3000
+endpoints:
+  - [192.168.1.1, 32]
+  - [192.168.1.0, 24]
+ips:
+  - [10.10.0.0, 24]
+vpc: VPC1

dataplane/src/nat/pifs/pif-1.yaml

@@ -0,0 +1,8 @@
+name: PIF2
+vni: 4000
+endpoints:
+  - [10.0.0.1, 32]
+  - [10.0.0.0, 24]
+ips:
+  - [11.11.0.0, 24]
+vpc: VPC2

dataplane/src/nat/pifs/pif-2.yaml

@@ -0,0 +1,2 @@
+name: VPC1
+vni: 100

dataplane/src/nat/vpcs/vpc1.yaml

@@ -0,0 +1,2 @@
+name: VPC2
+vni: 200