add broker interface env var name

Author: JBlaschke

src/NetworkInterfaceControllers.jl

@@ -8,20 +8,24 @@ export get_interface_data
 
 include("broker.jl")
 using .Broker
+export Broker
 export start_server, query
 
 include("nic_preferences.jl")
 using .NICPreferences
+export NICPreferences
 
 include("name_selector.jl")
 using .NameSelector
+export NameSelector
 
 # Load HwlocSelector module via and extension => avoid adding dependencies on
 # Hwloc and AbstractTrees unless needed
 get_hwloc_selector() = Base.get_extension(@__MODULE__, :HwlocSelector)
 
 include("hostlists.jl")
 using .Hostlists
+export Hostlists
 
 #------------------------------------------------------------------------------
 # Helper functions for Broker
@@ -117,7 +121,6 @@ function best_interface_broker(
     broker_addr = "localhost"
     for env_add in NICPreferences.BROKER_HOST_ENV
     end
-
 end
 
 function best_interfaces(data::Vector{Interface})

src/nic_preferences.jl

@@ -150,9 +150,9 @@ mutable struct InterfaceSettings
 end
 
 
-const _name_selector_mode_default = setting(:mode, USE_ALWAYS)
+const _name_selector_mode_default  = setting(:mode, USE_ALWAYS)
 const _preferred_interface_default = setting(:interface, ".*", MATCH_REGEX)
-const _name_selector_mode = @load_preference("name_selector_mode")
+const _name_selector_mode  = @load_preference("name_selector_mode")
 const _preferred_interface = @load_preference("preferred_interface")
 
 const INTERFACE_NAME_BLACKLIST = @load_preference("interface_name_blacklist")
@@ -161,22 +161,22 @@ const INTERFACE_NAME_WHITELIST = @load_preference("interface_name_whitelist")
 const _hwloc_selector_mode_default = setting(:mode, USE_DISABLED)
 const _hwloc_nic_pci_class_default = "Ethernet"
 const _hwloc_selector_mode = @load_preference("hwloc_selector_mode")
-const HWLOC_NIC_PCI_CLASS = @load_preference(
+const HWLOC_NIC_PCI_CLASS  = @load_preference(
     "hwloc_nic_pci_class", _hwloc_nic_pci_class_default
 )
 
-const _broker_mode_default = setting(:mode, USE_DISABLED)
+const _broker_mode_default      = setting(:mode, USE_DISABLED)
 const _broker_interface_default = setting(:interface, ".*", MATCH_REGEX, 3000)
-const _broker_mode = @load_preference("broker_mode")
+const _broker_mode      = @load_preference("broker_mode")
 const _broker_interface = @load_preference("broker_interface")
-const BORKER_HOST_ENV = @load_preference("broker_host_env", [])
+const BORKER_HOST_ENV   = @load_preference("broker_host_env", [])
 
-const NAME_SELECTOR = ModeSettings(@val_or_default(:_name_selector_mode))
+const NAME_SELECTOR  = ModeSettings(@val_or_default(:_name_selector_mode))
 const HWLOC_SELECTOR = ModeSettings(@val_or_default(:_hwloc_selector_mode))
-const BROKER = ModeSettings(@val_or_default(:_broker_mode))
+const BROKER         = ModeSettings(@val_or_default(:_broker_mode))
 
 const PREFERRED_INTERFACE = InterfaceSettings(@val_or_default(:_preferred_interface))
-const BROKER_INTERFACE = InterfaceSettings(@val_or_default(:_broker_interface))
+const BROKER_INTERFACE    = InterfaceSettings(@val_or_default(:_broker_interface))
 
 export NAME_SELECTOR, HWLOC_SELECTOR, BROKER
 export INTERFACE_NAME_BLACKLIST, INTERFACE_NAME_WHITELIST
@@ -191,15 +191,15 @@ end
 return in_list
 
 function configure!(;
-        name_selector_mode::Dict{String, Any}=_name_selector_mode_default,
-        preferred_interface::Dict{String, Any}=_preferred_interface_default,
-        interface_name_whitelist::Union{Vector{String}, Nothing}=nothing,
-        interface_name_blacklist::Union{Vector{String}, Nothing}=nothing,
-        hwloc_selector_mode::Dict{String, Any}=_hwloc_selector_mode_default,
-        hwloc_nic_pci_class::Union{String, Nothing}=_hwloc_nic_pci_class_default,
-        broker_mode::Dict{String, Any}=_broker_mode_default,
-        broker_interface::Dict{String, Any}=_broker_interface_default,
-        broker_host_env::Union{Vector{String}, Nothing}=nothing
+        name_selector_mode::Dict{String, Any} = _name_selector_mode_default,
+        preferred_interface::Dict{String, Any} = _preferred_interface_default,
+        interface_name_whitelist::Union{Vector{String}, Nothing} = nothing,
+        interface_name_blacklist::Union{Vector{String}, Nothing} = nothing,
+        hwloc_selector_mode::Dict{String, Any} = _hwloc_selector_mode_default,
+        hwloc_nic_pci_class::Union{String, Nothing} = _hwloc_nic_pci_class_default,
+        broker_mode::Dict{String, Any} = _broker_mode_default,
+        broker_interface::Dict{String, Any} = _broker_interface_default,
+        broker_host_env::Union{Vector{String}, Nothing} = nothing
     )
 
     @assert check_mode(name_selector_mode)
@@ -209,16 +209,17 @@ function configure!(;
     @assert check_interface(preferred_interface)
     @assert check_interface(broker_interface)
 
+    println(broker_host_env)
     @set_preferences!(
-        "name_selector_mode" => name_selector_mode,
-        "preferred_interface" => preferred_interface,
+        "name_selector_mode"       => name_selector_mode,
+        "preferred_interface"      => preferred_interface,
         "interface_name_whitelist" => interface_name_whitelist,
         "interface_name_blacklist" => interface_name_blacklist,
-        "hwloc_selector_mode" => hwloc_selector_mode,
-        "hwloc_nic_pci_class" => hwloc_nic_pci_class,
-        "broker_mode" => broker_mode,
-        "broker_interface" => broker_interface,
-        "broker_host_env" => broker_host_env
+        "hwloc_selector_mode"      => hwloc_selector_mode,
+        "hwloc_nic_pci_class"      => hwloc_nic_pci_class,
+        "broker_mode"              => broker_mode,
+        "broker_interface"         => broker_interface,
+        "broker_host_env"          => broker_host_env
     )
 end