diff --git a/lib/ohai/plugins/solaris2/network.rb b/lib/ohai/plugins/solaris2/network.rb index 8bf56a6f0..c5ab9487e 100644 --- a/lib/ohai/plugins/solaris2/network.rb +++ b/lib/ohai/plugins/solaris2/network.rb @@ -58,7 +58,7 @@ dmfe e1000g efe elxl emlxs eri hermon hme hxge igb iprb ipw iwh iwi iwk iwp ixgb ixgbe mwl mxfe myri10ge nge ntxn nxge pcn platform qfe qlc ral rge rtls rtw rwd - rwn sfe tavor vr wpi xge yge} unless defined?(ETHERNET_ENCAPS) + rwn sfe tavor vr wpi xge yge } unless defined?(ETHERNET_ENCAPS) Ohai.plugin(:Network) do provides "network", "network/interfaces" @@ -79,6 +79,15 @@ def arpname_to_ifname(iface, arpname) nil end + def full_interface_name(iface, part_name, index) + iface.each do |name, attrs| + next unless attrs && attrs.respond_to?(:[]) + return name if /^#{part_name}($|:)/.match(name) && attrs[:index] == index + end + + nil + end + collect_data(:solaris2) do require "scanf" @@ -97,10 +106,10 @@ def arpname_to_ifname(iface, arpname) iface[cint] = Mash.new unless iface[cint] iface[cint][:mtu] = $2 iface[cint][:index] = $3 - if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|L3PROTECT|LOOPBACK|MIP|MULTI_BCAST|MULTICAST|NOARP|NOFAILOVER|NOLOCAL|NONUD|NORTEXCH|NOXMIT|OFFLINE|POINTOPOINT|PREFERRED|PRIVATE|ROUTER|RUNNING|STANDBY|TEMPORARY|UNNUMBERED|UP|VIRTUAL|XRESOLV|IPv4|IPv6|,)+)\>\s/ + if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|L3PROTECT|LOOPBACK|MIP|MULTI_BCAST|MULTICAST|NOARP|NOFAILOVER|NOLOCAL|NONUD|NORTEXCH|NOXMIT|OFFLINE|PHYSRUNNING|POINTOPOINT|PREFERRED|PRIVATE|ROUTER|RUNNING|STANDBY|TEMPORARY|UNNUMBERED|UP|VIRTUAL|XRESOLV|IPv4|IPv6|,)+)\>\s/ flags = $1.split(",") else - flags = Array.new + flags = [] end iface[cint][:flags] = flags.flatten if cint =~ /^(\w+)(\d+.*)/ @@ -156,16 +165,24 @@ def arpname_to_ifname(iface, arpname) network[:interfaces] = iface - so = shell_out("route -n get default") + so = shell_out("route -v -n get default") so.stdout.lines do |line| - matches = /interface: (\S+)/.match(line) + matches = /interface: (?\S+)\s+index\s+(?\d+)/.match(line) if matches - Ohai::Log.debug("found gateway device: #{$1}") - network[:default_interface] = matches[1] + network[:default_interface] = + case + when iface[matches[:name]] + matches[:name] + when int_name = full_interface_name(iface, matches[:name], matches[:index]) + int_name + else + matches[:name] + end + Ohai::Log.debug("found interface device: #{network[:default_interface]} #{matches[:name]}") end matches = /gateway: (\S+)/.match(line) if matches - Ohai::Log.debug("found gateway: #{$1}") + Ohai::Log.debug("found gateway: #{matches[1]}") network[:default_gateway] = matches[1] end end diff --git a/spec/unit/plugins/solaris2/network_spec.rb b/spec/unit/plugins/solaris2/network_spec.rb index 5283b068c..0f1484ef5 100644 --- a/spec/unit/plugins/solaris2/network_spec.rb +++ b/spec/unit/plugins/solaris2/network_spec.rb @@ -54,6 +54,9 @@ net0: flags=40201000843 mtu 1500 index 2 inet 37.153.96.148 netmask fffffe00 broadcast 37.153.97.255 ether 90:b8:d0:16:9b:97 +net1:1: flags=100001000843 mtu 1500 index 2 + inet 10.16.125.36 netmask fffffe00 broadcast 10.16.125.255 + ether 90:b8:d0:16:9b:97 ip.tun0: flags=2200851 mtu 1480 index 3 inet tunnel src 109.146.85.57 tunnel dst 109.146.85.212 tunnel security settings --> use 'ipsecconf -ln -i ip.tun1' @@ -103,7 +106,18 @@ destination: default mask: default gateway: 10.13.37.1 - interface: e1000g0 + interface: e1000g0 index 3 + flags: + recvpipe sendpipe ssthresh rtt,ms rttvar,ms hopcount mtu expire + 0 0 0 0 0 0 1500 0 +ROUTE_GET + + @solaris11_route_get = <<-ROUTE_GET + route to: default +destination: default + mask: default + gateway: 10.13.37.1 + interface: net1 index 2 flags: recvpipe sendpipe ssthresh rtt,ms rttvar,ms hopcount mtu expire 0 0 0 0 0 0 1500 0 @@ -117,13 +131,13 @@ allow(@plugin).to receive(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @solaris_route_get, "")) allow(@plugin).to receive(:shell_out).with("arp -an").and_return(mock_shell_out(0, @solaris_arp_rn, "")) - allow(@plugin).to receive(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @soalris_route_get, "")) + allow(@plugin).to receive(:shell_out).with("route -v -n get default").and_return(mock_shell_out(0, @solaris_route_get, "")) end describe "gathering IP layer address info" do before do @stdout = double("Pipe, stdout, cmd=`route get default`", :read => @solaris_route_get) - allow(@plugin).to receive(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @solaris_route_get, "")) + allow(@plugin).to receive(:shell_out).with("route -v -n get default").and_return(mock_shell_out(0, @solaris_route_get, "")) allow(@plugin).to receive(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @solaris_ifconfig, "")) @plugin.run end @@ -133,7 +147,7 @@ end it "detects the interfaces" do - expect(@plugin["network"]["interfaces"].keys.sort).to eq(["e1000g0:3", "e1000g2:1", "eri0", "ip.tun0", "ip.tun0:1", "lo0", "lo0:3", "net0", "qfe1"]) + expect(@plugin["network"]["interfaces"].keys.sort).to eq(["e1000g0:3", "e1000g2:1", "eri0", "ip.tun0", "ip.tun0:1", "lo0", "lo0:3", "net0", "net1:1", "qfe1"]) end it "detects the ip addresses of the interfaces" do @@ -149,12 +163,29 @@ end end + describe "gathering solaris 11 zone IP layer address info" do + before do + @stdout = double("Pipe, stdout, cmd=`route get default`", :read => @solaris11_route_get) + allow(@plugin).to receive(:shell_out).with("route -v -n get default").and_return(mock_shell_out(0, @solaris11_route_get, "")) + allow(@plugin).to receive(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @solaris_ifconfig, "")) + @plugin.run + end + + it "finds the flags for a PHYSRUNNING interface" do + expect(@plugin[:network][:interfaces]["net1:1"][:flags]).to eq(%w{ UP BROADCAST RUNNING MULTICAST IPv4 PHYSRUNNING }) + end + + it "finds the default interface for a solaris 11 zone" do + expect(@plugin[:network][:default_interface]).to eq("net1:1") + end + end + # TODO: specs for the arp -an stuff, check that it correctly adds the MAC addr to the right iface, etc. describe "setting the node's default IP address attribute" do before do @stdout = double("Pipe, stdout, cmd=`route get default`", :read => @solaris_route_get) - allow(@plugin).to receive(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @solaris_route_get, "")) + allow(@plugin).to receive(:shell_out).with("route -v -n get default").and_return(mock_shell_out(0, @solaris_route_get, "")) @plugin.run end