testlab 0.5.0 → 0.5.1

data/lib/testlab/container/actions.rb

@@ -19,21 +19,6 @@ class TestLab
           build_lxc_config(self.lxc.config)
 
           self.lxc.create(*create_args)
-
-          # Ensure the container APT calls use apt-cacher-ng on the node
-          gateway_ip = self.primary_interface.network.ip
-          apt_conf_d_proxy_file = File.join(self.lxc.fs_root, "etc", "apt", "apt.conf.d", "02proxy")
-          self.node.ssh.exec(%(sudo mkdir -pv #{File.dirname(apt_conf_d_proxy_file)}))
-          self.node.ssh.exec(%(echo 'Acquire::http { Proxy "http://#{gateway_ip}:3142"; };' | sudo tee #{apt_conf_d_proxy_file}))
-
-          # Fix the APT sources since LXC mudges them when using apt-cacher-ng
-          apt_conf_sources_file = File.join(self.lxc.fs_root, "etc", "apt", "sources.list")
-          self.node.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}))
-
-          self.users.each do |u|
-            u.create
-          end
-
         end
 
         true
@@ -75,10 +60,6 @@ class TestLab
 
           (self.lxc.state != :running) and raise ContainerError, "The container failed to online!"
 
-          self.users.each do |u|
-            u.up
-          end
-
         end
 
         true

data/lib/testlab/container/lifecycle.rb

@@ -16,10 +16,18 @@ class TestLab
         self.create
         self.up
 
-        if (!@provisioner.nil? && @provisioner.respond_to?(:setup))
-          please_wait(:ui => @ui, :message => format_object_action(self, 'Setup', :green)) do
-            @provisioner.setup(self)
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Setup', :green)) do
+
+          self.users.each do |user|
+            user.setup
+          end
+
+          self.provisioners.each do |provisioner|
+            @ui.logger.info { ">>>>> PROVISIONER SETUP #{provisioner} <<<<<" }
+            p = provisioner.new(self.config, @ui)
+            p.respond_to?(:setup) and p.setup(self)
           end
+
         end
 
         true
@@ -35,10 +43,14 @@ class TestLab
       def teardown
         @ui.logger.debug { "Container Teardown: #{self.id} " }
 
-        if (!@provisioner.nil? && @provisioner.respond_to?(:teardown))
-          please_wait(:ui => @ui, :message => format_object_action(self, 'Teardown', :red)) do
-            @provisioner.teardown(self)
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Teardown', :red)) do
+
+          self.provisioners.each do |provisioner|
+            @ui.logger.info { ">>>>> PROVISIONER TEARDOWN #{provisioner} <<<<<" }
+            p = provisioner.new(self.config, @ui)
+            p.respond_to?(:teardown) and p.teardown(self)
           end
+
         end
 
         self.down

data/lib/testlab/container/status.rb

@@ -59,7 +59,7 @@ class TestLab
           :distro => self.distro,
           :release => self.release,
           :interfaces => interfaces,
-          :provisioner => self.provisioner,
+          :provisioner => self.provisioners.map(&:to_s).join(','),
           :node_id => self.node.id
         }
       end

data/lib/testlab/container/user.rb

@@ -15,9 +15,10 @@ class TestLab
         if self.users.count == 0
           case self.distro.downcase
           when 'ubuntu' then
-            TestLab::User.new "ubuntu" do
+            u = TestLab::User.new "ubuntu" do
               password 'ubuntu'
             end
+            u.container = self
           end
         elsif self.users.any?{ |u| u.primary == true }
           self.users.find{ |u| u.primary == true }

data/lib/testlab/container.rb

@@ -87,30 +87,29 @@ class TestLab
     include TestLab::Utility::Misc
 
     # Associations and Attributes
-    belongs_to  :node,        :class_name => 'TestLab::Node'
-    has_many    :interfaces,  :class_name => 'TestLab::Interface'
-    has_many    :users,       :class_name => 'TestLab::User'
+    belongs_to  :node,          :class_name => 'TestLab::Node'
+    has_many    :interfaces,    :class_name => 'TestLab::Interface'
+    has_many    :users,         :class_name => 'TestLab::User'
 
-    attribute   :provisioner
-    attribute   :config,      :default => Hash.new
+    attribute   :provisioners,  :default => Array.new
+    attribute   :config,        :default => Hash.new
 
     attribute   :domain
 
-    attribute   :distro,      :default => 'ubuntu'
-    attribute   :release,     :default => 'precise'
+    attribute   :distro,        :default => 'ubuntu'
+    attribute   :release,       :default => 'precise'
     attribute   :arch
 
     # Instructs ephemeral containers to persist; otherwise tmpfs will be used
     # as the backend store for ephemeral containers.
     # NOTE: tmpfs is very memory intensive and is disabled by default.
-    attribute   :persist,     :default => true
+    attribute   :persist,       :default => true
 
 
     def initialize(*args)
       super(*args)
 
       @ui          = TestLab.ui
-      @provisioner = self.provisioner.new(self.config, @ui) if !self.provisioner.nil?
     end
 
   end

data/lib/testlab/node/lifecycle.rb

@@ -30,6 +30,9 @@ class TestLab
       def setup
         @ui.logger.debug { "Node Setup: #{self.id} " }
 
+        self.create
+        self.up
+
         please_wait(:ui => @ui, :message => format_object_action(self, 'Setup', :green)) do
 
           node_setup
@@ -41,6 +44,14 @@ class TestLab
           if self.components.include?('bind')
             bind_setup
           end
+
+          self.containers.each do |container|
+            container.provisioners.each do |provisioner|
+              p = provisioner.new(container.config, @ui)
+              p.respond_to?(:node) and p.node(self)
+            end
+          end
+
         end
 
         call_collections([self.networks, self.containers], :setup)
@@ -62,6 +73,9 @@ class TestLab
           # NOOP
         end
 
+        self.down
+        self.destroy
+
         true
       end
 

data/lib/testlab/node/ssh.rb

@@ -6,7 +6,7 @@ class TestLab
       # SSH to the Node
       def ssh(options={})
         if (!defined?(@ssh) || @ssh.nil?)
-          @ssh ||= ZTK::SSH.new({:ui => @ui, :timeout => 1200, :silence => true}.merge(options))
+          @ssh ||= ZTK::SSH.new({:ui => @ui, :timeout => 1800, :silence => true}.merge(options))
           @ssh.config do |c|
             c.host_name = @provider.ip
             c.port      = @provider.port
@@ -22,7 +22,7 @@ class TestLab
         name = container.id
         @container_ssh ||= Hash.new
         if @container_ssh[name].nil?
-          @container_ssh[name] ||= ZTK::SSH.new({:ui => @ui, :timeout => 1200, :silence => true}.merge(options))
+          @container_ssh[name] ||= ZTK::SSH.new({:ui => @ui, :timeout => 1800, :silence => true}.merge(options))
           @container_ssh[name].config do |c|
             c.proxy_host_name = @provider.ip
             c.proxy_port      = @provider.port
@@ -33,7 +33,7 @@ class TestLab
 
             c.user            = (options[:user]   || container.primary_user.id)
             c.password        = (options[:passwd] || container.primary_user.password)
-            c.keys            = (options[:keys]   || container.primary_user.keys || @provider.identity)
+            c.keys            = (options[:keys]   || container.primary_user.identity || @provider.identity)
           end
         end
         @container_ssh[name]

data/lib/testlab/node/templates/node-setup.erb

@@ -2,21 +2,11 @@ set -x
 
 # Update APT and ensure our required packages are installed
 apt-get -y update
-apt-get -y install lxc bridge-utils debootstrap yum iptables ntpdate ntp apt-cacher-ng
-
-# Ensure APT Cache-NG is running
-service apt-cacher-ng restart || service apt-cacher-ng start
-cat <<EOF | tee /etc/apt/apt.conf.d/02proxy
-Acquire::http { Proxy "http://127.0.0.1:3142"; };
-EOF
+apt-get -y install lxc bridge-utils debootstrap yum iptables ntpdate ntp
 
 # Ensure the default lxc networking services are off
 service lxc-net stop
 
-# Ensure that we use APT Cacher-NG for building containers
-grep "^MIRROR" /etc/default/lxc || echo "MIRROR=\"http://127.0.0.1:3142/archive.ubuntu.com/ubuntu\"" | tee -a /etc/default/lxc
-service lxc restart || service lxc start
-
 # Ensure NTP services are enabled and running
 service ntp restart || service ntp start
 

data/lib/testlab/provisioner.rb

@@ -7,9 +7,10 @@ class TestLab
   #
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   class Provisioner
-    autoload :Shell,     'testlab/provisioners/shell'
-    autoload :OmniBus,   'testlab/provisioners/omnibus'
-    autoload :OmniTruck, 'testlab/provisioners/omnitruck'
+    autoload :Shell,       'testlab/provisioners/shell'
+    autoload :OmniBus,     'testlab/provisioners/omnibus'
+    autoload :OmniTruck,   'testlab/provisioners/omnitruck'
+    autoload :AptCacherNG, 'testlab/provisioners/apt_cacher_ng'
 
     class << self
 

data/lib/testlab/provisioners/apt_cacher_ng.rb

@@ -0,0 +1,74 @@
+class TestLab
+
+  class Provisioner
+
+    # AptCacherNG Provisioner Error Class
+    class AptCacherNGError < ProvisionerError; end
+
+    # AptCacherNG Provisioner Class
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    class AptCacherNG
+
+      def initialize(config={}, ui=nil)
+        @config = (config || Hash.new)
+        @ui     = (ui     || TestLab.ui)
+
+        @ui.logger.debug { "config(#{@config.inspect})" }
+      end
+
+      # AptCacherNG Provisioner Node Setup
+      #
+      # @param [TestLab::Node] node The node which we want to provision.
+      # @return [Boolean] True if successful.
+      def node(node)
+        @ui.logger.debug { "AptCacherNG Provisioner: Node #{node.id}" }
+
+        node.ssh.exec(%(sudo apt-get -y install apt-cacher-ng))
+        node.ssh.exec(%(sudo service apt-cacher-ng restart || sudo service apt-cacher-ng start))
+        node.ssh.exec(%(echo 'Acquire::HTTP { Proxy "http://127.0.0.1:3142"; };' | sudo tee /etc/apt/apt.conf.d/00proxy))
+        node.ssh.exec(%(sudo grep "^MIRROR" /etc/default/lxc || echo 'MIRROR="http://127.0.0.1:3142/archive.ubuntu.com/ubuntu"' | sudo tee -a /etc/default/lxc))
+        node.ssh.exec(%(sudo service lxc restart || sudo service lxc start))
+
+        true
+      end
+
+      # AptCacherNG Provisioner Container Setup
+      #
+      # @param [TestLab::Container] container The container which we want to
+      #   provision.
+      # @return [Boolean] True if successful.
+      def setup(container)
+        @ui.logger.debug { "AptCacherNG Provisioner: Container #{container.id}" }
+
+        # Ensure the container APT calls use apt-cacher-ng on the node
+        gateway_ip            = container.primary_interface.network.ip
+        apt_conf_d_proxy_file = File.join(container.lxc.fs_root, "etc", "apt", "apt.conf.d", "00proxy")
+
+        container.node.ssh.exec(%(sudo mkdir -pv #{File.dirname(apt_conf_d_proxy_file)}))
+
+        container.node.ssh.exec(%(echo 'Acquire::HTTP { Proxy "http://#{gateway_ip}:3142"; };' | sudo tee #{apt_conf_d_proxy_file}))
+        container.config[:apt_cacher_exclude_hosts].each do |host|
+          container.node.ssh.exec(%(echo 'Acquire::HTTP::Proxy::#{host} "DIRECT";' | sudo tee -a #{apt_conf_d_proxy_file}))
+        end
+
+        # Fix the APT sources since LXC mudges them when using apt-cacher-ng
+        apt_conf_sources_file = File.join(container.lxc.fs_root, "etc", "apt", "sources.list")
+        container.node.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}))
+      end
+
+      # AptCacherNG Provisioner Container Teardown
+      #
+      # This is a NO-OP currently.
+      #
+      # @return [Boolean] True if successful.
+      def teardown(container)
+        # NOOP
+
+        true
+      end
+
+    end
+
+  end
+end

data/lib/testlab/provisioners/shell.rb

@@ -25,8 +25,8 @@ class TestLab
       #   provision.
       # @return [Boolean] True if successful.
       def setup(container)
-        if !@config[:setup].nil?
-          container.bootstrap(@config[:setup])
+        if !@config[:script].nil?
+          container.bootstrap(@config[:script])
         end
 
         true

data/lib/testlab/user/{actions.rb → lifecycle.rb}

@@ -1,12 +1,12 @@
 class TestLab
   class User
 
-    module Actions
+    module Lifecycle
 
-      # Create the user
+      # Setup the user
       #
       # @return [Boolean] True if successful.
-      def create
+      def setup
         @ui.logger.debug { "User Create: #{self.id} " }
 
         node_home_dir = ((self.container.node.user == "root") ? %(/root) : %(/home/#{self.container.node.user}))
@@ -46,21 +46,14 @@ class TestLab
           self.container.node.ssh.exec(%(sudo chmod -v 644 #{destination}))
         end
 
-        true
-      end
-
-      # Up the user
-      #
-      # @return [Boolean] True if successful.
-      def up
-        @ui.logger.debug { "User Up: #{self.id}" }
-
         # ensure the container user home directory is owned by them
         home_dir = self.container.lxc.attach(%(-- /bin/bash -c 'grep #{self.id} /etc/passwd | cut -d ":" -f6')).strip
         self.container.lxc.attach(%(-- /bin/bash -c 'sudo chown -Rv $(id -u #{self.id}):$(id -g #{self.id}) #{home_dir}'))
 
         # ensure the sudo user group can do passwordless sudo
         self.container.lxc.attach(%(-- /bin/bash -c 'grep "sudo\tALL=\(ALL:ALL\) ALL" /etc/sudoers && sed -i "s/sudo\tALL=\(ALL:ALL\) ALL/sudo\tALL=\(ALL:ALL\) NOPASSWD: ALL/" /etc/sudoers'))
+
+        true
       end
 
     end

data/lib/testlab/user.rb

@@ -9,16 +9,18 @@ class TestLab
   class User < ZTK::DSL::Base
 
     # Sub-Modules
-    autoload :Actions,       'testlab/user/actions'
+    autoload :Lifecycle,     'testlab/user/lifecycle'
 
-    include TestLab::User::Actions
+    include TestLab::User::Lifecycle
 
     # Associations and Attributes
     belongs_to  :container,  :class_name => 'TestLab::Container'
 
     attribute   :user
     attribute   :password
-    attribute   :keys
+
+    attribute   :identity
+
     attribute   :uid
     attribute   :gid
 

data/lib/testlab/version.rb

@@ -1,6 +1,6 @@
 class TestLab
   unless const_defined?(:VERSION)
     # TestLab Gem Version
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/container_spec.rb

@@ -188,7 +188,7 @@ describe TestLab::Container do
         it "should create and online the container" do
           subject.stub(:create) { true }
           subject.stub(:up) { true }
-          subject.instance_variable_get(:@provisioner) and subject.instance_variable_get(:@provisioner).stub(:setup) { true }
+          subject.provisioners = Array.new
 
           subject.setup
         end
@@ -199,7 +199,7 @@ describe TestLab::Container do
           subject = TestLab::Container.first('server-shell')
           subject.stub(:create) { true }
           subject.stub(:up) { true }
-          subject.instance_variable_get(:@provisioner) and subject.instance_variable_get(:@provisioner).stub(:setup) { true }
+          subject.provisioners = Array.new
 
           subject.setup
         end
@@ -211,7 +211,7 @@ describe TestLab::Container do
         it "should create and online the container" do
           subject.stub(:down) { true }
           subject.stub(:destroy) { true }
-          subject.instance_variable_get(:@provisioner) and subject.instance_variable_get(:@provisioner).stub(:teardown) { true }
+          subject.provisioners = Array.new
 
           subject.teardown
         end
@@ -222,7 +222,7 @@ describe TestLab::Container do
           subject = TestLab::Container.first('server-shell')
           subject.stub(:down) { true }
           subject.stub(:destroy) { true }
-          subject.instance_variable_get(:@provisioner) and subject.instance_variable_get(:@provisioner).stub(:teardown) { true }
+          subject.provisioners = Array.new
 
           subject.teardown
         end

data/spec/provisioners/shell_spec.rb

@@ -30,7 +30,7 @@ describe TestLab::Provisioner::Shell do
   describe "class" do
 
     it "should be an instance of TestLab::Provisioner::Shell" do
-      subject.instance_variable_get(:@provisioner).should be_an_instance_of TestLab::Provisioner::Shell
+      subject.provisioners.first.new(subject.config, @ui).should be_an_instance_of TestLab::Provisioner::Shell
     end
 
   end
@@ -42,7 +42,7 @@ describe TestLab::Provisioner::Shell do
         it "should provision the container" do
           subject.node.ssh.stub(:file).and_yield(StringIO.new)
           subject.lxc.stub(:attach) { "" }
-          subject.instance_variable_get(:@provisioner).setup(subject)
+          subject.provisioners.first.new(subject.config, @ui).setup(subject)
         end
       end
 
@@ -50,14 +50,14 @@ describe TestLab::Provisioner::Shell do
         it "should raise an exception" do
           subject.node.ssh.stub(:file).and_yield(StringIO.new)
           subject.lxc.stub(:attach) { "No such file or directory" }
-          lambda{ subject.instance_variable_get(:@provisioner).setup(subject) }.should raise_error TestLab::ContainerError
+          lambda{ subject.provisioners.first.new(subject.config, @ui).setup(subject) }.should raise_error TestLab::ContainerError
         end
       end
     end
 
     describe "teardown" do
       it "should decomission the container" do
-        subject.instance_variable_get(:@provisioner).teardown(subject)
+        subject.provisioners.first.new(subject.config, @ui).teardown(subject)
       end
     end
 

data/spec/support/Labfile

@@ -31,7 +31,7 @@ node :localhost do
     }
   ]
 
-  network :testnet do
+  network 'testnet' do
     address '192.168.255.254/16'
     bridge  :br0
     route   true
@@ -44,14 +44,14 @@ node :localhost do
 
     interface do
       name       :eth0
-      network_id :testnet
+      network_id 'testnet'
       address    '192.168.0.254/16'
       primary    true
     end
 
     interface do
       name       :eth1
-      network_id :testnet
+      network_id 'testnet'
       address    '192.168.0.253/16'
     end
   end
@@ -63,7 +63,7 @@ node :localhost do
 
     interface do
       name       :eth0
-      network_id :testnet
+      network_id 'testnet'
       address    '192.168.0.200/16'
     end
   end
@@ -73,15 +73,15 @@ node :localhost do
     distro        "ubuntu"
     release       "precise"
 
-    provisioner   TestLab::Provisioner::Shell
+    provisioners  [TestLab::Provisioner::Shell]
     config        Hash[
       :shell => "/bin/bash",
-      :setup => shell_provision_script
+      :script => shell_provision_script
     ]
 
     interface do
       name       :eth0
-      network_id :testnet
+      network_id 'testnet'
       address    '192.168.0.200/16'
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -248,13 +248,14 @@ files:
 - lib/testlab/providers/templates/vagrant/Vagrantfile.erb
 - lib/testlab/providers/vagrant.rb
 - lib/testlab/provisioner.rb
+- lib/testlab/provisioners/apt_cacher_ng.rb
 - lib/testlab/provisioners/omnibus.rb
 - lib/testlab/provisioners/omnitruck.rb
 - lib/testlab/provisioners/shell.rb
 - lib/testlab/provisioners/templates/chef/omnibus.erb
 - lib/testlab/provisioners/templates/chef/omnitruck.erb
 - lib/testlab/user.rb
-- lib/testlab/user/actions.rb
+- lib/testlab/user/lifecycle.rb
 - lib/testlab/utility.rb
 - lib/testlab/utility/cidr.rb
 - lib/testlab/utility/misc.rb
@@ -285,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -532232323948453701
+      hash: 4401719777665072340
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -294,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -532232323948453701
+      hash: 4401719777665072340
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25