Moving all of the client and server code into a single network/ directory. In other words, more code structure cleanup.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2179 980ebf18-57e1-0310-9a29-db15c13687c0

34 files changed, 173 insertions, 196 deletions

diff --git a/test/client/client.rb b/test/client/client.rb
index f390c8d67..f9964f096 100755
--- a/test/client/client.rb
+++ b/test/client/client.rb
@@ -2,10 +2,8 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/client'
-require 'puppet/server'
 require 'puppettest'
+require 'puppet/network/client'
 
 class TestClient < Test::Unit::TestCase
     include PuppetTest::ServerTest
@@ -20,7 +18,7 @@ class TestClient < Test::Unit::TestCase
         # create our client
         client = nil
         assert_nothing_raised {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client::MasterClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -63,7 +61,7 @@ class TestClient < Test::Unit::TestCase
         # create a pair of clients with no certs
         nonemaster = nil
         assert_nothing_raised {
-            nonemaster = Puppet::Client::MasterClient.new(
+            nonemaster = Puppet::Network::Client::MasterClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -71,7 +69,7 @@ class TestClient < Test::Unit::TestCase
 
         nonebucket = nil
         assert_nothing_raised {
-            nonebucket = Puppet::Client::Dipper.new(
+            nonebucket = Puppet::Network::Client::Dipper.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -81,7 +79,7 @@ class TestClient < Test::Unit::TestCase
         # make a new ssldir for it
         ca = nil
         assert_nothing_raised {
-            ca = Puppet::Client::CA.new(
+            ca = Puppet::Network::Client::CA.new(
                 :CA => true, :Local => true
             )
             ca.requestcert
@@ -90,7 +88,7 @@ class TestClient < Test::Unit::TestCase
         # initialize our clients with this set of certs
         certmaster = nil
         assert_nothing_raised {
-            certmaster = Puppet::Client::MasterClient.new(
+            certmaster = Puppet::Network::Client::MasterClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -98,7 +96,7 @@ class TestClient < Test::Unit::TestCase
 
         certbucket = nil
         assert_nothing_raised {
-            certbucket = Puppet::Client::Dipper.new(
+            certbucket = Puppet::Network::Client::Dipper.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -124,11 +122,11 @@ class TestClient < Test::Unit::TestCase
             certmaster.getconfig
         }
 
-        assert_raise(Puppet::NetworkClientError,
+        assert_raise(Puppet::Network::NetworkClientError,
             "Client was allowed to call backup with no certs") {
             nonebucket.backup("/etc/passwd")
         }
-        assert_raise(Puppet::NetworkClientError,
+        assert_raise(Puppet::Network::NetworkClientError,
             "Client was allowed to call backup with untrusted certs") {
             certbucket.backup("/etc/passwd")
         }
@@ -143,14 +141,14 @@ class TestClient < Test::Unit::TestCase
 
         master = client = nil
         assert_nothing_raised() {
-            master = Puppet::Server::Master.new(
+            master = Puppet::Network::Server::Master.new(
                 :Manifest => manifest,
                 :UseNodes => false,
                 :Local => false
             )
         }
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client::MasterClient.new(
                 :Master => master
             )
         }
@@ -172,7 +170,7 @@ class TestClient < Test::Unit::TestCase
     def test_setpidfile
         FileUtils.mkdir_p(Puppet[:rundir])
         $clientrun = false
-        newclass = Class.new(Puppet::Client) do
+        newclass = Class.new(Puppet::Network::Client) do
             def run
                 $clientrun = true
             end
diff --git a/test/client/master.rb b/test/client/master.rb
index ccd808bbd..b03a3ffd0 100755
--- a/test/client/master.rb
+++ b/test/client/master.rb
@@ -2,9 +2,6 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/client'
-require 'puppet/server'
 require 'puppettest'
 
 class TestMasterClient < Test::Unit::TestCase
@@ -49,7 +46,7 @@ class TestMasterClient < Test::Unit::TestCase
         # create our master
         assert_nothing_raised() {
             # this is the default server setup
-            master = Puppet::Server::Master.new(
+            master = Puppet::Network::Server::Master.new(
                 :Manifest => file,
                 :UseNodes => false,
                 :Local => true
@@ -62,7 +59,7 @@ class TestMasterClient < Test::Unit::TestCase
         master ||= mkmaster()
         client = nil
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client::MasterClient.new(
                 :Master => master
             )
         }
@@ -71,8 +68,8 @@ class TestMasterClient < Test::Unit::TestCase
     end
     
     def mk_fake_client
-        server = Puppet::Server::Master.new :Code => ""
-        master = Puppet::Client::MasterClient.new :Server => server, :Local => true
+        server = Puppet::Network::Server::Master.new :Code => ""
+        master = Puppet::Network::Client::MasterClient.new :Server => server, :Local => true
 
         # Now create some objects
         objects = FakeComponent.new
@@ -211,7 +208,7 @@ class TestMasterClient < Test::Unit::TestCase
     def test_clientversionfact
         facts = nil
         assert_nothing_raised {
-            facts = Puppet::Client::MasterClient.facts
+            facts = Puppet::Network::Client::MasterClient.facts
         }
 
         assert_equal(Puppet.version.to_s, facts["clientversion"])
@@ -248,7 +245,7 @@ class TestMasterClient < Test::Unit::TestCase
         
         files = []
         assert_nothing_raised do
-            files = Puppet::Client::MasterClient.download(:dest => dest, :source => source, :name => "testing")
+            files = Puppet::Network::Client::MasterClient.download(:dest => dest, :source => source, :name => "testing")
         end
         
         assert(FileTest.directory?(dest), "dest dir was not created")
@@ -272,7 +269,7 @@ end
         end
 
         assert_nothing_raised {
-            Puppet::Client::MasterClient.getplugins
+            Puppet::Network::Client::MasterClient.getplugins
         }
 
         destfile = File.join(Puppet[:plugindest], "myplugin.rb")
@@ -300,7 +297,7 @@ end
         end
 
         assert_nothing_raised {
-            Puppet::Client::MasterClient.getplugins
+            Puppet::Network::Client::MasterClient.getplugins
         }
 
         destfile = File.join(Puppet[:pluginpath], "myplugin.rb")
@@ -320,7 +317,7 @@ end
 
         # Now try it again, to make sure we don't have any objects lying around
         assert_nothing_raised {
-            Puppet::Client::MasterClient.getplugins
+            Puppet::Network::Client::MasterClient.getplugins
         }
     end
 
@@ -338,7 +335,7 @@ end
         end
 
         assert_nothing_raised {
-            Puppet::Client::MasterClient.getfacts
+            Puppet::Network::Client::MasterClient.getfacts
         }
 
         destfile = File.join(Puppet[:factdest], "myfact.rb")
@@ -359,7 +356,7 @@ end
         end
 
         assert_nothing_raised {
-            Puppet::Client::MasterClient.getfacts
+            Puppet::Network::Client::MasterClient.getfacts
         }
 
         assert_equal("funtest", Facter.value(:myfact),
@@ -369,7 +366,7 @@ end
 
         # Now run it again and make sure the fact still loads
         assert_nothing_raised {
-            Puppet::Client::MasterClient.getfacts
+            Puppet::Network::Client::MasterClient.getfacts
         }
 
         assert_equal("funtest", Facter.value(:myfact),
@@ -403,7 +400,7 @@ end
         end
 
         assert_nothing_raised {
-            Puppet::Client::MasterClient.loadfacts
+            Puppet::Network::Client::MasterClient.loadfacts
         }
 
         names.each do |name|
@@ -432,7 +429,7 @@ end
 
 
         assert_nothing_raised {
-            Puppet::Client::MasterClient.download(:dest => dest, :source => dir,
+            Puppet::Network::Client::MasterClient.download(:dest => dest, :source => dir,
                 :name => "testing"
             ) {}
         }
@@ -449,7 +446,7 @@ end
     def test_facts
         facts = nil
         assert_nothing_raised do
-            facts = Puppet::Client::MasterClient.facts
+            facts = Puppet::Network::Client::MasterClient.facts
         end
         Facter.to_hash.each do |fact, value|
             assert_equal(facts[fact.downcase], value, "%s is not equal" % fact.inspect)
diff --git a/test/client/networkclient.rb b/test/client/networkclient.rb
index f4ef4c554..f7920169f 100755
--- a/test/client/networkclient.rb
+++ b/test/client/networkclient.rb
@@ -2,14 +2,12 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/client'
-require 'puppet/server'
 require 'puppettest'
+require 'puppet/network/client'
 
 class TestClient < Test::Unit::TestCase
     def test_set_backtrace
-        error = Puppet::NetworkClientError.new("An error")
+        error = Puppet::Network::NetworkClientError.new("An error")
         assert_nothing_raised do
             error.set_backtrace ["caller"]
         end
diff --git a/test/client/resource.rb b/test/client/resource.rb
index 51fe7ba7e..357a0afbe 100755
--- a/test/client/resource.rb
+++ b/test/client/resource.rb
@@ -2,12 +2,8 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/client/resource'
-require 'puppet/server'
 require 'puppettest'
-
-# $Id$
+require 'puppet/network/client/resource'
 
 class TestResourceClient < Test::Unit::TestCase
     include PuppetTest::ServerTest
@@ -24,7 +20,7 @@ class TestResourceClient < Test::Unit::TestCase
     def mkclient
         client = nil
         assert_nothing_raised {
-            client = Puppet::Client::Resource.new(:Server => "localhost",
+            client = Puppet::Network::Client::Resource.new(:Server => "localhost",
                 :Port => @@port)
         }
 
@@ -94,3 +90,5 @@ class TestResourceClient < Test::Unit::TestCase
         end
     end
 end
+
+# $Id$
diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index 1752848a8..80ac8c4e7 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppet/sslcertificates'
 require 'puppettest'
 
diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb
index 92633c01b..028950762 100755
--- a/test/executables/puppetca.rb
+++ b/test/executables/puppetca.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppet/sslcertificates'
 require 'puppettest'
 
@@ -16,7 +16,7 @@ class TestPuppetCA < Test::Unit::TestCase
     end
     
     def mkca
-        Puppet::Server::CA.new()
+        Puppet::Network::Server::CA.new()
     end
     
     def mkcert(hostname)
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb
index 9ae94b7c0..f8cb89ff6 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppettest'
 require 'socket'
 require 'facter'
@@ -15,7 +15,7 @@ class TestPuppetDExe < Test::Unit::TestCase
         file = startmasterd
 
         # create the client
-        client = Puppet::Client::MasterClient.new(:Server => "localhost", :Port => @@port)
+        client = Puppet::Network::Client::MasterClient.new(:Server => "localhost", :Port => @@port)
 
         # make a new fqdn
         fqdn = client.fqdn.sub(/^\w+\./, "testing.")
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb
index 6fc98137b..4563a0216 100755
--- a/test/executables/puppetmasterd.rb
+++ b/test/executables/puppetmasterd.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppet/daemon'
 require 'puppettest'
 require 'socket'
@@ -35,7 +35,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
 
         client = nil
         assert_nothing_raised() {
-            client = Puppet::Client::StatusClient.new(
+            client = Puppet::Network::Client::StatusClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -65,7 +65,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
 
         # this client shoulduse the same certs
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client::MasterClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb
index c70f92fe9..83a20ec30 100755
--- a/test/executables/puppetmodule.rb
+++ b/test/executables/puppetmodule.rb
@@ -3,7 +3,7 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 require 'puppet/sslcertificates'
 require 'puppettest'
 
diff --git a/test/language/ast.rb b/test/language/ast.rb
index c3af6739e..2fdba555c 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.rb
@@ -6,7 +6,7 @@ require 'puppet'
 require 'puppet/rails'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/resourcetesting'
 require 'puppettest/parsertesting'
diff --git a/test/language/functions.rb b/test/language/functions.rb
index edb7a3004..f565d0ded 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -5,7 +5,7 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/resourcetesting'
 
diff --git a/test/language/interpreter.rb b/test/language/interpreter.rb
index ab3b97210..b74b15734 100755
--- a/test/language/interpreter.rb
+++ b/test/language/interpreter.rb
@@ -7,7 +7,7 @@ require 'facter'
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppet/rails'
 require 'puppettest'
 require 'puppettest/resourcetesting'
diff --git a/test/language/scope.rb b/test/language/scope.rb
index 05c5e524e..80f838c59 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -5,7 +5,7 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/parsertesting'
 require 'puppettest/resourcetesting'
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index 2438083b0..cdea03d3b 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -5,8 +5,8 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
-require 'puppet/server'
+require 'puppet/network/client'
+require 'puppet/network/server'
 require 'puppettest'
 
 class TestSnippets < Test::Unit::TestCase
@@ -41,7 +41,7 @@ class TestSnippets < Test::Unit::TestCase
         args = {
             :Listen => false
         }
-        Puppet::Client.new(args)
+        Puppet::Network::Client.new(args)
     end
 
     def ast2scope(ast)
@@ -492,11 +492,11 @@ class TestSnippets < Test::Unit::TestCase
             testname = ("test_" + mname).intern
             self.send(:define_method, testname) {
                 # first parse the file
-                server = Puppet::Server::Master.new(
+                server = Puppet::Network::Server::Master.new(
                     :Manifest => snippet(file),
                     :Local => true
                 )
-                client = Puppet::Client::MasterClient.new(
+                client = Puppet::Network::Client::MasterClient.new(
                     :Master => server,
                     :Cache => false
                 )
@@ -506,7 +506,7 @@ class TestSnippets < Test::Unit::TestCase
                     client.getconfig()
                 }
 
-                client = Puppet::Client::MasterClient.new(
+                client = Puppet::Network::Client::MasterClient.new(
                     :Master => server,
                     :Cache => false
                 )
diff --git a/test/lib/puppettest/servertest.rb b/test/lib/puppettest/servertest.rb
index 532256d74..416a37f44 100644
--- a/test/lib/puppettest/servertest.rb
+++ b/test/lib/puppettest/servertest.rb
@@ -45,7 +45,7 @@ module PuppetTest::ServerTest
         # then create the actual server
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server.new(
+            server = Puppet::Network::Server.new(
                 :Port => @@port,
                 :Handlers => handlers
             )
diff --git a/test/other/puppet.rb b/test/other/puppet.rb
index 885083a2b..c71b20bbc 100755
--- a/test/other/puppet.rb
+++ b/test/other/puppet.rb
@@ -11,7 +11,7 @@ class TestPuppetModule < Test::Unit::TestCase
     include SignalObserver
     
     def mkfakeclient
-        Class.new(Puppet::Client) do
+        Class.new(Puppet::Network::Client) do
             def initialize
             end
 
diff --git a/test/other/report.rb b/test/other/report.rb
index 8bd896d9a..62bda813c 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -74,7 +74,7 @@ class TestReports < Test::Unit::TestCase
         }
 
         assert_nothing_raised do
-            report.extend(Puppet::Server::Report.report(:store))
+            report.extend(Puppet::Network::Server::Report.report(:store))
         end
 
         yaml = YAML.dump(report)
@@ -119,7 +119,7 @@ class TestReports < Test::Unit::TestCase
         report = trans.report
 
         assert_nothing_raised do
-            report.extend(Puppet::Server::Report.report(:rrdgraph))
+            report.extend(Puppet::Network::Server::Report.report(:rrdgraph))
         end
 
         assert_nothing_raised {
@@ -154,7 +154,7 @@ class TestReports < Test::Unit::TestCase
     
     def test_tagmail_parsing
         report = Object.new
-        report.extend(Puppet::Server::Report.report(:tagmail))
+        report.extend(Puppet::Network::Server::Report.report(:tagmail))
         
         passers = File.join(datadir, "reports", "tagmail_passers.conf")
         assert(FileTest.exists?(passers), "no passers file %s" % passers)
@@ -178,7 +178,7 @@ class TestReports < Test::Unit::TestCase
     
     def test_tagmail_parsing_results
         report = Object.new
-        report.extend(Puppet::Server::Report.report(:tagmail))
+        report.extend(Puppet::Network::Server::Report.report(:tagmail))
         # Now test a few specific lines to make sure we get the results we want
         {
             "tag: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag}, []],
@@ -206,7 +206,7 @@ class TestReports < Test::Unit::TestCase
         
         list = report.logs.collect { |l| l.to_report }
         
-        report.extend(Puppet::Server::Report.report(:tagmail))
+        report.extend(Puppet::Network::Server::Report.report(:tagmail))
         
         {
             [%w{abuse@domain.com}, %w{all}, []] => list,
diff --git a/test/rails/host.rb b/test/rails/host.rb
index 8958f7315..184d536d5 100755
--- a/test/rails/host.rb
+++ b/test/rails/host.rb
@@ -6,7 +6,7 @@ require 'puppet'
 require 'puppet/rails'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/parsertesting'
 require 'puppettest/resourcetesting'
diff --git a/test/rails/rails.rb b/test/rails/rails.rb
index 1342437bd..2803e07a8 100755
--- a/test/rails/rails.rb
+++ b/test/rails/rails.rb
@@ -6,7 +6,7 @@ require 'puppet'
 require 'puppet/rails'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'puppettest'
 require 'puppettest/parsertesting'
 require 'puppettest/resourcetesting'
diff --git a/test/ral/types/file.rb b/test/ral/types/file.rb
index b69d6cd3d..f616aac4c 100755
--- a/test/ral/types/file.rb
+++ b/test/ral/types/file.rb
@@ -1850,7 +1850,7 @@ class TestFile < Test::Unit::TestCase
         bpath = tempfile
         bucket = Puppet::Type.type(:filebucket).create :name => "rtest", :path => bpath
         dipper = bucket.bucket
-        dipper = Puppet::Server::FileBucket.new(
+        dipper = Puppet::Network::Server::FileBucket.new(
             :Path => bpath
         )
         assert(dipper, "did not receive bucket client")
diff --git a/test/ral/types/filebucket.rb b/test/ral/types/filebucket.rb
index 568a4b203..f32d7d7e1 100755
--- a/test/ral/types/filebucket.rb
+++ b/test/ral/types/filebucket.rb
@@ -70,7 +70,7 @@ class TestFileBucket < Test::Unit::TestCase
             bucket = Puppet.type(:filebucket).bucket(name)
         }
 
-        assert_instance_of(Puppet::Client::Dipper, bucket)
+        assert_instance_of(Puppet::Network::Client::Dipper, bucket)
 
         md5 = nil
         newpath = tempfile()
diff --git a/test/ral/types/filesources.rb b/test/ral/types/filesources.rb
index 1badfaa11..9c76e1c0d 100755
--- a/test/ral/types/filesources.rb
+++ b/test/ral/types/filesources.rb
@@ -119,7 +119,7 @@ class TestFileSources < Test::Unit::TestCase
         
         file[:links] = :manage
         # We can't manage links at this point
-        assert_raise(Puppet::FileServerError) do
+        assert_raise(Puppet::Network::Server::FileServerError) do
             property.describe(source)
         end
         
@@ -536,7 +536,7 @@ class TestFileSources < Test::Unit::TestCase
 
         serverpid = nil
         assert_nothing_raised() {
-            server = Puppet::Server.new(
+            server = Puppet::Network::Server.new(
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
                     :FileServer => {
@@ -575,7 +575,7 @@ class TestFileSources < Test::Unit::TestCase
 
         serverpid = nil
         assert_nothing_raised() {
-            server = Puppet::Server.new(
+            server = Puppet::Network::Server.new(
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
                 }
@@ -626,7 +626,7 @@ class TestFileSources < Test::Unit::TestCase
 
         serverpid = nil
         assert_nothing_raised("Could not start on port %s" % @port) {
-            server = Puppet::Server.new(
+            server = Puppet::Network::Server.new(
                 :Port => @port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -794,7 +794,7 @@ class TestFileSources < Test::Unit::TestCase
         assert(FileTest.file?(dest), "Destination is not a file")
 
         # Now copy the links
-        #assert_raise(Puppet::FileServerError) {
+        #assert_raise(Puppet::Network::Server::FileServerError) {
         trans = nil
         assert_nothing_raised {
             file[:links] = :manage
diff --git a/test/server/authconfig.rb b/test/server/authconfig.rb
index 3944369c1..cc7d6cdfd 100755
--- a/test/server/authconfig.rb
+++ b/test/server/authconfig.rb
@@ -2,10 +2,10 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/authconfig'
 require 'puppettest'
 
+require 'puppet/network/server/authconfig'
+
 class TestAuthConfig < Test::Unit::TestCase
 	include PuppetTest
 
@@ -31,7 +31,7 @@ class TestAuthConfig < Test::Unit::TestCase
 
         config = nil
         assert_nothing_raised {
-            config = Puppet::Server::AuthConfig.new(file)
+            config = Puppet::Network::AuthConfig.new(file)
         }
 
         assert_nothing_raised {
diff --git a/test/server/authstore.rb b/test/server/authstore.rb
index f591aa0c1..d9df9a441 100755
--- a/test/server/authstore.rb
+++ b/test/server/authstore.rb
@@ -2,16 +2,16 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/authstore'
 require 'puppettest'
 
+require 'puppet/network/server/authstore'
+
 class TestAuthStore < Test::Unit::TestCase
 	include PuppetTest
     def mkstore
         store = nil
         assert_nothing_raised {
-            store = Puppet::Server::AuthStore.new
+            store = Puppet::Network::AuthStore.new
         }
 
         return store
@@ -53,7 +53,7 @@ class TestAuthStore < Test::Unit::TestCase
             inval$id
         
         }.each { |pat|
-            assert_raise(Puppet::Server::AuthStoreError,
+            assert_raise(Puppet::AuthStoreError,
                 "name '%s' was allowed" % pat) {
                 store.allow(pat)
             }
@@ -81,14 +81,14 @@ class TestAuthStore < Test::Unit::TestCase
             assert(store.allowed?(name, "192.168.0.1"), "Host %s not allowed" % name)
         }
 
-        assert_raise(Puppet::Server::AuthStoreError) {
+        assert_raise(Puppet::AuthStoreError) {
             store.allow("domain.*.com")
         }
 
         assert(!store.allowed?("very.long.domain.name.com", "1.2.3.4"),
             "Long hostname allowed")
 
-        assert_raise(Puppet::Server::AuthStoreError) {
+        assert_raise(Puppet::AuthStoreError) {
             store.allow("domain.*.other.com")
         }
     end
@@ -107,11 +107,11 @@ class TestAuthStore < Test::Unit::TestCase
             assert(store.allowed?("hosttest.com", ip), "IP %s not allowed" % ip)
         }
 
-        #assert_raise(Puppet::Server::AuthStoreError) {
+        #assert_raise(Puppet::AuthStoreError) {
         #    store.allow("192.168.674.0")
         #}
 
-        assert_raise(Puppet::Server::AuthStoreError) {
+        assert_raise(Puppet::AuthStoreError) {
             store.allow("192.168.0")
         }
     end
diff --git a/test/server/bucket.rb b/test/server/bucket.rb
index c8c6411c9..938db748e 100755
--- a/test/server/bucket.rb
+++ b/test/server/bucket.rb
@@ -2,7 +2,6 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
 require 'puppettest'
 require 'base64'
 
@@ -149,7 +148,7 @@ class TestBucket < Test::Unit::TestCase
         files = filelist()
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::FileBucket.new(
+            server = Puppet::Network::Server::FileBucket.new(
                 :Bucket => @bucket
             )
         }
@@ -188,14 +187,14 @@ class TestBucket < Test::Unit::TestCase
         client = nil
         threads = []
         assert_nothing_raised {
-            bucket = Puppet::Server::FileBucket.new(
+            bucket = Puppet::Network::Server::FileBucket.new(
                 :Bucket => @bucket
             )
         }
 
         #sleep(30)
         assert_nothing_raised {
-            client = Puppet::Client::Dipper.new(
+            client = Puppet::Network::Client::Dipper.new(
                 :Bucket => bucket
             )
         }
@@ -219,7 +218,7 @@ class TestBucket < Test::Unit::TestCase
         pid = mkserver(:CA => {}, :FileBucket => { :Bucket => @bucket})
 
         assert_nothing_raised {
-            client = Puppet::Client::Dipper.new(
+            client = Puppet::Network::Client::Dipper.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -236,7 +235,7 @@ class TestBucket < Test::Unit::TestCase
     def test_no_path_duplicates
         bucket = nil
         assert_nothing_raised {
-            bucket = Puppet::Server::FileBucket.new(
+            bucket = Puppet::Network::Server::FileBucket.new(
                 :Bucket => @bucket
             )
         }
diff --git a/test/server/ca.rb b/test/server/ca.rb
index 81c73fe56..e9cc89cde 100755
--- a/test/server/ca.rb
+++ b/test/server/ca.rb
@@ -2,11 +2,8 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/ca'
+require 'puppet/network/server/ca'
 require 'puppet/sslcertificates'
-require 'openssl'
-require 'puppettest'
 
 # $Id$
 
@@ -25,7 +22,7 @@ class TestCA < Test::Unit::TestCase
 
         # create our ca
         assert_nothing_raised {
-            ca = Puppet::Server::CA.new(:autosign => true)
+            ca = Puppet::Network::Server::CA.new(:autosign => true)
         }
 
         # create a cert with a fake name
@@ -81,7 +78,7 @@ class TestCA < Test::Unit::TestCase
 
         # make our CA server
         assert_nothing_raised {
-            caserv = Puppet::Server::CA.new(:autosign => false)
+            caserv = Puppet::Network::Server::CA.new(:autosign => false)
         }
 
         # retrieve the actual ca object
@@ -159,7 +156,7 @@ class TestCA < Test::Unit::TestCase
 
         caserv = nil
         assert_nothing_raised {
-            caserv = Puppet::Server::CA.new(:autosign => autosign)
+            caserv = Puppet::Network::Server::CA.new(:autosign => autosign)
         }
 
         # make sure we know what's going on
@@ -173,7 +170,7 @@ class TestCA < Test::Unit::TestCase
     def test_nodefaultautosign
         caserv = nil
         assert_nothing_raised {
-            caserv = Puppet::Server::CA.new()
+            caserv = Puppet::Network::Server::CA.new()
         }
 
         # make sure we know what's going on
@@ -188,7 +185,7 @@ class TestCA < Test::Unit::TestCase
     def test_caautosign
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server.new(
+            server = Puppet::Network::Server.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -202,7 +199,7 @@ class TestCA < Test::Unit::TestCase
     def test_autosign_true_beats_file
         caserv = nil
         assert_nothing_raised {
-            caserv = Puppet::Server::CA.new()
+            caserv = Puppet::Network::Server::CA.new()
         }
 
         host = "hostname.domain.com"
diff --git a/test/server/fileserver.rb b/test/server/fileserver.rb
index 5e9c60ddc..25c72a5fb 100755
--- a/test/server/fileserver.rb
+++ b/test/server/fileserver.rb
@@ -2,9 +2,8 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/fileserver'
 require 'puppettest'
+require 'puppet/network/server/fileserver'
 
 class TestFileServer < Test::Unit::TestCase
 	include PuppetTest
@@ -19,7 +18,7 @@ class TestFileServer < Test::Unit::TestCase
         # Create a test file
         File.open(File.join(base, "file"), "w") { |f| f.puts "bazoo" }
         assert_nothing_raised {
-            mount = Puppet::Server::FileServer::Mount.new(name, base)
+            mount = Puppet::Network::Server::FileServer::Mount.new(name, base)
         }
 
         return mount
@@ -73,25 +72,25 @@ class TestFileServer < Test::Unit::TestCase
     def test_namefailures
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
         }
 
-        assert_raise(Puppet::FileServerError) {
+        assert_raise(Puppet::Network::Server::FileServerError) {
             server.mount("/tmp", "invalid+name")
         }
 
-        assert_raise(Puppet::FileServerError) {
+        assert_raise(Puppet::Network::Server::FileServerError) {
             server.mount("/tmp", "invalid-name")
         }
 
-        assert_raise(Puppet::FileServerError) {
+        assert_raise(Puppet::Network::Server::FileServerError) {
             server.mount("/tmp", "invalid name")
         }
 
-        assert_raise(Puppet::FileServerError) {
+        assert_raise(Puppet::Network::Server::FileServerError) {
             server.mount("/tmp", "")
         }
     end
@@ -102,11 +101,11 @@ class TestFileServer < Test::Unit::TestCase
         testdir, pattern, tmpfile = mktestdir()
 
         file = nil
-        checks = Puppet::Server::FileServer::CHECKPARAMS
+        checks = Puppet::Network::Server::FileServer::CHECKPARAMS
 
         # and make our fileserver
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
@@ -140,7 +139,7 @@ class TestFileServer < Test::Unit::TestCase
         file = nil
 
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
@@ -195,10 +194,10 @@ class TestFileServer < Test::Unit::TestCase
 
         # go through the whole schtick again...
         file = nil
-        checks = Puppet::Server::FileServer::CHECKPARAMS
+        checks = Puppet::Network::Server::FileServer::CHECKPARAMS
 
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
@@ -236,7 +235,7 @@ class TestFileServer < Test::Unit::TestCase
     def test_zmountroot
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
@@ -265,7 +264,7 @@ class TestFileServer < Test::Unit::TestCase
     def test_recursionlevels
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
@@ -316,7 +315,7 @@ class TestFileServer < Test::Unit::TestCase
     def test_listedpath
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
@@ -359,7 +358,7 @@ class TestFileServer < Test::Unit::TestCase
     def test_widelists
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
@@ -396,10 +395,10 @@ class TestFileServer < Test::Unit::TestCase
         files = mktestfiles(testdir)
 
         file = nil
-        checks = Puppet::Server::FileServer::CHECKPARAMS
+        checks = Puppet::Network::Server::FileServer::CHECKPARAMS
 
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
@@ -440,7 +439,7 @@ class TestFileServer < Test::Unit::TestCase
 
         # Now try to describe some sources that don't even exist
         retval = nil
-        assert_raise(Puppet::FileServerError,
+        assert_raise(Puppet::Network::Server::FileServerError,
             "Describing non-existent mount did not raise an error") {
             retval = server.describe("/notmounted/" + "noexisties")
         }
@@ -492,7 +491,7 @@ class TestFileServer < Test::Unit::TestCase
 
         # create a server with the file
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => false,
                 :Config => conffile
             )
@@ -552,7 +551,7 @@ class TestFileServer < Test::Unit::TestCase
 
                     case type
                     when :deny:
-                        assert_raise(Puppet::Server::AuthorizationError,
+                        assert_raise(Puppet::AuthorizationError,
                             "Host %s, ip %s, allowed %s" %
                             [host, ip, mount]) {
                                 list = server.list(mount, :ignore, true, false, host, ip)
@@ -605,13 +604,13 @@ class TestFileServer < Test::Unit::TestCase
             # create a server with the file
             server = nil
             assert_nothing_raised {
-                server = Puppet::Server::FileServer.new(
+                server = Puppet::Network::Server::FileServer.new(
                     :Local => true,
                     :Config => conffile
                 )
             }
 
-            assert_raise(Puppet::FileServerError,
+            assert_raise(Puppet::Network::Server::FileServerError,
                 "Invalid mount was mounted") {
                     server.list(mount, :ignore)
             }
@@ -625,9 +624,9 @@ class TestFileServer < Test::Unit::TestCase
 
             # create a server with the file
             server = nil
-            assert_raise(Puppet::FileServerError,
+            assert_raise(Puppet::Network::Server::FileServerError,
                 "Invalid config %s did not raise error" % i) {
-                server = Puppet::Server::FileServer.new(
+                server = Puppet::Network::Server::FileServer.new(
                     :Local => true,
                     :Config => conffile
                 )
@@ -657,7 +656,7 @@ class TestFileServer < Test::Unit::TestCase
 
         # start our server with a fast timeout
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => false,
                 :Config => conffile
             )
@@ -670,7 +669,7 @@ class TestFileServer < Test::Unit::TestCase
         }
         assert(list != "", "List returned nothing in rereard test")
 
-        assert_raise(Puppet::Server::AuthorizationError, "List allowed invalid host") {
+        assert_raise(Puppet::AuthorizationError, "List allowed invalid host") {
             list = server.list("/thing/", :ignore, false, false,
                 "test2.domain.com", "127.0.0.1")
         }
@@ -685,7 +684,7 @@ class TestFileServer < Test::Unit::TestCase
 "
         }
         
-        assert_raise(Puppet::Server::AuthorizationError, "List allowed invalid host") {
+        assert_raise(Puppet::AuthorizationError, "List allowed invalid host") {
             list = server.list("/thing/", :ignore, false, false,
                 "test1.domain.com", "127.0.0.1")
         }
@@ -706,7 +705,7 @@ class TestFileServer < Test::Unit::TestCase
         name = "yaytest"
         path = tmpdir()
         assert_nothing_raised {
-            mount = Puppet::Server::FileServer::Mount.new(name, path)
+            mount = Puppet::Network::Server::FileServer::Mount.new(name, path)
         }
 
         assert_equal("mount[#{name}]", mount.to_s)
@@ -721,7 +720,7 @@ class TestFileServer < Test::Unit::TestCase
         File.open(file, "w") { |f| f.puts "yay" }
         File.symlink(file, link)
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
@@ -735,7 +734,7 @@ class TestFileServer < Test::Unit::TestCase
         results = {}
         assert_nothing_raised {
             server.describe("/mount/link", :follow).split("\t").zip(
-                Puppet::Server::FileServer::CHECKPARAMS
+                Puppet::Network::Server::FileServer::CHECKPARAMS
             ).each { |v,p| results[p] = v }
         }
 
@@ -745,7 +744,7 @@ class TestFileServer < Test::Unit::TestCase
         results = {}
         assert_nothing_raised {
             server.describe("/mount/link", :ignore).split("\t").zip(
-                Puppet::Server::FileServer::CHECKPARAMS
+                Puppet::Network::Server::FileServer::CHECKPARAMS
             ).each { |v,p| results[p] = v }
         }
 
@@ -800,7 +799,7 @@ allow *
 
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => conffile
             )
@@ -918,7 +917,7 @@ allow *
 
         # This isn't a valid replacement pattern, so it should throw an error
         # because the dir doesn't exist
-        assert_raise(Puppet::FileServerError) {
+        assert_raise(Puppet::Network::Server::FileServerError) {
             mount.path = "/dir/a%"
         }
 
@@ -972,7 +971,7 @@ allow *
     def test_fileserver_expansion
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::FileServer.new(
+            server = Puppet::Network::Server::FileServer.new(
                 :Local => true,
                 :Config => false
             )
diff --git a/test/server/logger.rb b/test/server/logger.rb
index 60d5458ef..83e834365 100755
--- a/test/server/logger.rb
+++ b/test/server/logger.rb
@@ -2,7 +2,6 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
 require 'puppettest'
 require 'base64'
 require 'cgi'
@@ -20,7 +19,7 @@ class TestLogger < Test::Unit::TestCase
     def test_localaddlog
         logger = nil
         assert_nothing_raised {
-            logger = Puppet::Server::Logger.new
+            logger = Puppet::Network::Server::Logger.new
         }
 
         msg = nil
@@ -40,7 +39,7 @@ class TestLogger < Test::Unit::TestCase
     def test_remoteaddlog
         logger = nil
         assert_nothing_raised {
-            logger = Puppet::Server::Logger.new
+            logger = Puppet::Network::Server::Logger.new
         }
 
         msg = nil
@@ -63,7 +62,7 @@ class TestLogger < Test::Unit::TestCase
     def test_localclient
         client = nil
         assert_nothing_raised {
-            client = Puppet::Client::LogClient.new(:Logger => true)
+            client = Puppet::Network::Client::LogClient.new(:Logger => true)
         }
 
         msg = nil
@@ -98,7 +97,7 @@ class TestLogger < Test::Unit::TestCase
         logger = nil
         # Create our server
         assert_nothing_raised {
-            logger = Puppet::Server.new(
+            logger = Puppet::Network::Server.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -122,7 +121,7 @@ class TestLogger < Test::Unit::TestCase
         # Start a raw xmlrpc client
         client = nil
         assert_nothing_raised() {
-            client = Puppet::Client::LogClient.new(
+            client = Puppet::Network::Client::LogClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
diff --git a/test/server/master.rb b/test/server/master.rb
index 3a590ea3d..ba52908d3 100755
--- a/test/server/master.rb
+++ b/test/server/master.rb
@@ -2,10 +2,8 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server'
-require 'puppet/client'
 require 'puppettest'
+require 'puppet/network/server'
 
 class TestMaster < Test::Unit::TestCase
     include PuppetTest::ServerTest
@@ -26,7 +24,7 @@ class TestMaster < Test::Unit::TestCase
             # create our master
             assert_nothing_raised() {
                 # this is the default server setup
-                master = Puppet::Server::Master.new(
+                master = Puppet::Network::Server::Master.new(
                     :Manifest => file,
                     :UseNodes => false,
                     :Local => true
@@ -35,7 +33,7 @@ class TestMaster < Test::Unit::TestCase
 
             # and our client
             assert_nothing_raised() {
-                client = Puppet::Client::MasterClient.new(
+                client = Puppet::Network::Client::MasterClient.new(
                     :Master => master
                 )
             }
@@ -71,14 +69,14 @@ class TestMaster < Test::Unit::TestCase
             master = nil
             assert_nothing_raised() {
                 # this is the default server setup
-                master = Puppet::Server::Master.new(
+                master = Puppet::Network::Server::Master.new(
                     :Manifest => file,
                     :UseNodes => false,
                     :Local => true
                 )
             }
             assert_nothing_raised() {
-                client = Puppet::Client::MasterClient.new(
+                client = Puppet::Network::Client::MasterClient.new(
                     :Master => master
                 )
             }
@@ -105,14 +103,14 @@ class TestMaster < Test::Unit::TestCase
         client = master = nil
         assert_nothing_raised() {
             # this is the default server setup
-            master = Puppet::Server::Master.new(
+            master = Puppet::Network::Server::Master.new(
                 :Manifest => manifest,
                 :UseNodes => false,
                 :Local => true
             )
         }
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client::MasterClient.new(
                 :Master => master
             )
         }
@@ -172,7 +170,7 @@ class TestMaster < Test::Unit::TestCase
         # create our master
         assert_nothing_raised() {
             # this is the default server setup
-            master = Puppet::Server::Master.new(
+            master = Puppet::Network::Server::Master.new(
                 :Manifest => file,
                 :UseNodes => false,
                 :Local => true
@@ -211,7 +209,7 @@ class TestMaster < Test::Unit::TestCase
         # create our master
         assert_nothing_raised() {
             # this is the default server setup
-            master = Puppet::Server::Master.new(
+            master = Puppet::Network::Server::Master.new(
                 :Manifest => file,
                 :UseNodes => true,
                 :Local => true
@@ -261,7 +259,7 @@ class TestMaster < Test::Unit::TestCase
         # create our master
         assert_nothing_raised() {
             # this is the default server setup
-            master = Puppet::Server::Master.new(
+            master = Puppet::Network::Server::Master.new(
                 :Manifest => file,
                 :UseNodes => true,
                 :Local => true
@@ -306,7 +304,7 @@ class TestMaster < Test::Unit::TestCase
         Puppet[:storeconfigs] = true
 
         # this is the default server setup
-        master = Puppet::Server::Master.new(
+        master = Puppet::Network::Server::Master.new(
             :Code => "",
             :UseNodes => true,
             :Local => true
diff --git a/test/server/report.rb b/test/server/report.rb
index 7e563f9e6..bf652feaf 100755
--- a/test/server/report.rb
+++ b/test/server/report.rb
@@ -2,23 +2,21 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/report'
-require 'puppet/client/reporter'
 require 'puppettest'
+require 'puppet/network/server/report'
 require 'puppettest/reporttesting'
 
 class TestReportServer < Test::Unit::TestCase
 	include PuppetTest
 	include PuppetTest::Reporttesting
 
-    Report = Puppet::Server::Report
+    Report = Puppet::Network::Server::Report
 	Puppet::Util.logmethods(self)
 
     def mkserver
         server = nil
         assert_nothing_raised {
-            server = Puppet::Server::Report.new()
+            server = Puppet::Network::Server::Report.new()
         }
         server
     end
@@ -27,7 +25,7 @@ class TestReportServer < Test::Unit::TestCase
         server ||= mkserver()
         client = nil
         assert_nothing_raised {
-            client = Puppet::Client::Reporter.new(:Report => server)
+            client = Puppet::Network::Client::Reporter.new(:Report => server)
         }
 
         client
@@ -45,7 +43,7 @@ class TestReportServer < Test::Unit::TestCase
         $myreportrun = false
         file = File.join(libdir, "myreport.rb")
         File.open(file, "w") { |f| f.puts %{
-                Puppet::Server::Report.newreport(:myreport) do
+                Puppet::Network::Server::Report.newreport(:myreport) do
                     def process(report)
                         $myreportrun = true
                         return report
@@ -56,18 +54,18 @@ class TestReportServer < Test::Unit::TestCase
         Puppet[:reports] = "myreport"
 
         # Create a server
-        server = Puppet::Server::Report.new
+        server = Puppet::Network::Server::Report.new
 
         report = nil
         assert_nothing_raised {
-            report = Puppet::Server::Report.report(:myreport)
+            report = Puppet::Network::Server::Report.report(:myreport)
         }
         assert(report, "Did not get report")
 
     end
 
     def test_process
-        server = Puppet::Server::Report.new
+        server = Puppet::Network::Server::Report.new
 
         # We have to run multiple reports to make sure there's no conflict
         reports = []
@@ -104,7 +102,7 @@ class TestReportServer < Test::Unit::TestCase
 
     # Make sure reports can specify whether to use yaml or not
     def test_useyaml
-        server = Puppet::Server::Report.new
+        server = Puppet::Network::Server::Report.new
 
         Report.newreport(:yamlyes, :useyaml => true) do
             def process(report)
@@ -135,7 +133,7 @@ class TestReportServer < Test::Unit::TestCase
         Puppet[:reports] = "myreport"
 
         # Create a server
-        server = Puppet::Server::Report.new
+        server = Puppet::Network::Server::Report.new
 
         {"myreport" => ["myreport"],
             " fake, another, yay " => ["fake", "another", "yay"]
@@ -174,7 +172,7 @@ class TestReportServer < Test::Unit::TestCase
     def test_report_list
         list = nil
         assert_nothing_raised do
-            list = Puppet::Server::Report.reports
+            list = Puppet::Network::Server::Report.reports
         end
 
         [:rrdgraph, :store, :tagmail].each do |name|
diff --git a/test/server/resource.rb b/test/server/resource.rb
index 5a2f602ba..8e6581083 100755
--- a/test/server/resource.rb
+++ b/test/server/resource.rb
@@ -2,9 +2,8 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/resource'
 require 'puppettest'
+require 'puppet/network/server/resource'
 require 'base64'
 require 'cgi'
 
@@ -39,7 +38,7 @@ class TestResourceServer < Test::Unit::TestCase
         server = nil
 
         assert_nothing_raised do
-            server = Puppet::Server::Resource.new()
+            server = Puppet::Network::Server::Resource.new()
         end
 
         # The first run we create the file on the copy, the second run
@@ -119,7 +118,7 @@ class TestResourceServer < Test::Unit::TestCase
         server = nil
 
         assert_nothing_raised do
-            server = Puppet::Server::Resource.new()
+            server = Puppet::Network::Server::Resource.new()
         end
 
         [   [nil],
@@ -177,7 +176,7 @@ class TestResourceServer < Test::Unit::TestCase
         #Puppet.err Puppet::Type::ParsedType::Port.path
         server = nil
         assert_nothing_raised do
-            server = Puppet::Server::Resource.new()
+            server = Puppet::Network::Server::Resource.new()
         end
 
         require 'etc'
@@ -239,7 +238,7 @@ class TestResourceServer < Test::Unit::TestCase
     def test_apply
         server = nil
         assert_nothing_raised do
-            server = Puppet::Server::Resource.new()
+            server = Puppet::Network::Server::Resource.new()
         end
 
         file = tempfile()
diff --git a/test/server/rights.rb b/test/server/rights.rb
index cf0a3ed94..e5c65babe 100755
--- a/test/server/rights.rb
+++ b/test/server/rights.rb
@@ -2,9 +2,8 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/rights'
 require 'puppettest'
+require 'puppet/network/server/rights'
 
 class TestRights < Test::Unit::TestCase
 	include PuppetTest
@@ -12,7 +11,7 @@ class TestRights < Test::Unit::TestCase
     def test_rights
         store = nil
         assert_nothing_raised {
-            store = Puppet::Server::Rights.new
+            store = Puppet::Network::Rights.new
         }
 
         assert(store, "Did not create store")
diff --git a/test/server/runner.rb b/test/server/runner.rb
index e102250fe..9d4cf41be 100755
--- a/test/server/runner.rb
+++ b/test/server/runner.rb
@@ -2,8 +2,7 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/runner'
+require 'puppet/network/server/runner'
 require 'puppettest'
 
 class TestServerRunner < Test::Unit::TestCase
@@ -15,7 +14,7 @@ class TestServerRunner < Test::Unit::TestCase
         # create our master
         assert_nothing_raised() {
             # this is the default server setup
-            master = Puppet::Server::Master.new(
+            master = Puppet::Network::Server::Master.new(
                 :Manifest => file,
                 :UseNodes => false,
                 :Local => true
@@ -24,7 +23,7 @@ class TestServerRunner < Test::Unit::TestCase
 
         # and our client
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client::MasterClient.new(
                 :Master => master
             )
         }
@@ -52,7 +51,7 @@ class TestServerRunner < Test::Unit::TestCase
 
         runner = nil
         assert_nothing_raised {
-            runner = Puppet::Server::Runner.new
+            runner = Puppet::Network::Server::Runner.new
         }
         # First: tags
         # Second: ignore schedules true/false
diff --git a/test/server/server.rb b/test/server/server.rb
index 03fedb93f..4e79e00b7 100755
--- a/test/server/server.rb
+++ b/test/server/server.rb
@@ -2,11 +2,8 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server'
 require 'puppettest'
-
-# $Id$
+require 'puppet/network/server'
 
 if ARGV.length > 0 and ARGV[0] == "short"
     $short = true
@@ -44,7 +41,7 @@ class TestServer < Test::Unit::TestCase
         server = nil
         # make our server again
         assert_nothing_raised() {
-            server = Puppet::Server.new(
+            server = Puppet::Network::Server.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -70,7 +67,7 @@ class TestServer < Test::Unit::TestCase
 
         # and then start a masterclient
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client::MasterClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -92,7 +89,7 @@ class TestServer < Test::Unit::TestCase
         Puppet[:setpidfile] = false
         server = nil
         assert_nothing_raised() {
-            server = Puppet::Server.new(
+            server = Puppet::Network::Server.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -144,7 +141,7 @@ class TestServer < Test::Unit::TestCase
 
         client = mk_status_client
         # This time the client should be denied
-        assert_raise(Puppet::NetworkClientError) {
+        assert_raise(Puppet::Network::NetworkClientError) {
             client.status
         }
     end
@@ -156,7 +153,7 @@ class TestServer < Test::Unit::TestCase
         Puppet::Type::allclear
 
         assert_nothing_raised() {
-            client = Puppet::Client::StatusClient.new(
+            client = Puppet::Network::Client::StatusClient.new(
                 :Server => "localhost",
                 :Port => @@port
             )
@@ -167,7 +164,7 @@ class TestServer < Test::Unit::TestCase
     def mk_status_server
         server = nil
         assert_nothing_raised() {
-            server = Puppet::Server.new(
+            server = Puppet::Network::Server.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -196,3 +193,5 @@ class TestServer < Test::Unit::TestCase
         assert(count < 30, "Killing server #{pid} failed")
     end
 end
+
+# $Id$