Feat/process manager (#122)

.github/workflows/ci.yml

@@ -37,12 +37,8 @@ jobs:
       - name: Build
         run: cargo build
 
-      - name: Tests (except provider crate)
-        run: cargo test --workspace --exclude provider
-
-      - name: Tests (provider crate)
-        # there should be a unique test thread for native provider tests (asserting spawned processes count)
-        run: cargo test -p provider -- --test-threads 1
+      - name: Tests 
+        run: cargo test --workspace
 
   coverage:
     name: Zombienet SDK - coverage
@@ -64,8 +60,7 @@ jobs:
         uses: taiki-e/install-action@cargo-llvm-cov
 
       - name: Collect coverage data
-        # there should be a unique test thread for native provider tests (asserting spawned processes count)
-        run: cargo llvm-cov nextest -j 1 --lcov --output-path lcov.info
+        run: cargo llvm-cov nextest --lcov --output-path lcov.info
 
       - name: Report code coverage
         uses: Nef10/[email protected]

Cargo.toml

@@ -26,7 +26,6 @@ multiaddr = "0.18"
 url = "2.3"
 uuid = "1.4"
 nix = "0.27"
-procfs = "0.15"
 pest = "2.7"
 pest_derive = "2.7"
 rand = "0.8"

crates/examples/examples/simple_network_example.rs

@@ -3,15 +3,16 @@
 use configuration::NetworkConfig;
 use orchestrator::Orchestrator;
 use provider::NativeProvider;
-use support::fs::local::LocalFileSystem;
+use support::{fs::local::LocalFileSystem, process::os::OsProcessManager};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let config = NetworkConfig::load_from_toml("./crates/examples/examples/0001-simple.toml")
         .expect("errored?");
 
     let fs = LocalFileSystem;
-    let provider = NativeProvider::new(fs.clone());
+    let pm = OsProcessManager;
+    let provider = NativeProvider::new(fs.clone(), pm);
     let orchestrator = Orchestrator::new(fs, provider);
     orchestrator.spawn(config).await?;
     println!("🚀🚀🚀🚀 network deployed");

crates/examples/examples/small_network_with_default.rs

@@ -1,7 +1,7 @@
 use configuration::NetworkConfigBuilder;
 use orchestrator::{AddNodeOpts, Orchestrator};
 use provider::NativeProvider;
-use support::fs::local::LocalFileSystem;
+use support::{fs::local::LocalFileSystem, process::os::OsProcessManager};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -21,7 +21,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .unwrap();
 
     let fs = LocalFileSystem;
-    let provider = NativeProvider::new(fs.clone());
+    let pm = OsProcessManager;
+    let provider = NativeProvider::new(fs.clone(), pm);
     let orchestrator = Orchestrator::new(fs, provider);
     let mut network = orchestrator.spawn(config).await?;
     println!("🚀🚀🚀🚀 network deployed");

crates/examples/examples/small_network_with_para.rs

@@ -3,7 +3,7 @@ use std::time::Duration;
 use configuration::{NetworkConfigBuilder, RegistrationStrategy};
 use orchestrator::{AddNodeOpts, Orchestrator};
 use provider::NativeProvider;
-use support::fs::local::LocalFileSystem;
+use support::{fs::local::LocalFileSystem, process::os::OsProcessManager};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -24,7 +24,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .unwrap();
 
     let fs = LocalFileSystem;
-    let provider = NativeProvider::new(fs.clone());
+    let pm = OsProcessManager;
+    let provider = NativeProvider::new(fs.clone(), pm);
     let orchestrator = Orchestrator::new(fs, provider);
     let mut network = orchestrator.spawn(config).await?;
     println!("🚀🚀🚀🚀 network deployed");

crates/orchestrator/src/spawner.rs

@@ -105,7 +105,7 @@ where
         bootnode_addr: ctx.bootnodes_addr.clone(),
     };
 
-    let (cmd, args) = match ctx.role {
+    let (program, args) = match ctx.role {
         // Collator should be `non-cumulus` one (e.g adder/undying)
         ZombieRole::Node | ZombieRole::Collator => {
 
@@ -126,11 +126,11 @@ where
 
     println!("\n");
     println!("🚀 {}, spawning.... with command:", node.name);
-    println!("{cmd} {}", args.join(" "));
+    println!("{program} {}", args.join(" "));
 
     let spawn_ops = SpawnNodeOptions {
         name: node.name.clone(),
-        command: cmd,
+        program,
         args,
         env: node
             .env

crates/provider/Cargo.toml

@@ -24,7 +24,4 @@ tokio = { workspace = true, features = [
 thiserror = { workspace = true }
 anyhow = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }
-nix = { workspace = true, features = ["signal"] }
-
-[dev-dependencies]
-procfs = { workspace = true }
+nix = { workspace = true, features = ["signal"] }