diff --git a/Cargo.lock b/Cargo.lock index 4ff5922..204fabc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -690,6 +690,24 @@ dependencies = [ "tokio", ] +[[package]] +name = "brocade-snmp-server" +version = "0.1.0" +dependencies = [ + "base64 0.22.1", + "brocade", + "env_logger", + "harmony", + "harmony_cli", + "harmony_macros", + "harmony_secret", + "harmony_types", + "log", + "serde", + "tokio", + "url", +] + [[package]] name = "brocade-switch" version = "0.1.0" @@ -2497,7 +2515,6 @@ dependencies = [ "serde_json", "serde_with", "serde_yaml", - "serial_test", "similar", "sqlx", "strum 0.27.2", @@ -5193,15 +5210,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scc" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" -dependencies = [ - "sdd", -] - [[package]] name = "schannel" version = "0.1.27" @@ -5286,12 +5294,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "sdd" -version = "3.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" - [[package]] name = "sec1" version = "0.7.3" @@ -5529,32 +5531,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "serial_test" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0b343e184fc3b7bb44dff0705fffcf4b3756ba6aff420dddd8b24ca145e555" -dependencies = [ - "futures-executor", - "futures-util", - "log", - "once_cell", - "parking_lot", - "scc", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f50427f258fb77356e4cd4aa0e87e2bd2c66dbcee41dc405282cae2bfc26c83" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "sha1" version = "0.10.6" @@ -6198,21 +6174,6 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" -[[package]] -name = "test-score" -version = "0.1.0" -dependencies = [ - "base64 0.22.1", - "env_logger", - "harmony", - "harmony_cli", - "harmony_macros", - "harmony_types", - "log", - "tokio", - "url", -] - [[package]] name = "thiserror" version = "1.0.69" diff --git a/harmony/Cargo.toml b/harmony/Cargo.toml index 9086e84..634cbe9 100644 --- a/harmony/Cargo.toml +++ b/harmony/Cargo.toml @@ -79,7 +79,6 @@ sqlx.workspace = true inquire.workspace = true brocade = { path = "../brocade" } option-ext = "0.2.0" -serial_test = "3.3.1" [dev-dependencies] pretty_assertions.workspace = true diff --git a/harmony/src/domain/topology/k8s_anywhere/k8s_anywhere.rs b/harmony/src/domain/topology/k8s_anywhere/k8s_anywhere.rs index 76971f0..4e0337b 100644 --- a/harmony/src/domain/topology/k8s_anywhere/k8s_anywhere.rs +++ b/harmony/src/domain/topology/k8s_anywhere/k8s_anywhere.rs @@ -1128,8 +1128,6 @@ impl Ingress for K8sAnywhereTopology { #[cfg(test)] mod tests { - use serial_test::serial; - use super::*; use std::sync::atomic::{AtomicUsize, Ordering}; @@ -1169,7 +1167,6 @@ mod tests { } #[test] - #[serial] fn test_remote_k8s_from_env_var_full() { let (config_var, profile_var) = setup_env_vars(Some("kubeconfig=/foo.kc,context=bar"), Some("testprof")); @@ -1186,7 +1183,6 @@ mod tests { } #[test] - #[serial] fn test_remote_k8s_from_env_var_only_kubeconfig() { let (config_var, profile_var) = setup_env_vars(Some("kubeconfig=/foo.kc"), None); @@ -1199,7 +1195,6 @@ mod tests { } #[test] - #[serial] fn test_remote_k8s_from_env_var_only_context() { run_in_isolated_env(|| { unsafe { @@ -1216,7 +1211,6 @@ mod tests { } #[test] - #[serial] fn test_remote_k8s_from_env_var_unknown_key_trim() { run_in_isolated_env(|| { unsafe { @@ -1236,7 +1230,6 @@ mod tests { } #[test] - #[serial] fn test_remote_k8s_from_env_var_empty_malformed() { run_in_isolated_env(|| { unsafe { @@ -1254,7 +1247,6 @@ mod tests { } #[test] - #[serial] fn test_remote_k8s_from_env_var_kubeconfig_fallback() { run_in_isolated_env(|| { unsafe { @@ -1271,7 +1263,6 @@ mod tests { } #[test] - #[serial] fn test_remote_k8s_from_env_var_kubeconfig_no_fallback_if_provided() { run_in_isolated_env(|| { unsafe { diff --git a/harmony/src/modules/brocade.rs b/harmony/src/modules/brocade.rs index de6b957..a52dd6e 100644 --- a/harmony/src/modules/brocade.rs +++ b/harmony/src/modules/brocade.rs @@ -69,13 +69,12 @@ impl Interpret for BrocadeEnableSnmpInterpret { let brocade = brocade::init( &switch_addresses, - 22, &config.username, &config.password, - Some(BrocadeOptions { + BrocadeOptions { dry_run: self.score.dry_run, ..Default::default() - }), + }, ) .await .expect("Brocade client failed to connect"); diff --git a/harmony/src/modules/okd/mod.rs b/harmony/src/modules/okd/mod.rs index 282fbe6..5d6d18d 100644 --- a/harmony/src/modules/okd/mod.rs +++ b/harmony/src/modules/okd/mod.rs @@ -13,8 +13,8 @@ pub mod dns; pub mod installation; pub mod ipxe; pub mod load_balancer; -pub mod route; pub mod okd_node; +pub mod route; pub mod templates; pub mod upgrade; pub use bootstrap_01_prepare::*;