RSCBC-187: Add way to override alternate addresses network selection

Author: chvck

sdk/couchbase-core/src/agent.rs

@@ -536,7 +536,15 @@ impl Agent {
 
         state.latest_config = first_config.clone();
 
-        let network_type = NetworkTypeHeuristic::identify(&state.latest_config);
+        let network_type = if let Some(network) = opts.network {
+            if network == "auto" || network.is_empty() {
+                NetworkTypeHeuristic::identify(&state.latest_config)
+            } else {
+                network
+            }
+        } else {
+            NetworkTypeHeuristic::identify(&state.latest_config)
+        };
         state.network_type = network_type;
 
         let agent_component_configs = AgentInner::gen_agent_component_configs(&mut state);

sdk/couchbase-core/src/options/agent.rs

@@ -22,7 +22,6 @@ use crate::authenticator::Authenticator;
 use crate::memdx::dispatcher::OrphanResponseHandler;
 use crate::tls_config::TlsConfig;
 use std::fmt::Debug;
-use std::sync::Arc;
 use std::time::Duration;
 
 #[derive(Clone)]
@@ -34,6 +33,7 @@ pub struct AgentOptions {
     pub auth_mechanisms: Vec<AuthMechanism>,
     pub tls_config: Option<TlsConfig>,
     pub bucket_name: Option<String>,
+    pub network: Option<String>,
 
     pub compression_config: CompressionConfig,
     pub config_poller_config: ConfigPollerConfig,
@@ -50,6 +50,7 @@ impl Debug for AgentOptions {
             .field("auth_mechanisms", &self.auth_mechanisms)
             .field("tls_config", &self.tls_config)
             .field("bucket_name", &self.bucket_name)
+            .field("network", &self.network)
             .field("compression_config", &self.compression_config)
             .field("config_poller_config", &self.config_poller_config)
             .field("kv_config", &self.kv_config)
@@ -65,6 +66,7 @@ impl AgentOptions {
             tls_config: None,
             authenticator,
             bucket_name: None,
+            network: None,
             seed_config,
             compression_config: CompressionConfig::default(),
             config_poller_config: ConfigPollerConfig::default(),
@@ -96,6 +98,11 @@ impl AgentOptions {
         self
     }
 
+    pub fn network(mut self, network: impl Into<Option<String>>) -> Self {
+        self.network = network.into();
+        self
+    }
+
     pub fn compression_config(mut self, compression_config: CompressionConfig) -> Self {
         self.compression_config = compression_config;
         self

sdk/couchbase-core/src/options/ondemand_agentmanager.rs

@@ -23,7 +23,6 @@ use crate::options::agent::{
     AgentOptions, CompressionConfig, ConfigPollerConfig, HttpConfig, KvConfig, SeedConfig,
 };
 use crate::tls_config::TlsConfig;
-use std::sync::Arc;
 use std::time::Duration;
 
 #[derive(Clone)]
@@ -34,6 +33,7 @@ pub struct OnDemandAgentManagerOptions {
 
     pub auth_mechanisms: Vec<AuthMechanism>,
     pub tls_config: Option<TlsConfig>,
+    pub network: Option<String>,
 
     pub compression_config: CompressionConfig,
     pub config_poller_config: ConfigPollerConfig,
@@ -52,6 +52,7 @@ impl OnDemandAgentManagerOptions {
             compression_config: CompressionConfig::default(),
             config_poller_config: ConfigPollerConfig::default(),
             auth_mechanisms: vec![],
+            network: None,
             kv_config: KvConfig::default(),
             http_config: HttpConfig::default(),
             tcp_keep_alive_time: None,
@@ -89,6 +90,11 @@ impl OnDemandAgentManagerOptions {
         self
     }
 
+    pub fn network(mut self, network: impl Into<String>) -> Self {
+        self.network = Some(network.into());
+        self
+    }
+
     pub fn kv_config(mut self, kv_config: KvConfig) -> Self {
         self.kv_config = kv_config;
         self
@@ -119,6 +125,7 @@ impl From<OnDemandAgentManagerOptions> for AgentOptions {
             tls_config: opts.tls_config,
             authenticator: opts.authenticator,
             bucket_name: None,
+            network: opts.network,
             seed_config: opts.seed_config,
             compression_config: opts.compression_config,
             config_poller_config: opts.config_poller_config,
@@ -135,6 +142,7 @@ impl From<AgentOptions> for OnDemandAgentManagerOptions {
     fn from(opts: AgentOptions) -> Self {
         OnDemandAgentManagerOptions {
             authenticator: opts.authenticator,
+            network: opts.network,
             tls_config: opts.tls_config,
             seed_config: opts.seed_config,
             compression_config: opts.compression_config,

sdk/couchbase/src/clients/cluster_client.rs

@@ -401,7 +401,13 @@ impl CouchbaseClusterBackend {
                     opts.http_config.idle_connection_timeout =
                         Duration::from_millis(idle_http_connection_timeout);
                 }
-                "placeholder" => {}
+                "network" => {
+                    let network = v[0]
+                        .parse()
+                        .map_err(|e| error::Error::other_failure(format!("{e:?}")))?;
+
+                    opts.network = Some(network);
+                }
                 _ => (),
             }
         }