Omicron dev for simulating multiple racks (Just a Bunch of Racks / JBOR)

.envrc

@@ -5,6 +5,7 @@ PATH_add out/cockroachdb/bin
 PATH_add out/clickhouse
 PATH_add out/dendrite-stub/bin
 PATH_add out/mgd/root/opt/oxide/mgd/bin
+PATH_add out/lldp/root/opt/oxide/bin
 
 if [ "$OMICRON_USE_FLAKE" = 1 ] && nix flake show &> /dev/null
 then

Cargo.toml

@@ -613,6 +613,7 @@ ntp-admin-types = { path = "ntp-admin/types" }
 ntp-admin-types-versions = { path = "ntp-admin/types/versions" }
 mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "7696ee48d5ee29a917dea459e281fe2e8ff20513" }
 ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "7696ee48d5ee29a917dea459e281fe2e8ff20513" }
+loopback-ip-mgr = { git = "https://github.com/oxidecomputer/falcon", rev = "aa44de0ab2edd702322ef60dd9fec1d1e70348ad" }
 multimap = "0.10.1"
 nexus-auth = { path = "nexus/auth" }
 nexus-background-task-interface = { path = "nexus/background-task-interface" }

dev-tools/downloader/src/lib.rs

@@ -74,6 +74,9 @@ enum Target {
 
     /// Transceiver Control binary
     TransceiverControl,
+
+    /// LLDP binary
+    LLDP,
 }
 
 #[derive(Parser)]
@@ -136,6 +139,7 @@ pub async fn run_cmd(args: DownloadArgs) -> Result<()> {
                     Target::Cockroach => downloader.download_cockroach().await,
                     Target::Console => downloader.download_console().await,
                     Target::DendriteStub => downloader.download_dendrite_stub().await,
+                    Target::LLDP => downloader.download_lldp().await,
                     Target::MaghemiteMgd => downloader.download_maghemite_mgd().await,
                     Target::Softnpu => downloader.download_softnpu().await,
                     Target::TransceiverControl => {
@@ -870,6 +874,80 @@ impl Downloader<'_> {
         Ok(())
     }
 
+    async fn download_lldp(&self) -> std::result::Result<(), anyhow::Error> {
+        let download_dir = self.output_dir.join("downloads");
+        tokio::fs::create_dir_all(&download_dir).await?;
+
+        let checksums_path = self.versions_dir.join("lldp_checksums");
+        let [lldp_sha2, lldp_linux_sha2] = get_values_from_file(
+            ["CIDL_SHA256", "LINUX_SHA256"],
+            &checksums_path,
+        )
+        .await?;
+        let commit_path = self.versions_dir.join("lldp_openapi_version");
+        let [commit] = get_values_from_file(["COMMIT"], &commit_path).await?;
+
+        let repo = "oxidecomputer/lldp";
+        let base_url = format!("{BUILDOMAT_URL}/{repo}/image/{commit}");
+
+        let filename = "lldp.tar.gz";
+        let tarball_path = download_dir.join(filename);
+        download_file_and_verify(
+            &self.log,
+            &tarball_path,
+            &format!("{base_url}/{filename}"),
+            ChecksumAlgorithm::Sha2,
+            &lldp_sha2,
+        )
+        .await?;
+        unpack_tarball(&self.log, &tarball_path, &download_dir).await?;
+
+        let destination_dir = self.output_dir.join("lldp");
+        let _ = tokio::fs::remove_dir_all(&destination_dir).await;
+        tokio::fs::create_dir_all(&destination_dir).await?;
+        copy_dir_all(
+            &download_dir.join("root"),
+            &destination_dir.join("root"),
+        )?;
+
+        let binary_dir = destination_dir.join("root/opt/oxide/bin");
+
+        match os_name()? {
+            Os::Linux => {
+                let filename = "lldpd";
+                let path = download_dir.join(filename);
+                download_file_and_verify(
+                    &self.log,
+                    &path,
+                    &format!(
+                        "{BUILDOMAT_URL}/{repo}/linux/{commit}/{filename}"
+                    ),
+                    ChecksumAlgorithm::Sha2,
+                    &lldp_linux_sha2,
+                )
+                .await?;
+                set_permissions(&path, 0o755).await?;
+                tokio::fs::copy(path, binary_dir.join(filename)).await?;
+            }
+            Os::Mac => {
+                info!(self.log, "Building lldp from source for macOS");
+
+                let binaries = [("lldpd", &["--no-default-features"][..])];
+
+                let built_binaries =
+                    self.build_from_git("lldp", &commit, &binaries).await?;
+
+                // Copy built binary to binary_dir
+                let dest = binary_dir.join("lldp");
+                tokio::fs::copy(&built_binaries[0], &dest).await?;
+                set_permissions(&dest, 0o755).await?;
+            }
+            Os::Illumos => (),
+        }
+
+        Ok(())
+    }
+
     async fn download_maghemite_mgd(&self) -> Result<()> {
         let download_dir = self.output_dir.join("downloads");
         tokio::fs::create_dir_all(&download_dir).await?;

dev-tools/omicron-dev/Cargo.toml

@@ -19,15 +19,22 @@ futures.workspace = true
 gateway-client.workspace = true
 gateway-test-utils.workspace = true
 libc.workspace = true
+loopback-ip-mgr.workspace = true
+sled-agent-types.workspace = true
+mg-admin-client.workspace = true
 nexus-config.workspace = true
 nexus-test-interface.workspace = true
 nexus-test-utils = { workspace = true, features = ["omicron-dev"] }
+omicron-test-utils.workspace = true
 omicron-nexus.workspace = true
 omicron-workspace-hack.workspace = true
 oxide-tokio-rt.workspace = true
 # See omicron-rpaths for more about the "pq-sys" dependency.
 pq-sys = "*"
 signal-hook-tokio.workspace = true
+slog.workspace=true
+slog-term.workspace=true
+slog-async.workspace=true
 tokio.workspace = true
 toml.workspace = true
 
@@ -38,7 +45,6 @@ fmd-adm-sys.workspace = true
 [dev-dependencies]
 expectorate.workspace = true
 omicron-dev-lib.workspace = true
-omicron-test-utils.workspace = true
 oxide-client.workspace = true
 subprocess.workspace = true
 tokio-postgres.workspace = true