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

4 files changed, 33 insertions, 42 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$