Merge pull request #31 from FyraStack/caleb/merge-crates

Merge crates

Author: TheHeroBrine422

Cargo.lock

@@ -1,42 +1,29 @@
 [workspace]
 resolver = "3"
-members = ["odorobo-agent", "odoroboctl", "odorobo-manager", "odorobo-shared"]
+members = ["odorobo"]
+
 [workspace.package]
 rust-version = "1.95.0"
+
 [workspace.dependencies]
-stable-eyre = "0.2.2"
+stable-eyre = "0.2"
+clap = { version = "4", features = ["derive", "env"] }
+tokio = { version = "1" }
+reqwest = { version = "0.13", features = ["json"] }
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = [
     "env-filter",
     "fmt",
     "json",
 ] }
-cloud-hypervisor-client = { git = "https://github.com/FyraStack/cloud-hypervisor-client.git" }
-serde_json = "1.0.149"
-serde = "1.0"
-axum = { version = "0.8.8", features = ["ws"] }
-thiserror = "2.0.18"
-axum-extra = "0.12"
-tower-http = { version = "0.6", features = ["trace"] }
-tokio = { version = "1" }
-kameo = { version = "0.19.2", features = ["remote"] }
-libp2p = { version = "0.56.0", features = ["yamux", "serde", "mdns"] }
-ahash = { version = "0.8.12", features = ["serde"] }
-ulid = { version = "1.2", features = ["serde", "uuid"] }
-# aide needs an older version of schemars
-schemars = "0.9"
-dirs = "6.0.0"
-bytesize = { version = "2.3.1", features = ["serde"] }
-odorobo-shared = { path = "odorobo-shared" }
-odorobo-agent = { path = "odorobo-agent" }
-odoroboctl = { path = "odoroboctl" }
-odorobo-manager = { path = "odorobo-manager" }
-dotenvy = "0.15"
-clap = { version = "4", features = ["derive", "env"] }
-ipnet = {version = "2.12.0", features = ["serde", "schemars08"]}
-url = { version = "2.3", features = ["serde"] }
-async-trait = "0.1.89"
-dashmap = "6.1.0"
+
+
+# our crates
+odorobo = { path = "odorobo" }
+
+
 
 # these are for performance optimizations, based on https://nnethercote.github.io/perf-book/build-configuration.html#optimization-level
 # these options can take a while to compile (up to 5-10 minutes), so its really only necessary for production binaries.

Cargo.toml

@@ -34,39 +34,27 @@ sudo dnf in -y clang-devel nftables cloud-hypervisor
 # Build the Agent
 cargo build --release
 
-# create basic config
-echo "{}" >> config.json
+# Run the Agent & Manager (requires write permissions to /run/odorobo)
+sudo ./target/release/odorobo --manager-enabled=true # or set ODOROBO_MANAGER_ENABLED=true
 
-# Run the Agent (requires write permissions to /run/odorobo, and access to systemd's system session bus
-sudo ./target/release/odorobo-agent
+# Run on other boxes
+sudo ./target/release/odorobo
 ```
 
-You will now be required to run the manager process:
-```
-# Build the Manager
-cargo build --release -p odorobo-manager
-# Run the Manager
-./target/release/odorobo-manager
-```
+You can run multiple managers for load balancing and HA, but it is not required.
 
 Install the CLI helper
 
 ```bash
 cargo install --path odoroboctl
 ```
 
-You can then use `odoroboctl` to directly interact with the Agent, for example to spawn a VM instance
-
-```bash
-odoroboctl spawn my-vm
-```
+You can then use `odoroboctl` to directly interact with the Manager, for example to spawn a VM instance
 
 Now apply the [Cloud Hypervisor VM spec](https://github.com/cloud-hypervisor/cloud-hypervisor/blob/main/docs/api.md#create-a-virtual-machine) to the instance, for example with a simple configuration that boots from a disk image
 
 ```bash
-# the `--boot` flag additionally also tells Cloud Hypervisor to boot the VM after applying the configuration, otherwise it will stay
-# in the "Created" state, requiring a separate `odoroboctl boot` call to start it.
-odoroboctl create my-vm --boot ./my-vm.json
+odoroboctl create vm.json
 ```
 
 To connect directly on the host, connect to the VM's serial console socket in its runtime directory: