facter 2.4.5 → 2.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. data/lib/facter/ipaddress.rb +14 -5
  2. data/lib/facter/ipaddress6.rb +2 -3
  3. data/lib/facter/macaddress.rb +8 -3
  4. data/lib/facter/netmask.rb +1 -9
  5. data/lib/facter/util/ip.rb +0 -17
  6. data/lib/facter/util/netmask.rb +6 -0
  7. data/lib/facter/version.rb +1 -1
  8. data/spec/fixtures/unit/netmask/{ifconfig_darwin_10_8_5.txt → darwin_10_8_5.txt} +0 -0
  9. data/spec/unit/ipaddress6_spec.rb +4 -16
  10. data/spec/unit/ipaddress_spec.rb +12 -12
  11. data/spec/unit/macaddress_spec.rb +1 -6
  12. data/spec/unit/netmask_spec.rb +4 -17
  13. metadata +4 -24
  14. data/spec/fixtures/ifconfig/net_route_all_with_multiple_interfaces +0 -2
  15. data/spec/fixtures/ifconfig/net_route_net_tools_1.60.txt +0 -3
  16. data/spec/fixtures/unit/ipaddress/net_route_multiple_127_addresses.txt +0 -3
  17. data/spec/fixtures/unit/ipaddress/net_route_net_tools_1.60.txt +0 -3
  18. data/spec/fixtures/unit/ipaddress/net_route_non_english_locale.txt +0 -3
  19. data/spec/fixtures/unit/ipaddress/net_route_ubuntu_1204.txt +0 -3
  20. data/spec/fixtures/unit/netmask/net_route_multiple_127_addresses.txt +0 -3
  21. data/spec/fixtures/unit/netmask/net_route_net_tools_1.60.txt +0 -3
  22. data/spec/fixtures/unit/netmask/net_route_non_english_locale.txt +0 -3
  23. data/spec/fixtures/unit/netmask/net_route_ubuntu_1204.txt +0 -3
data/lib/facter/ipaddress.rb CHANGED
@@ -3,9 +3,7 @@
3
3
  # Purpose: Return the main IP address for a host.
4
4
  #
5
5
  # Resolution:
6
- # On Linux and AIX, it examines the routing table and uses the IP address
7
- # of the default interface.
8
- # On other Unixes does an ifconfig, and returns the first non 127.0.0.0/8
6
+ # On the Unixes does an ifconfig, and returns the first non 127.0.0.0/8
9
7
  # subnetted IP it finds.
10
8
  # On Windows, it attempts to use the socket library and resolve the machine's
11
9
  # hostname via DNS.
@@ -29,8 +27,19 @@ require 'facter/util/ip'
29
27
  Facter.add(:ipaddress) do
30
28
  confine :kernel => :linux
31
29
  setcode do
32
- iface = Facter::Util::IP.linux_default_iface
33
- Facter.value("ipaddress_#{iface}")
30
+ ip = nil
31
+ output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
32
+ if output
33
+ regexp = /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
34
+ output.split("\n").each do |line|
35
+ match = regexp.match(line)
36
+ if match and not /^127\./.match(match[1])
37
+ ip = match[1]
38
+ break
39
+ end
40
+ end
41
+ end
42
+ ip
34
43
  end
35
44
  end
36
45
 
data/lib/facter/ipaddress6.rb CHANGED
@@ -37,12 +37,11 @@ def get_address_after_token(output, token, return_first=false)
37
37
  ip
38
38
  end
39
39
 
40
-
41
40
  Facter.add(:ipaddress6) do
42
41
  confine :kernel => :linux
43
42
  setcode do
44
- iface = Facter::Util::IP.linux_default_iface
45
- Facter.value("ipaddress6_#{iface}")
43
+ output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
44
+ get_address_after_token(output, 'inet6(?: addr:)?')
46
45
  end
47
46
  end
48
47
 
data/lib/facter/macaddress.rb CHANGED
@@ -12,10 +12,15 @@ require 'facter/util/macaddress'
12
12
  require 'facter/util/ip'
13
13
 
14
14
  Facter.add(:macaddress) do
15
- confine :kernel => :linux
15
+ confine :kernel => 'Linux'
16
16
  setcode do
17
- iface = Facter::Util::IP.linux_default_iface
18
- Facter.value("macaddress_#{iface}")
17
+ ether = []
18
+ output = Facter::Util::IP.exec_ifconfig(["-a","2>/dev/null"])
19
+
20
+ String(output).each_line do |s|
21
+ ether.push($1) if s =~ /(?:ether|HWaddr) ((\w{1,2}:){5,}\w{1,2})/
22
+ end
23
+ Facter::Util::Macaddress.standardize(ether[0])
19
24
  end
20
25
  end
21
26
 
data/lib/facter/netmask.rb CHANGED
@@ -16,16 +16,8 @@
16
16
  #
17
17
  require 'facter/util/netmask'
18
18
 
19
- Facter.add(:netmask) do
20
- confine :kernel => :linux
21
- setcode do
22
- iface = Facter::Util::IP.linux_default_iface
23
- Facter.value("netmask_#{iface}")
24
- end
25
- end
26
-
27
19
  Facter.add("netmask") do
28
- confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd", :dragonfly, :AIX ]
20
+ confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd", :dragonfly, :AIX ]
29
21
  setcode do
30
22
  Facter::NetMask.get_netmask
31
23
  end
data/lib/facter/util/ip.rb CHANGED
@@ -337,21 +337,4 @@ module Facter::Util::IP
337
337
  network = ip.mask(subnet.to_s).to_s
338
338
  end
339
339
  end
340
-
341
- def self.read_proc_net_route
342
- File.read("/proc/net/route")
343
- end
344
-
345
- def self.linux_default_iface
346
- routes = read_proc_net_route
347
- iface = nil
348
- routes.split("\n").each do |line|
349
- parts = line.split
350
- if parts[1] == "00000000"
351
- iface = alphafy(parts[0])
352
- break
353
- end
354
- end
355
- iface
356
- end
357
340
  end
data/lib/facter/util/netmask.rb CHANGED
@@ -5,6 +5,12 @@ module Facter::NetMask
5
5
 
6
6
  ops = nil
7
7
  case Facter.value(:kernel)
8
+ when 'Linux'
9
+ ops = {
10
+ :ifconfig_opts => ['2>/dev/null'],
11
+ :regex => %r{#{Facter.value(:ipaddress)}.*?(?:Mask:|netmask)\s*(#{ipregex})}x,
12
+ :munge => nil,
13
+ }
8
14
  when 'SunOS'
9
15
  ops = {
10
16
  :ifconfig_opts => ['-a'],
data/lib/facter/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Facter
2
2
  if not defined? FACTERVERSION then
3
- FACTERVERSION = '2.4.5'
3
+ FACTERVERSION = '2.4.6'
4
4
  end
5
5
 
6
6
  # Returns the running version of Facter.
data/spec/unit/ipaddress6_spec.rb CHANGED
@@ -26,11 +26,8 @@ describe "The IPv6 address fact" do
26
26
  it "should return ipaddress6 information for Linux" do
27
27
  Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
28
28
  Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
29
- Facter::Util::IP.stubs(:exec_ifconfig).
29
+ Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
30
30
  returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
31
- routes = ifconfig_fixture('net_route_all_with_multiple_interfaces')
32
- Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
33
- Facter.collection.internal_loader.load(:interfaces)
34
31
 
35
32
  Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:febe:2201"
36
33
  end
@@ -38,11 +35,8 @@ describe "The IPv6 address fact" do
38
35
  it "should return ipaddress6 information for Linux with recent net-tools" do
39
36
  Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
40
37
  Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
41
- Facter::Util::IP.stubs(:exec_ifconfig).
38
+ Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
42
39
  returns(ifconfig_fixture('ifconfig_net_tools_1.60.txt'))
43
- routes = ifconfig_fixture('net_route_net_tools_1.60.txt')
44
- Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
45
- Facter.collection.internal_loader.load(:interfaces)
46
40
 
47
41
  Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:febe:2201"
48
42
  end
@@ -50,11 +44,8 @@ describe "The IPv6 address fact" do
50
44
  it "should return ipaddress6 with fe80 in any other octet than the first for Linux" do
51
45
  Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
52
46
  Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
53
- Facter::Util::IP.stubs(:exec_ifconfig).
47
+ Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
54
48
  returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces_and_fe80'))
55
- routes = ifconfig_fixture('net_route_all_with_multiple_interfaces')
56
- Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
57
- Facter.collection.internal_loader.load(:interfaces)
58
49
 
59
50
  Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:fe80:2201"
60
51
  end
@@ -62,11 +53,8 @@ describe "The IPv6 address fact" do
62
53
  it "should not return ipaddress6 link-local address for Linux" do
63
54
  Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
64
55
  Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
65
- Facter::Util::IP.stubs(:exec_ifconfig).
56
+ Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
66
57
  returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces_and_no_public_ipv6'))
67
- routes = ifconfig_fixture('net_route_all_with_multiple_interfaces')
68
- Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
69
- Facter.collection.internal_loader.load(:interfaces)
70
58
 
71
59
  Facter.value(:ipaddress6).should be_false
72
60
  end
data/spec/unit/ipaddress_spec.rb CHANGED
@@ -4,6 +4,10 @@ require 'spec_helper'
4
4
  require 'facter/util/ip'
5
5
 
6
6
  describe "ipaddress fact" do
7
+ before do
8
+ Facter.collection.internal_loader.load(:ipaddress)
9
+ end
10
+
7
11
  context 'using `ifconfig`' do
8
12
  before :each do
9
13
  Facter.fact(:hostname).stubs(:value)
@@ -14,29 +18,25 @@ describe "ipaddress fact" do
14
18
  Facter.fact(:kernel).stubs(:value).returns("Linux")
15
19
  end
16
20
 
17
- after :each do
18
- Facter.collection.flush
19
- end
20
-
21
21
  def expect_ifconfig_parse(address, fixture)
22
- Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read("ifconfig_#{fixture}"))
23
- routes = my_fixture_read("net_route_#{fixture}")
24
- Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
25
- Facter.collection.internal_loader.load(:interfaces)
26
- Facter.collection.internal_loader.load(:ipaddress)
22
+ Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read(fixture))
27
23
  Facter.fact(:ipaddress).value.should == address
28
24
  end
29
25
 
30
26
  it "parses correctly on Ubuntu 12.04" do
31
- expect_ifconfig_parse "10.87.80.110", "ubuntu_1204.txt"
27
+ expect_ifconfig_parse "10.87.80.110", "ifconfig_ubuntu_1204.txt"
32
28
  end
33
29
 
34
30
  it "parses correctly on Fedora 17" do
35
- expect_ifconfig_parse "131.252.209.153", "net_tools_1.60.txt"
31
+ expect_ifconfig_parse "131.252.209.153", "ifconfig_net_tools_1.60.txt"
32
+ end
33
+
34
+ it "parses a real address over multiple loopback addresses" do
35
+ expect_ifconfig_parse "10.0.222.20", "ifconfig_multiple_127_addresses.txt"
36
36
  end
37
37
 
38
38
  it "parses nothing with a non-english locale" do
39
- expect_ifconfig_parse nil, "non_english_locale.txt"
39
+ expect_ifconfig_parse nil, "ifconfig_non_english_locale.txt"
40
40
  end
41
41
  end
42
42
  end
data/spec/unit/macaddress_spec.rb CHANGED
@@ -23,11 +23,8 @@ describe "macaddress fact" do
23
23
  end
24
24
 
25
25
  it "should return the macaddress of the first interface" do
26
- Facter::Util::IP.stubs(:exec_ifconfig).
26
+ Facter::Util::IP.stubs(:exec_ifconfig).with(["-a","2>/dev/null"]).
27
27
  returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
28
- routes = ifconfig_fixture("net_route_all_with_multiple_interfaces")
29
- Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
30
- Facter.collection.internal_loader.load(:interfaces)
31
28
 
32
29
  Facter.value(:macaddress).should == "00:12:3f:be:22:01"
33
30
  end
@@ -35,7 +32,6 @@ describe "macaddress fact" do
35
32
  it "should return nil when no macaddress can be found" do
36
33
  Facter::Util::IP.stubs(:exec_ifconfig).with(["-a","2>/dev/null"]).
37
34
  returns(ifconfig_fixture('linux_ifconfig_no_mac'))
38
- Facter::Util::IP.stubs(:read_proc_net_route).returns("")
39
35
 
40
36
  proc { Facter.value(:macaddress) }.should_not raise_error
41
37
  Facter.value(:macaddress).should be_nil
@@ -45,7 +41,6 @@ describe "macaddress fact" do
45
41
  it "should return nil when no interface has a real macaddress" do
46
42
  Facter::Util::IP.stubs(:exec_ifconfig).with(["-a","2>/dev/null"]).
47
43
  returns(ifconfig_fixture('linux_ifconfig_venet'))
48
- Facter::Util::IP.stubs(:read_proc_net_route).returns("")
49
44
 
50
45
  proc { Facter.value(:macaddress) }.should_not raise_error
51
46
  Facter.value(:macaddress).should be_nil
data/spec/unit/netmask_spec.rb CHANGED
@@ -6,21 +6,8 @@ require 'facter/util/ip'
6
6
 
7
7
  shared_examples_for "netmask from ifconfig output" do |platform, address, fixture|
8
8
  it "correctly on #{platform}" do
9
- Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read("ifconfig_#{fixture}"))
9
+ Facter::Util::IP.stubs(:exec_ifconfig).returns(my_fixture_read(fixture))
10
10
  Facter.collection.internal_loader.load(:netmask)
11
- begin
12
- routes = my_fixture_read("net_route_#{fixture}")
13
- Facter::Util::IP.stubs(:read_proc_net_route).returns(routes)
14
- rescue RuntimeError
15
- # We want to try to load proc/net/route fixtures, but skip if
16
- # they don't exist for non-linux platforms. Ideally we'd get an
17
- # IOError here, but the fixture machinery here is dumb and
18
- # converts this to a RuntimeError. Hopefully anything that would
19
- # error here would also cause the actual test to fail, so I'm
20
- # not going to worry too hard.
21
- end
22
- Facter.collection.internal_loader.load(:interfaces)
23
- Facter.collection.internal_loader.load(:ipaddress)
24
11
 
25
12
  Facter.fact(:netmask).value.should eq(address)
26
13
  end
@@ -34,10 +21,10 @@ describe "The netmask fact" do
34
21
 
35
22
  example_behavior_for "netmask from ifconfig output",
36
23
  "Archlinux (net-tools 1.60)", "255.255.255.0",
37
- "net_tools_1.60.txt"
24
+ "ifconfig_net_tools_1.60.txt"
38
25
  example_behavior_for "netmask from ifconfig output",
39
26
  "Ubuntu 12.04", "255.255.255.255",
40
- "ubuntu_1204.txt"
27
+ "ifconfig_ubuntu_1204.txt"
41
28
  end
42
29
 
43
30
  context "on AIX" do
@@ -47,7 +34,7 @@ describe "The netmask fact" do
47
34
 
48
35
  example_behavior_for "netmask from ifconfig output",
49
36
  "AIX 7", "255.255.255.0",
50
- "aix_7.txt"
37
+ "ifconfig_aix_7.txt"
51
38
 
52
39
  end
53
40
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: facter
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.5
4
+ version: 2.4.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-01-20 00:00:00.000000000 Z
12
+ date: 2016-01-26 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: You can prove anything with facts!
15
15
  email: info@puppetlabs.com
@@ -220,12 +220,8 @@ files:
220
220
  - spec/fixtures/processorcount/solaris-psrinfo
221
221
  - spec/fixtures/unit/netmask/ifconfig_ubuntu_1204.txt
222
222
  - spec/fixtures/unit/netmask/ifconfig_net_tools_1.60.txt
223
- - spec/fixtures/unit/netmask/net_route_ubuntu_1204.txt
224
- - spec/fixtures/unit/netmask/net_route_multiple_127_addresses.txt
225
223
  - spec/fixtures/unit/netmask/ifconfig_aix_7.txt
226
- - spec/fixtures/unit/netmask/net_route_non_english_locale.txt
227
- - spec/fixtures/unit/netmask/net_route_net_tools_1.60.txt
228
- - spec/fixtures/unit/netmask/ifconfig_darwin_10_8_5.txt
224
+ - spec/fixtures/unit/netmask/darwin_10_8_5.txt
229
225
  - spec/fixtures/unit/selinux/selinux_sestatus2
230
226
  - spec/fixtures/unit/selinux/selinux_sestatus
231
227
  - spec/fixtures/unit/filesystems/linux
@@ -303,12 +299,8 @@ files:
303
299
  - spec/fixtures/unit/ec2/rest/meta-data/root
304
300
  - spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt
305
301
  - spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt
306
- - spec/fixtures/unit/ipaddress/net_route_ubuntu_1204.txt
307
- - spec/fixtures/unit/ipaddress/net_route_multiple_127_addresses.txt
308
302
  - spec/fixtures/unit/ipaddress/ifconfig_non_english_locale.txt
309
- - spec/fixtures/unit/ipaddress/net_route_non_english_locale.txt
310
303
  - spec/fixtures/unit/ipaddress/ifconfig_multiple_127_addresses.txt
311
- - spec/fixtures/unit/ipaddress/net_route_net_tools_1.60.txt
312
304
  - spec/fixtures/unit/processors/os/darwin-system-profiler
313
305
  - spec/fixtures/unit/zfs_version/zfs_new
314
306
  - spec/fixtures/unit/zfs_version/solaris_11
@@ -353,7 +345,6 @@ files:
353
345
  - spec/fixtures/unit/zpool_version/freebsd_8.2
354
346
  - spec/fixtures/unit/zpool_version/solaris_10
355
347
  - spec/fixtures/ifconfig/open_solaris_b132
356
- - spec/fixtures/ifconfig/net_route_all_with_multiple_interfaces
357
348
  - spec/fixtures/ifconfig/ifconfig_ubuntu_1204.txt
358
349
  - spec/fixtures/ifconfig/freebsd_6_0
359
350
  - spec/fixtures/ifconfig/linux_ifconfig_venet
@@ -377,7 +368,6 @@ files:
377
368
  - spec/fixtures/ifconfig/darwin_10_3_0_en0
378
369
  - spec/fixtures/ifconfig/darwin_ifconfig_all_with_multiple_interfaces
379
370
  - spec/fixtures/ifconfig/open_solaris_10
380
- - spec/fixtures/ifconfig/net_route_net_tools_1.60.txt
381
371
  - spec/fixtures/ifconfig/darwin_10_6_6_dualstack_en1
382
372
  - spec/fixtures/ifconfig/darwin_10_6_6_dualstack
383
373
  - spec/fixtures/ifconfig/ubuntu_7_04_eth0
@@ -579,12 +569,8 @@ test_files:
579
569
  - spec/fixtures/processorcount/solaris-psrinfo
580
570
  - spec/fixtures/unit/netmask/ifconfig_ubuntu_1204.txt
581
571
  - spec/fixtures/unit/netmask/ifconfig_net_tools_1.60.txt
582
- - spec/fixtures/unit/netmask/net_route_ubuntu_1204.txt
583
- - spec/fixtures/unit/netmask/net_route_multiple_127_addresses.txt
584
572
  - spec/fixtures/unit/netmask/ifconfig_aix_7.txt
585
- - spec/fixtures/unit/netmask/net_route_non_english_locale.txt
586
- - spec/fixtures/unit/netmask/net_route_net_tools_1.60.txt
587
- - spec/fixtures/unit/netmask/ifconfig_darwin_10_8_5.txt
573
+ - spec/fixtures/unit/netmask/darwin_10_8_5.txt
588
574
  - spec/fixtures/unit/selinux/selinux_sestatus2
589
575
  - spec/fixtures/unit/selinux/selinux_sestatus
590
576
  - spec/fixtures/unit/filesystems/linux
@@ -662,12 +648,8 @@ test_files:
662
648
  - spec/fixtures/unit/ec2/rest/meta-data/root
663
649
  - spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt
664
650
  - spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt
665
- - spec/fixtures/unit/ipaddress/net_route_ubuntu_1204.txt
666
- - spec/fixtures/unit/ipaddress/net_route_multiple_127_addresses.txt
667
651
  - spec/fixtures/unit/ipaddress/ifconfig_non_english_locale.txt
668
- - spec/fixtures/unit/ipaddress/net_route_non_english_locale.txt
669
652
  - spec/fixtures/unit/ipaddress/ifconfig_multiple_127_addresses.txt
670
- - spec/fixtures/unit/ipaddress/net_route_net_tools_1.60.txt
671
653
  - spec/fixtures/unit/processors/os/darwin-system-profiler
672
654
  - spec/fixtures/unit/zfs_version/zfs_new
673
655
  - spec/fixtures/unit/zfs_version/solaris_11
@@ -712,7 +694,6 @@ test_files:
712
694
  - spec/fixtures/unit/zpool_version/freebsd_8.2
713
695
  - spec/fixtures/unit/zpool_version/solaris_10
714
696
  - spec/fixtures/ifconfig/open_solaris_b132
715
- - spec/fixtures/ifconfig/net_route_all_with_multiple_interfaces
716
697
  - spec/fixtures/ifconfig/ifconfig_ubuntu_1204.txt
717
698
  - spec/fixtures/ifconfig/freebsd_6_0
718
699
  - spec/fixtures/ifconfig/linux_ifconfig_venet
@@ -736,7 +717,6 @@ test_files:
736
717
  - spec/fixtures/ifconfig/darwin_10_3_0_en0
737
718
  - spec/fixtures/ifconfig/darwin_ifconfig_all_with_multiple_interfaces
738
719
  - spec/fixtures/ifconfig/open_solaris_10
739
- - spec/fixtures/ifconfig/net_route_net_tools_1.60.txt
740
720
  - spec/fixtures/ifconfig/darwin_10_6_6_dualstack_en1
741
721
  - spec/fixtures/ifconfig/darwin_10_6_6_dualstack
742
722
  - spec/fixtures/ifconfig/ubuntu_7_04_eth0
data/spec/fixtures/ifconfig/net_route_all_with_multiple_interfaces DELETED
@@ -1,2 +0,0 @@
1
- eth0 00000000 01D1FC83 0003 0 0 100 00000000 0 0 0
2
- eth0 01D1FC83 00000000 0001 0 0 100 00FFFFFF 0 0 0
data/spec/fixtures/ifconfig/net_route_net_tools_1.60.txt DELETED
@@ -1,3 +0,0 @@
1
- Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
2
- em1 00000000 99D1FC83 0003 0 0 100 00000000 0 0 0
3
- em1 99D1FC83 99D1FC83 0007 0 0 100 FFFFFFFF 0 0 0
data/spec/fixtures/unit/ipaddress/net_route_multiple_127_addresses.txt DELETED
@@ -1,3 +0,0 @@
1
- Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
2
- venet0:1 00000000 1400DE0A 0003 0 0 100 00000000 0 0 0
3
- venet0:1 1400DE0A 1400DE0A 0007 0 0 100 FFFFFFFF 0 0 0
data/spec/fixtures/unit/ipaddress/net_route_net_tools_1.60.txt DELETED
@@ -1,3 +0,0 @@
1
- Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
2
- em1 00000000 99D1FC83 0003 0 0 100 00000000 0 0 0
3
- em1 99D1FC83 99D1FC83 0007 0 0 100 FFFFFFFF 0 0 0
data/spec/fixtures/unit/ipaddress/net_route_non_english_locale.txt DELETED
@@ -1,3 +0,0 @@
1
- Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
2
- wlan0 00000000 5301A8C0 0003 0 0 100 00000000 0 0 0
3
- wlan0 5301A8C0 5301A8C0 0007 0 0 100 FFFFFFFF 0 0 0
data/spec/fixtures/unit/ipaddress/net_route_ubuntu_1204.txt DELETED
@@ -1,3 +0,0 @@
1
- Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
2
- eth0 00000000 6E50570A 0003 0 0 100 00000000 0 0 0
3
- eth0 6E50570A 6E50570A 0007 0 0 100 FFFFFFFF 0 0 0
data/spec/fixtures/unit/netmask/net_route_multiple_127_addresses.txt DELETED
@@ -1,3 +0,0 @@
1
- Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
2
- venet0:1 00000000 1400DE0A 0003 0 0 100 00000000 0 0 0
3
- venet0:1 1400DE0A 1400DE0A 0007 0 0 100 FFFFFFFF 0 0 0
data/spec/fixtures/unit/netmask/net_route_net_tools_1.60.txt DELETED
@@ -1,3 +0,0 @@
1
- Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
2
- em1 00000000 99D1FC83 0003 0 0 100 00000000 0 0 0
3
- em1 99D1FC83 99D1FC83 0007 0 0 100 FFFFFFFF 0 0 0
data/spec/fixtures/unit/netmask/net_route_non_english_locale.txt DELETED
@@ -1,3 +0,0 @@
1
- Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
2
- wlan0 00000000 5301A8C0 0003 0 0 100 00000000 0 0 0
3
- wlan0 5301A8C0 5301A8C0 0007 0 0 100 FFFFFFFF 0 0 0
data/spec/fixtures/unit/netmask/net_route_ubuntu_1204.txt DELETED
@@ -1,3 +0,0 @@
1
- Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
2
- eth0 00000000 6E50570A 0003 0 0 100 00000000 0 0 0
3
- eth0 6E50570A 6E50570A 0007 0 0 100 FFFFFFFF 0 0 0