deprecate NetInfo providers and examples, remove all NetInfo references and tests.

7 files changed, 6 insertions, 155 deletions

diff --git a/test/ral/providers/host/netinfo.rb b/test/ral/providers/host/netinfo.rb
deleted file mode 100755
index 0329edcd9..000000000
--- a/test/ral/providers/host/netinfo.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Luke Kanies on 2006-11-12.
-#  Copyright (c) 2006. All rights reserved.
-
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
-
-require 'puppettest'
-
-if Puppet::Type.type(:host).provider(:netinfo).suitable?
-class TestNetinfoHostProvider < Test::Unit::TestCase
-    include PuppetTest
-
-    def setup
-        super
-        @host = Puppet::Type.type(:host)
-        @provider = @host.provider(:netinfo)
-    end
-
-    def test_list
-        list = nil
-        assert_nothing_raised do
-            list = @provider.instances
-        end
-        assert(list.length > 0)
-        list.each do |prov|
-            assert_instance_of(@provider, prov)
-            assert(prov.name, "objects do not have names")
-            assert(prov.ip, "Did not get value for device in %s" % prov.ip)
-        end
-
-        assert(list.detect { |provider| provider.name == "localhost"}, "Could not find localhost")
-    end
-
-    if Process.uid == 0
-    def test_simple
-        localhost = nil
-        assert_nothing_raised do
-            localhost = @host.create :name => "localhost", :check => [:ip], :provider => :netinfo
-        end
-
-        assert_nothing_raised do
-            localhost.retrieve
-        end
-
-        prov = localhost.provider
-
-        assert_nothing_raised do
-            assert(prov.ip, "Did not find value for ip")
-            assert(prov.ip != :absent, "Netinfo thinks the localhost is missing")
-        end
-    end
-end
-end
-end
-
diff --git a/test/ral/providers/mount/netinfo.rb b/test/ral/providers/mount/netinfo.rb
deleted file mode 100755
index 2474cbdf7..000000000
--- a/test/ral/providers/mount/netinfo.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Luke Kanies on 2006-11-12.
-#  Copyright (c) 2006. All rights reserved.
-
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
-
-require 'puppettest'
-#
-# if Puppet::Type.type(:mount).provider(:netinfo).suitable?
-# class TestNetinfoMountProvider < Test::Unit::TestCase
-#   include PuppetTest
-#
-#   def setup
-#       super
-#       @mount = Puppet::Type.type(:mount)
-#     end
-#
-#     if Process.uid == 0 and Facter.value(:hostname) == "midden"
-#     def test_mount_nfs
-#         culain = nil
-#         assert_nothing_raised do
-#             culain = @mount.create :name => "/mnt", :device => "culain:/home/luke", :options => "-o -P", :ensure => :present,
-#                 :fstype => "nfs"
-#         end
-#
-#         assert(culain, "Did not create fs")
-#
-#         assert_apply(culain)
-#
-#         assert_nothing_raised do
-#             culain.provider.mount
-#         end
-#
-#         assert(culain.provider.mounted?, "fs is not considered mounted")
-#         assert_nothing_raised() { culain.provider.unmount }
-#
-#         culain[:ensure] = :absent
-#
-#         assert_apply(culain)
-#     end
-#     end
-#
-#     def test_simple
-#         root = nil
-#         assert_nothing_raised do
-#             root = @mount.create :name => "/", :check => @mount.validproperties
-#         end
-#
-#         assert_nothing_raised do
-#             root.retrieve
-#         end
-#
-#         prov = root.provider
-#
-#         assert_nothing_raised do
-#             assert(prov.device, "Did not value for device")
-#             assert(prov.device != :absent, "Netinfo thinks the root device is missing")
-#         end
-#     end
-#
-#   def test_list
-#       list = nil
-#       assert_nothing_raised do
-#           list = @mount.list
-#         end
-#         assert(list.length > 0)
-#         list.each do |obj|
-#             assert_instance_of(@mount, obj)
-#             assert(obj[:name], "objects do not have names")
-#             p obj
-#             assert(obj.is(:device), "Did not get value for device in %s" % obj[:name])
-#         end
-#
-#         assert(list.detect { |m| m[:name] == "/"}, "Could not find root fs")
-#     end
-# end
-# end
-
diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb
index a5d8e9210..03e3ec892 100755
--- a/test/ral/providers/user.rb
+++ b/test/ral/providers/user.rb
@@ -52,7 +52,6 @@ class TestUserProvider < Test::Unit::TestCase
 
             prov = Puppet::Type.type(:user).defaultprovider
             output = prov.report(param)
-            # output = %x{nireport / /users name #{prov.netinfokey(param)}}
             output.each { |hash|
                 if hash[:name] == user.name
                     val = hash[param]
@@ -307,7 +306,7 @@ class TestUserProvider < Test::Unit::TestCase
             return
         end
 
-        # Stupid netinfo
+        # Stupid DirectoryServices
         if Facter.value(:operatingsystem) == "Darwin"
             assert_raise(ArgumentError, "gid allowed a non-integer value") do
                 user.gid = group.name
diff --git a/test/ral/type/host.rb b/test/ral/type/host.rb
index ef5472030..537adc717 100755
--- a/test/ral/type/host.rb
+++ b/test/ral/type/host.rb
@@ -15,7 +15,7 @@ class TestHost < Test::Unit::TestCase
 
         @provider = @hosttype.defaultprovider
 
-        # Make sure they aren't using something funky like netinfo
+        # Make sure they are using the parsed provider
         unless @provider.name == :parsed
             @hosttype.defaultprovider = @hosttype.provider(:parsed)
         end
@@ -63,14 +63,9 @@ class TestHost < Test::Unit::TestCase
         assert_equal(0, list.length, "Found hosts in empty file somehow")
     end
 
-    # Darwin will actually write to netinfo here.
-    if Facter.value(:operatingsystem) != "Darwin" or Process.uid == 0
+
     def test_simplehost
         host = nil
-        # We want to actually use the netinfo provider on darwin
-        if Facter.value(:operatingsystem) == "Darwin"
-            Puppet::Type.type(:host).defaultprovider = nil
-        end
 
         assert_nothing_raised {
             host = Puppet::Type.type(:host).new(
@@ -97,14 +92,7 @@ class TestHost < Test::Unit::TestCase
     end
 
     def test_moddinghost
-        # We want to actually use the netinfo provider on darwin
-        if Facter.value(:operatingsystem) == "Darwin"
-            Puppet::Type.type(:host).defaultprovider = nil
-        end
         host = mkhost()
-        if Facter.value(:operatingsystem) == "Darwin"
-            assert_equal(:netinfo, host[:provider], "Got incorrect provider")
-        end
         cleanup do
             host[:ensure] = :absent
             assert_apply(host)
@@ -195,7 +183,6 @@ class TestHost < Test::Unit::TestCase
         }
     end
 
-    end
     def test_aliasisproperty
         assert_equal(:property, @hosttype.attrtype(:alias))
     end
diff --git a/test/ral/type/mailalias.rb b/test/ral/type/mailalias.rb
index c9974dc1b..83428dcac 100755
--- a/test/ral/type/mailalias.rb
+++ b/test/ral/type/mailalias.rb
@@ -14,7 +14,7 @@ class TestMailAlias < Test::Unit::TestCase
 
         @provider = @type.defaultprovider
 
-        # Make sure they aren't using something funky like netinfo
+        # Make sure they are using the parsed provider
         unless @provider.name == :aliases
             @type.defaultprovider = @type.provider(:aliases)
         end
diff --git a/test/ral/type/port.rb b/test/ral/type/port.rb
index c751cd89f..ae5d89c2d 100755
--- a/test/ral/type/port.rb
+++ b/test/ral/type/port.rb
@@ -15,7 +15,7 @@ require 'puppettest'
 #
 #        @provider = @porttype.defaultprovider
 #
-#        # Make sure they aren't using something funky like netinfo
+#        # Make sure they are using the parsed provider
 #        unless @provider.name == :parsed
 #            @porttype.defaultprovider = @porttype.provider(:parsed)
 #        end
diff --git a/test/ral/type/sshkey.rb b/test/ral/type/sshkey.rb
index a3d7cb656..74dd812bb 100755
--- a/test/ral/type/sshkey.rb
+++ b/test/ral/type/sshkey.rb
@@ -14,7 +14,7 @@ class TestSSHKey < Test::Unit::TestCase
 
         @provider = @sshkeytype.defaultprovider
 
-        # Make sure they aren't using something funky like netinfo
+        # Make sure they are using the parsed provider
         unless @provider.name == :parsed
             @sshkeytype.defaultprovider = @sshkeytype.provider(:parsed)
         end