[Pkg-puppet-devel] [facter] 34/61: (#16665) Remove references to netsh

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit c3199c7385b9dedbc62e6884ccf67d27f352e59e
Author: Josh Cooper <josh at puppetlabs.com>
Date:   Mon Jul 29 14:51:19 2013 -0700

    (#16665) Remove references to netsh
    
    We no longer use netsh to collect IP related facts on Windows. This
    commit removes references to it.
---
 lib/facter/util/ip/windows.rb                      |    7 ----
 ...indows_netsh_addresses_with_multiple_interfaces |   35 --------------------
 spec/unit/ipaddress6_spec.rb                       |    5 ---
 spec/unit/macaddress_spec.rb                       |    4 ---
 4 files changed, 51 deletions(-)

diff --git a/lib/facter/util/ip/windows.rb b/lib/facter/util/ip/windows.rb
index 1a5fc83..966b727 100644
--- a/lib/facter/util/ip/windows.rb
+++ b/lib/facter/util/ip/windows.rb
@@ -3,13 +3,6 @@
 require 'facter/util/wmi'
 
 class Facter::Util::IP::Windows
-  # The path to netsh.exe.
-  #
-  # @return [String]
-  #
-  # @api private
-  NETSH = "#{ENV['SYSTEMROOT']}/system32/netsh.exe"
-
   # The WMI query used to return ip information
   #
   # @return [String]
diff --git a/spec/fixtures/netsh/windows_netsh_addresses_with_multiple_interfaces b/spec/fixtures/netsh/windows_netsh_addresses_with_multiple_interfaces
deleted file mode 100644
index 6235f8e..0000000
--- a/spec/fixtures/netsh/windows_netsh_addresses_with_multiple_interfaces
+++ /dev/null
@@ -1,35 +0,0 @@
-Address ::1 Parameters
----------------------------------------------------------
-Interface Luid     : Loopback Pseudo-Interface 1
-Scope Id           : 0.0
-Valid Lifetime     : infinite
-Preferred Lifetime : infinite
-DAD State          : Preferred
-Address Type       : Other
-
-Address fe80::7128:aa90:8f2a:8375%9 Parameters
----------------------------------------------------------
-Interface Luid     : Local Area Connection
-Scope Id           : 0.9
-Valid Lifetime     : infinite
-Preferred Lifetime : infinite
-DAD State          : Preferred
-Address Type       : Other
-
-Address fe80::5efe:172.16.138.216%11 Parameters
----------------------------------------------------------
-Interface Luid     : isatap.localdomain
-Scope Id           : 0.11
-Valid Lifetime     : infinite
-Preferred Lifetime : infinite
-DAD State          : Deprecated
-Address Type       : Other
-
-Address 2001:0:4137:9e76:2087:77a:53ef:7527 Parameters
----------------------------------------------------------
-Interface Luid     : Teredo Tunneling Pseudo-Interface
-Scope Id           : 0.0
-Valid Lifetime     : infinite
-Preferred Lifetime : infinite
-DAD State          : Preferred
-Address Type       : Public
diff --git a/spec/unit/ipaddress6_spec.rb b/spec/unit/ipaddress6_spec.rb
index e46ef86..2735f3d 100755
--- a/spec/unit/ipaddress6_spec.rb
+++ b/spec/unit/ipaddress6_spec.rb
@@ -7,11 +7,6 @@ def ifconfig_fixture(filename)
   File.read(fixtures('ifconfig', filename))
 end
 
-def netsh_fixture(filename)
-  File.read(fixtures('netsh', filename))
-end
-
-
 describe "The IPv6 address fact" do
   include FacterSpec::ConfigHelper
 
diff --git a/spec/unit/macaddress_spec.rb b/spec/unit/macaddress_spec.rb
index 638ef2a..4550a93 100755
--- a/spec/unit/macaddress_spec.rb
+++ b/spec/unit/macaddress_spec.rb
@@ -8,10 +8,6 @@ def ifconfig_fixture(filename)
   File.read(fixtures('ifconfig', filename))
 end
 
-def netsh_fixture(filename)
-  File.read(fixtures('netsh', filename))
-end
-
 describe "macaddress fact" do
   include FacterSpec::ConfigHelper
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git