brocade/src/lib.rs

@@ -144,7 +144,7 @@ pub async fn init(
     ip_addresses: &[IpAddr],
     username: &str,
     password: &str,
-    options: BrocadeOptions,
+    options: &BrocadeOptions,
 ) -> Result<Box<dyn BrocadeClient + Send + Sync>, Error> {
     let shell = BrocadeShell::init(ip_addresses, username, password, options).await?;
 

brocade/src/shell.rs

@@ -28,7 +28,7 @@ impl BrocadeShell {
         ip_addresses: &[IpAddr],
         username: &str,
         password: &str,
-        options: BrocadeOptions,
+        options: &BrocadeOptions,
     ) -> Result<Self, Error> {
         let ip = ip_addresses
             .first()

brocade/src/ssh.rs

@@ -70,7 +70,7 @@ pub async fn try_init_client(
     username: &str,
     password: &str,
     ip: &std::net::IpAddr,
-    base_options: BrocadeOptions,
+    base_options: &BrocadeOptions,
 ) -> Result<BrocadeOptions, Error> {
     let mut default = SshOptions::default();
     default.port = base_options.ssh.port;

examples/okd_installation/src/topology.rs

@@ -2,7 +2,10 @@ use brocade::BrocadeOptions;
 use cidr::Ipv4Cidr;
 use harmony::{
     hardware::{Location, SwitchGroup},
-    infra::{brocade::BrocadeSwitchClient, opnsense::OPNSenseManagementInterface},
+    infra::{
+        brocade::{BrocadeSwitchClient, BrocadeSwitchConfig},
+        opnsense::OPNSenseManagementInterface,
+    },
     inventory::Inventory,
     topology::{HAClusterTopology, LogicalHost, UnmanagedRouter},
 };
@@ -36,12 +39,11 @@ pub async fn get_topology() -> HAClusterTopology {
         dry_run: *harmony::config::DRY_RUN,
         ..Default::default()
     };
-    let switch_client = BrocadeSwitchClient::init(
+    let switch_client = BrocadeSwitchClient::init(BrocadeSwitchConfig {
-        &switches,
+        ips: switches,
-        &switch_auth.username,
+        auth: switch_auth,
-        &switch_auth.password,
+        options: brocade_options,
-        brocade_options,
+    })
-    )
     .await
     .expect("Failed to connect to switch");
 

examples/okd_pxe/src/topology.rs

@@ -31,12 +31,11 @@ pub async fn get_topology() -> HAClusterTopology {
         dry_run: *harmony::config::DRY_RUN,
         ..Default::default()
     };
-    let switch_client = BrocadeSwitchClient::init(
+    let switch_client = BrocadeSwitchClient::init(BrocadeSwitchConfig {
-        &switches,
+        ips: switches,
-        &switch_auth.username,
+        auth: switch_auth,
-        &switch_auth.password,
+        options: brocade_options,
-        brocade_options,
+    })
-    )
     .await
     .expect("Failed to connect to switch");
 

harmony/src/infra/brocade.rs

@@ -5,15 +5,18 @@ use harmony_types::{
     net::{IpAddress, MacAddress},
     switch::{PortDeclaration, PortLocation},
 };
+use log::info;
 use option_ext::OptionExt;
 
-use crate::topology::{PortConfig, SwitchClient, SwitchError};
+use crate::{
+    modules::brocade::BrocadeSwitchAuth,
+    topology::{PortConfig, SwitchClient, SwitchError},
+};
 
 #[derive(Debug, Clone)]
 pub struct BrocadeSwitchConfig {
     pub ips: Vec<IpAddress>,
-    pub username: String,
+    pub auth: BrocadeSwitchAuth,
-    pub password: String,
     pub options: BrocadeOptions,
 }
 
@@ -23,13 +26,11 @@ pub struct BrocadeSwitchClient {
 }
 
 impl BrocadeSwitchClient {
-    pub async fn init(
+    pub async fn init(config: BrocadeSwitchConfig) -> Result<Self, brocade::Error> {
-        ip_addresses: &[IpAddress],
+        let auth = &config.auth;
-        username: &str,
+        let options = &config.options;
-        password: &str,
+
-        options: BrocadeOptions,
+        let brocade = brocade::init(&config.ips, &auth.username, &auth.password, options).await?;
-    ) -> Result<Self, brocade::Error> {
-        let brocade = brocade::init(ip_addresses, username, password, options).await?;
         Ok(Self { brocade })
     }
 }
@@ -60,13 +61,18 @@ impl SwitchClient for BrocadeSwitchClient {
                         || link.remote_port.contains(&interface.port_location)
                 })
             })
-            .map(|interface| (interface.name.clone(), PortOperatingMode::Access))
+            .map(|interface| (interface.name.clone(), PortOperatingMode::Trunk))
             .collect();
 
         if interfaces.is_empty() {
             return Ok(());
         }
 
+        info!("About to configure interfaces {interfaces:?}");
+        inquire::Confirm::new("Do you wish to configures interfaces now?")
+            .prompt()
+            .map_err(|e| SwitchError::new(e.to_string()))?;
+
         self.brocade
             .configure_interfaces(&interfaces)
             .await

harmony/src/modules/brocade/brocade.rs

@@ -104,12 +104,7 @@ impl Topology for SwitchTopology {
 
 impl SwitchTopology {
     pub async fn new(config: BrocadeSwitchConfig) -> Self {
-        let client = BrocadeSwitchClient::init(
+        let client = BrocadeSwitchClient::init(config)
-            &config.ips,
-            &config.username,
-            &config.password,
-            config.options,
-        )
             .await
             .expect("Failed to connect to switch");
 

harmony/src/modules/brocade/brocade_snmp.rs

@@ -40,15 +40,15 @@ pub struct BrocadeEnableSnmpInterpret {
 
 #[derive(Secret, Clone, Debug, JsonSchema, Serialize, Deserialize)]
 pub struct BrocadeSwitchAuth {
-    username: String,
+    pub username: String,
-    password: String,
+    pub password: String,
 }
 
 #[derive(Secret, Clone, Debug, JsonSchema, Serialize, Deserialize)]
 pub struct BrocadeSnmpAuth {
-    username: String,
+    pub username: String,
-    auth_password: String,
+    pub auth_password: String,
-    des_password: String,
+    pub des_password: String,
 }
 
 #[async_trait]
@@ -72,7 +72,7 @@ impl<T: Topology> Interpret<T> for BrocadeEnableSnmpInterpret {
             &switch_addresses,
             &config.username,
             &config.password,
-            BrocadeOptions {
+            &BrocadeOptions {
                 dry_run: self.score.dry_run,
                 ..Default::default()
             },