testlab 0.5.4 → 0.6.0

data/bin/tl

@@ -149,6 +149,82 @@ command :node do |c|
     end
   end
 
+  # NODE UP
+  ##########
+  c.desc 'Up a node'
+  c.long_desc <<-EOF
+Up a node.  The node is started and brought online.
+EOF
+  c.command :up do |up|
+    up.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
+
+        node.up
+      end
+    end
+  end
+
+  # NODE DOWN
+  ############
+  c.desc 'Down a node'
+  c.long_desc <<-EOF
+Down a node.  The node is stopped taking it offline.
+EOF
+  c.command :down do |down|
+    down.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
+
+        node.down
+      end
+    end
+  end
+
+  # NODE SETUP
+  #############
+  c.desc 'Setup a node'
+  c.long_desc <<-EOF
+Setup a node.  The node is created, started and provisioned.
+EOF
+  c.command :setup do |setup|
+    setup.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
+
+        node.setup
+      end
+    end
+  end
+
+  # NODE TEARDOWN
+  ################
+  c.desc 'Teardown a node'
+  c.long_desc <<-EOF
+Teardown a node.  The node is offlined and destroyed.
+EOF
+  c.command :teardown do |teardown|
+    teardown.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
+
+        node.teardown
+      end
+    end
+  end
+
 end
 
 # NETWORKS
@@ -377,8 +453,10 @@ EOF
         if containers.count == 0
           @testlab.ui.stderr.puts("You either have no containers defined or dead nodes!".yellow)
         else
-          ZTK::Report.new(:ui => @testlab.ui).spreadsheet(containers, TestLab::Container::STATUS_KEYS.reject{|k| k == :fqdn}) do |container|
-            OpenStruct.new(container.status.reject{|k,v| k == :fqdn})
+          # ZTK::Report.new(:ui => @testlab.ui).spreadsheet(containers, TestLab::Container::STATUS_KEYS.reject{|k| k == :fqdn}) do |container|
+          ZTK::Report.new(:ui => @testlab.ui).list(containers, TestLab::Container::STATUS_KEYS) do |container|
+            # OpenStruct.new(container.status.reject{|k,v| k == :fqdn})
+            OpenStruct.new(container.status)
           end
         end
       else

data/lib/testlab/container/lifecycle.rb

@@ -23,7 +23,7 @@ class TestLab
           end
 
           self.provisioners.each do |provisioner|
-            @ui.logger.info { ">>>>> PROVISIONER SETUP #{provisioner} <<<<<" }
+            @ui.logger.info { ">>>>> SETUP CONTAINER PROVISIONER: #{provisioner} <<<<<" }
             p = provisioner.new(self.config, @ui)
             p.respond_to?(:setup) and p.setup(self)
           end
@@ -46,7 +46,7 @@ class TestLab
         please_wait(:ui => @ui, :message => format_object_action(self, 'Teardown', :red)) do
 
           self.provisioners.each do |provisioner|
-            @ui.logger.info { ">>>>> PROVISIONER TEARDOWN #{provisioner} <<<<<" }
+            @ui.logger.info { ">>>>> TEARDOWN CONTAINER PROVISIONER: #{provisioner} <<<<<" }
             p = provisioner.new(self.config, @ui)
             p.respond_to?(:teardown) and p.teardown(self)
           end

data/lib/testlab/container/status.rb

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

data/lib/testlab/container.rb

@@ -15,9 +15,9 @@ class TestLab
   #     release       "precise"
   #
   #     user "deployer" do
+  #       password "deployer"
   #       uid 2600
   #       gid 2600
-  #       password "deployer"
   #     end
   #
   #     interface do
@@ -34,9 +34,9 @@ class TestLab
   #     release       "precise"
   #
   #     user "deployer" do
+  #       password "deployer"
   #       uid 2600
   #       gid 2600
-  #       password "deployer"
   #     end
   #
   #     interface do
@@ -70,7 +70,7 @@ class TestLab
     # An array of symbols of the various keys in our status hash.
     #
     # @see TestLab::Container::Status
-    STATUS_KEYS   = %w(node_id id clone fqdn state distro release interfaces provisioner).map(&:to_sym)
+    STATUS_KEYS   = %w(node_id id clone fqdn state distro release interfaces provisioners).map(&:to_sym)
 
     # Sub-Modules
     autoload :Actions,       'testlab/container/actions'

data/lib/testlab/network/lifecycle.rb

@@ -9,16 +9,26 @@ class TestLab
 
         self.create
         self.up
-        self.route and manage_route(:add)
+
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Setup', :green)) do
+          self.route and manage_route(:add)
+        end
+
+        true
       end
 
       # Network Teardown
       def teardown
         @ui.logger.debug { "Network Teardown: #{self.id} " }
 
-        self.route and manage_route(:del)
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Teardown', :red)) do
+          self.route and manage_route(:del)
+        end
+
         self.down
         self.destroy
+
+        true
       end
 
       def manage_route(action)

data/lib/testlab/node/lifecycle.rb

@@ -3,23 +3,6 @@ class TestLab
 
     module Lifecycle
 
-      # Iterates an array of arrays calling the specified method on all the
-      # collections of objects
-      def call_collections(collections, method_name)
-        collections.each do |collection|
-          call_methods(collection, method_name)
-        end
-      end
-
-      # Calls the specified method on all the objects supplied
-      def call_methods(objects, method_name)
-        objects.each do |object|
-          if object.respond_to?(method_name)
-            object.send(method_name)
-          end
-        end
-      end
-
       # Bootstrap the node
       def node_setup
         node_setup_template = File.join(self.class.template_dir, 'node-setup.erb')
@@ -35,31 +18,16 @@ class TestLab
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Setup', :green)) do
 
-          node_setup
+          global_provisioners = [self.provisioners, self.containers.map(&:provisioners)].flatten.compact.uniq
 
-          if self.components.include?('resolv')
-            build_resolv_conf
-          end
-
-          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
+          global_provisioners.each do |provisioner|
+            @ui.logger.info { ">>>>> NODE PROVISIONER: #{provisioner} <<<<<" }
+            p = provisioner.new(self.config, @ui)
+            p.respond_to?(:node) and p.node(self)
           end
 
         end
 
-        call_collections([self.networks, self.containers], :setup)
-
-        if self.components.include?('bind')
-          bind_reload
-        end
-
         true
       end
 
@@ -67,8 +35,6 @@ class TestLab
       def teardown
         @ui.logger.debug { "Node Teardown: #{self.id} " }
 
-        call_collections([self.containers.reverse, self.networks.reverse], :teardown)
-
         please_wait(:ui => @ui, :message => format_object_action(self, 'Teardown', :red)) do
           # NOOP
         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 => 1800, :silence => true}.merge(options))
+          @ssh ||= ZTK::SSH.new({:ui => @ui, :timeout => 3600, :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 => 1800, :silence => true}.merge(options))
+          @container_ssh[name] ||= ZTK::SSH.new({:ui => @ui, :timeout => 3600, :silence => true}.merge(options))
           @container_ssh[name].config do |c|
             c.proxy_host_name = @provider.ip
             c.proxy_port      = @provider.port

data/lib/testlab/node.rb

@@ -11,21 +11,17 @@ class TestLab
 
     # Sub-Modules
     autoload :Actions,       'testlab/node/actions'
-    autoload :Bind,          'testlab/node/bind'
     autoload :ClassMethods,  'testlab/node/class_methods'
     autoload :Lifecycle,     'testlab/node/lifecycle'
     autoload :LXC,           'testlab/node/lxc'
     autoload :MethodMissing, 'testlab/node/method_missing'
-    autoload :Resolv,        'testlab/node/resolv'
     autoload :SSH,           'testlab/node/ssh'
     autoload :Status,        'testlab/node/status'
 
     include TestLab::Node::Actions
-    include TestLab::Node::Bind
     include TestLab::Node::Lifecycle
     include TestLab::Node::LXC
     include TestLab::Node::MethodMissing
-    include TestLab::Node::Resolv
     include TestLab::Node::SSH
     include TestLab::Node::Status
 
@@ -34,19 +30,21 @@ class TestLab
     include TestLab::Utility::Misc
 
     # Associations and Attributes
-    belongs_to :labfile,     :class_name => 'TestLab::Labfile'
+    belongs_to :labfile,       :class_name => 'TestLab::Labfile'
 
-    has_many   :containers,  :class_name => 'TestLab::Container'
-    has_many   :networks,    :class_name => 'TestLab::Network'
+    has_many   :containers,    :class_name => 'TestLab::Container'
+    has_many   :networks,      :class_name => 'TestLab::Network'
 
     attribute  :provider
-    attribute  :config,      :default => Hash.new
-    attribute  :components,  :default => Array.new
+    attribute  :provisioners,  :default => Array.new
+    attribute  :config,        :default => Hash.new
 
 
     def initialize(*args)
       super(*args)
 
+      raise NodeError, "You must specify a provider class!" if self.provider.nil?
+
       @ui       = TestLab.ui
       @provider = self.provider.new(self.config, @ui)
     end

data/lib/testlab/providers/local.rb

@@ -10,8 +10,80 @@ class TestLab
     # @author Zachary Patten <zachary AT jovelabs DOT com>
     class Local
 
-      def initialize(ui=ZTK::UI.new)
-        @ui = ui
+      def initialize(config={}, ui=nil)
+        @config = (config || Hash.new)
+        @ui     = (ui     || TestLab.ui)
+
+        # ensure our local key is there
+        @config[:local] ||= Hash.new
+      end
+
+      # This is a NO-OP
+      def create
+        true
+      end
+
+      # This is a NO-OP
+      def destroy
+        true
+      end
+
+      # This is a NO-OP
+      def up
+        self.state
+      end
+
+      # This is a NO-OP
+      def down
+        self.state
+      end
+
+      # This is a NO-OP
+      def reload
+        self.down
+        self.up
+
+        self.state
+      end
+
+      # This is a NO-OP
+      def state
+        :running
+      end
+
+      # This is a NO-OP
+      def exists?
+        true
+      end
+
+      # This is a NO-OP
+      def alive?
+        true
+      end
+
+      # This is a NO-OP
+      def dead?
+        false
+      end
+
+      def instance_id
+        %x(hostname).strip
+      end
+
+      def user
+        ENV['USER']
+      end
+
+      def identity
+        File.join(ENV['HOME'], ".ssh", "id_rsa")
+      end
+
+      def ip
+        "127.0.0.1"
+      end
+
+      def port
+        (@config[:local][:port] || 22)
       end
 
     end

data/lib/testlab/provisioner.rb

@@ -7,10 +7,14 @@ class TestLab
   #
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   class Provisioner
+    autoload :Apt,         'testlab/provisioners/apt'
     autoload :AptCacherNG, 'testlab/provisioners/apt_cacher_ng'
+    autoload :Bind,        'testlab/provisioners/bind'
     autoload :ChefGem,     'testlab/provisioners/chef_gem'
     autoload :OmniBus,     'testlab/provisioners/omnibus'
     autoload :OmniTruck,   'testlab/provisioners/omnitruck'
+    autoload :Resolv,      'testlab/provisioners/resolv'
+    autoload :Raring,      'testlab/provisioners/raring'
     autoload :Shell,       'testlab/provisioners/shell'
 
     class << self

data/lib/testlab/provisioners/apt.rb

@@ -0,0 +1,39 @@
+class TestLab
+
+  class Provisioner
+
+    # APT Provisioner Error Class
+    class AptError < ProvisionerError; end
+
+    # APT Provisioner Class
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    class Apt
+
+      def initialize(config={}, ui=nil)
+        @config = (config || Hash.new)
+        @ui     = (ui     || TestLab.ui)
+
+        @config[:apt] ||= Hash.new
+        @config[:apt][:install] ||= Array.new
+        @config[:apt][:remove]  ||= Array.new
+
+        @ui.logger.debug { "config(#{@config.inspect})" }
+      end
+
+      # APT 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 { "APT Provisioner: Container #{container.id}" }
+
+        bootstrap_template = File.join(TestLab::Provisioner.template_dir, "apt", "bootstrap.erb")
+        container.ssh.bootstrap(ZTK::Template.render(bootstrap_template, @config))
+      end
+
+    end
+
+  end
+end

data/lib/testlab/provisioners/apt_cacher_ng.rb

@@ -14,65 +14,63 @@ class TestLab
         @config = (config || Hash.new)
         @ui     = (ui     || TestLab.ui)
 
+        @config[:apt] ||= Hash.new
+        @config[:apt][:cacher_ng] ||= Hash.new
+        @config[:apt][:cacher_ng][:exclude_hosts] ||= Array.new
+
+        @apt_conf_d_proxy_file_template = File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "00proxy.erb")
+
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
-      # AptCacherNG Provisioner Node Setup
+      # APT-CacherNG 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}" }
-
-        script = <<-EOF
-apt-get -y install apt-cacher-ng
-service apt-cacher-ng restart || service apt-cacher-ng start
-echo 'Acquire::HTTP { Proxy "http://127.0.0.1:3142"; };' | tee /etc/apt/apt.conf.d/00proxy
-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
-        EOF
-
-        node.ssh.bootstrap(script)
+        @ui.logger.debug { "APT-CacherNG Provisioner: Node #{node.id}" }
+
+        bootstrap_template = File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "bootstrap.erb")
+        node.ssh.bootstrap(ZTK::Template.render(bootstrap_template, @config))
+
+        context = {
+          :apt => {
+            :cacher_ng => {
+              :proxy_url => "http://127.0.0.1:3142",
+              :exclude_hosts => Array.new
+            }
+          }
+        }
+
+        apt_conf_d_proxy_file = File.join("/etc", "apt", "apt.conf.d", "00proxy")
+        node.ssh.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
+          file.puts(ZTK::Template.render(@apt_conf_d_proxy_file_template, context))
+        end
 
         true
       end
 
-      # AptCacherNG Provisioner Container Setup
+      # APT-CacherNG 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}" }
+        @ui.logger.debug { "APT-CacherNG 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")
+        gateway_ip                     = container.primary_interface.network.ip
+        apt_conf_d_proxy_file          = File.join(container.lxc.fs_root, "etc", "apt", "apt.conf.d", "00proxy")
 
-        script = <<-EOF
-mkdir -pv #{File.dirname(apt_conf_d_proxy_file)}
-echo 'Acquire::HTTP { Proxy "http://#{gateway_ip}:3142"; };' | tee #{apt_conf_d_proxy_file}
-        EOF
+        @config[:apt][:cacher_ng] = { :proxy_url => "http://#{gateway_ip}:3142" }.merge(@config[:apt][:cacher_ng])
 
-        container.config[:apt_cacher_exclude_hosts].nil? or container.config[:apt_cacher_exclude_hosts].each do |host|
-          script << %(echo 'Acquire::HTTP::Proxy::#{host} "DIRECT";' | tee -a #{apt_conf_d_proxy_file}\n)
+        container.node.ssh.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
+          file.puts(ZTK::Template.render(@apt_conf_d_proxy_file_template, @config))
         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")
-        script << %(sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}\n)
-
-        container.node.ssh.bootstrap(script)
-      end
-
-      # AptCacherNG Provisioner Container Teardown
-      #
-      # This is a NO-OP currently.
-      #
-      # @return [Boolean] True if successful.
-      def teardown(container)
-        # NOOP
-
-        true
+        container.node.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}))
       end
 
     end

data/lib/testlab/{node → provisioners}/bind.rb

@@ -1,12 +1,39 @@
 class TestLab
-  class Node
 
-    module Bind
-      require 'tempfile'
+  class Provisioner
+
+    # Bind Provisioner Error Class
+    class BindError < ProvisionerError; end
+
+    # Bind Provisioner Class
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    class Bind
+
+      def initialize(config={}, ui=nil)
+        @config = (config || Hash.new)
+        @ui     = (ui     || TestLab.ui)
+
+        @config[:bind] ||= Hash.new
+
+        @ui.logger.debug { "config(#{@config.inspect})" }
+      end
+
+      # Bind 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 { "BIND Provisioner: Node #{node.id}" }
+
+        bind_setup(node.ssh)
+
+        true
+      end
 
       # Builds the main bind configuration sections
       def build_bind_main_partial(file)
-        bind_conf_template = File.join(self.class.template_dir, "bind.erb")
+        bind_conf_template = File.join(TestLab::Provisioner.template_dir, "bind", "bind.erb")
 
         file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} BIND Configuration", :char => '//'))
         file.puts(ZTK::Template.render(bind_conf_template, {}))
@@ -32,8 +59,8 @@ class TestLab
       end
 
       # Builds the bind configuration sections for our zones
-      def build_bind_zone_partial(file)
-        bind_zone_template = File.join(self.class.template_dir, 'bind-zone.erb')
+      def build_bind_zone_partial(ssh, file)
+        bind_zone_template = File.join(TestLab::Provisioner.template_dir, "bind", 'bind-zone.erb')
 
         bind_records = build_bind_records
         forward_records = bind_records[:forward]
@@ -47,7 +74,7 @@ class TestLab
           file.puts
           file.puts(ZTK::Template.render(bind_zone_template, context))
 
-          build_bind_db(network.arpa, reverse_records[network.id])
+          build_bind_db(ssh, network.arpa, reverse_records[network.id])
         end
 
         TestLab::Container.domains.each do |domain|
@@ -58,41 +85,41 @@ class TestLab
           file.puts
           file.puts(ZTK::Template.render(bind_zone_template, context))
 
-          build_bind_db(domain, forward_records[domain])
+          build_bind_db(ssh, domain, forward_records[domain])
         end
       end
 
-      def build_bind_db(zone, records)
-        bind_db_template = File.join(self.class.template_dir, 'bind-db.erb')
+      def build_bind_db(ssh, zone, records)
+        bind_db_template = File.join(TestLab::Provisioner.template_dir, "bind", 'bind-db.erb')
 
-        self.ssh.file(:target => "/etc/bind/db.#{zone}", :chown => "bind:bind") do |file|
+        ssh.file(:target => "/etc/bind/db.#{zone}", :chown => "bind:bind") do |file|
           file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} BIND DB: #{zone}", :char => ';'))
           file.puts(ZTK::Template.render(bind_db_template, { :zone => zone, :records => records }))
         end
       end
 
       # Builds the BIND configuration
-      def build_bind_conf
-        self.ssh.file(:target => File.join("/etc/bind/named.conf"), :chown => "bind:bind") do |file|
+      def build_bind_conf(ssh)
+        ssh.file(:target => File.join("/etc/bind/named.conf"), :chown => "bind:bind") do |file|
           build_bind_main_partial(file)
-          build_bind_zone_partial(file)
+          build_bind_zone_partial(ssh, file)
         end
       end
 
-      def bind_install
-        self.ssh.exec(%(sudo apt-get -y install bind9))
-        self.ssh.exec(%(sudo rm -fv /etc/bind/{*.arpa,*.zone,*.conf*}))
+      def bind_install(ssh)
+        ssh.exec(%(sudo apt-get -y install bind9))
+        ssh.exec(%(sudo rm -fv /etc/bind/{*.arpa,*.zone,*.conf*}))
       end
 
-      def bind_reload
-        self.ssh.exec(%(sudo chown -Rv bind:bind /etc/bind))
-        self.ssh.exec(%(sudo rndc reload))
+      def bind_reload(ssh)
+        ssh.exec(%(sudo chown -Rv bind:bind /etc/bind))
+        ssh.exec(%(sudo rndc reload))
       end
 
-      def bind_setup
-        bind_install
-        build_bind_conf
-        bind_reload
+      def bind_setup(ssh)
+        bind_install(ssh)
+        build_bind_conf(ssh)
+        bind_reload(ssh)
       end
 
     end