summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkgibbons <mark.gibbons@nordstrom.com>2016-02-18 12:55:13 -0800
committermarkgibbons <mark.gibbons@nordstrom.com>2016-03-08 11:22:36 -0800
commit30fe07895e4a3d5d96f74abf29e559329e8d09af (patch)
tree778df65218758edcb5641faa004a5007c4d66745
parentafa250015c1b8babfd6b820c32e9548e5517012a (diff)
downloadohai-30fe07895e4a3d5d96f74abf29e559329e8d09af.tar.gz
solaris11_network: Handle solaris 11 zone interfaces
PHYSRUNNING is now a valid flag for an interface. The Solaris 11 zones "route -n get default” command output returns the interface name, net0, but not the specific instance net0:2. The output changed from Solaris 10 to Solaris 11. Use the verbose output "route -v -n get default" to find the interface index and use the name and index to find the full interface name from the ifconfig -a output.
-rw-r--r--lib/ohai/plugins/solaris2/network.rb33
-rw-r--r--spec/unit/plugins/solaris2/network_spec.rb41
2 files changed, 61 insertions, 13 deletions
diff --git a/lib/ohai/plugins/solaris2/network.rb b/lib/ohai/plugins/solaris2/network.rb
index 8bf56a6f..c5ab9487 100644
--- a/lib/ohai/plugins/solaris2/network.rb
+++ b/lib/ohai/plugins/solaris2/network.rb
@@ -58,7 +58,7 @@ ETHERNET_ENCAPS = %w{ afe amd8111s arn atge ath bfe bge bnx bnxe ce cxgbe
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 @@ Ohai.plugin(:Network) do
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 @@ Ohai.plugin(:Network) do
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 @@ Ohai.plugin(:Network) do
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: (?<name>\S+)\s+index\s+(?<index>\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 5283b068..0f1484ef 100644
--- a/spec/unit/plugins/solaris2/network_spec.rb
+++ b/spec/unit/plugins/solaris2/network_spec.rb
@@ -54,6 +54,9 @@ e1000g2:1: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 ind
net0: flags=40201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS,L3PROTECT> 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<UP,BROADCAST,RUNNING,MULTICAST,IPv4,PHYSRUNNING> 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<UP,POINTOPOINT,RUNNING,MULTICAST,NONUD,IPv6> 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 @@ NETSTAT_RN
destination: default
mask: default
gateway: 10.13.37.1
- interface: e1000g0
+ interface: e1000g0 index 3
+ flags: <UP,GATEWAY,DONE,STATIC>
+ 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: <UP,GATEWAY,DONE,STATIC>
recvpipe sendpipe ssthresh rtt,ms rttvar,ms hopcount mtu expire
0 0 0 0 0 0 1500 0
@@ -117,13 +131,13 @@ ROUTE_GET
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 @@ ROUTE_GET
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 @@ ROUTE_GET
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