diff --git a/harmony-rs/Cargo.lock b/harmony-rs/Cargo.lock index dc80e38..5300a66 100644 --- a/harmony-rs/Cargo.lock +++ b/harmony-rs/Cargo.lock @@ -711,17 +711,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fqm" -version = "0.1.0" -dependencies = [ - "cidr", - "env_logger", - "harmony", - "log", - "tokio", -] - [[package]] name = "funty" version = "2.0.0" @@ -2800,8 +2789,10 @@ name = "wk" version = "0.1.0" dependencies = [ "cidr", + "env_logger", "harmony", "harmony_macros", + "log", "tokio", ] diff --git a/harmony-rs/harmony/src/domain/hardware/mod.rs b/harmony-rs/harmony/src/domain/hardware/mod.rs index 2b2c02a..54b03a5 100644 --- a/harmony-rs/harmony/src/domain/hardware/mod.rs +++ b/harmony-rs/harmony/src/domain/hardware/mod.rs @@ -41,10 +41,6 @@ impl ManagementInterface for ManualManagementInterface { todo!() } - fn get_mac_address(&self) -> MacAddress { - todo!() - } - fn get_supported_protocol_names(&self) -> String { todo!() } @@ -52,15 +48,13 @@ impl ManagementInterface for ManualManagementInterface { pub trait ManagementInterface: Send + Sync { fn boot_to_pxe(&self); - fn get_mac_address(&self) -> MacAddress; fn get_supported_protocol_names(&self) -> String; } impl std::fmt::Debug for dyn ManagementInterface { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.write_fmt(format_args!( - "ManagementInterface mac : {}, protocols : {}", - self.get_mac_address(), + "ManagementInterface protocols : {}", self.get_supported_protocol_names(), )) } diff --git a/harmony-rs/harmony/src/infra/hp_ilo/mod.rs b/harmony-rs/harmony/src/infra/hp_ilo/mod.rs index eb6fbd7..5bc73b8 100644 --- a/harmony-rs/harmony/src/infra/hp_ilo/mod.rs +++ b/harmony-rs/harmony/src/infra/hp_ilo/mod.rs @@ -11,10 +11,6 @@ impl ManagementInterface for HPIlo { todo!() } - fn get_mac_address(&self) -> MacAddress { - todo!() - } - fn get_supported_protocol_names(&self) -> String { todo!() } diff --git a/harmony-rs/harmony/src/infra/intel_amt/mod.rs b/harmony-rs/harmony/src/infra/intel_amt/mod.rs index cd80600..fc537f0 100644 --- a/harmony-rs/harmony/src/infra/intel_amt/mod.rs +++ b/harmony-rs/harmony/src/infra/intel_amt/mod.rs @@ -14,10 +14,6 @@ impl ManagementInterface for IntelAmtManagement { todo!() } - fn get_mac_address(&self) -> MacAddress { - self.mac_address.clone() - } - fn get_supported_protocol_names(&self) -> String { "IntelAMT".to_string() } diff --git a/harmony-rs/harmony/src/infra/opnsense/management.rs b/harmony-rs/harmony/src/infra/opnsense/management.rs index 81f062f..2c2ea70 100644 --- a/harmony-rs/harmony/src/infra/opnsense/management.rs +++ b/harmony-rs/harmony/src/infra/opnsense/management.rs @@ -10,10 +10,6 @@ impl ManagementInterface for OPNSenseManagementInterface { todo!() } - fn get_mac_address(&self) -> MacAddress { - todo!("OPNSense can have multiple mac addresses using SSH. I'm not sure it even belongs in the ManagementInterface trait") - } - fn get_supported_protocol_names(&self) -> String { "OPNSenseSSH".to_string() }