testlab 1.0.1 → 1.1.0

data/README.md

@@ -209,7 +209,7 @@ Calling `TestLab.new` without a `:labfile` option will, by default, attempt to r
 There are several easy accessors available to grab the first container and execute the command `uptime` on it via and SSH connection:
 
     container = @testlab.containers.first
-    container.ssh.exec(%(uptime))
+    container.exec(%(uptime))
 
 We can also execute this command via `lxc-attach`:
 

data/bin/tl

@@ -101,9 +101,11 @@ end
 post do |global,command,options,args|
   testlab_run_time = (Time.now.utc - @testlab_start_time)
 
-  message = format_message("TestLab v#{TestLab::VERSION} Finished (%0.4f seconds)".black.bold % testlab_run_time)
-  @testlab.ui.stdout.puts(message)
-  @testlab.ui.logger.info { message }
+  if !@ui.quiet?
+    message = format_message("TestLab v#{TestLab::VERSION} Finished (%0.4f seconds)".black.bold % testlab_run_time)
+    @testlab.ui.stdout.puts(message)
+    @testlab.ui.logger.info { message }
+  end
 
   true
 end

data/features/support/Labfile.local

@@ -12,19 +12,13 @@ node 'vagrant' do
     TestLab::Provisioner::Resolv
   ]
 
-  config      ({
-    :bind => {
-      :domain => "default.zone"
-    }
-  })
-
   network 'labnet' do
     provisioners  [
       TestLab::Provisioner::Bind
     ]
 
     address       '10.128.0.1/16'
-    bridge        :br_test
+    bridge        'br_test'
   end
 
   container "test-server" do
@@ -48,7 +42,7 @@ node 'vagrant' do
 
     interface do
       network_id  'labnet'
-      name        :eth0
+      name        'eth0'
       address     '10.128.0.254/16'
       mac         '00:00:5e:63:b5:9f'
     end

data/features/support/Labfile.vagrant

@@ -20,9 +20,6 @@ node 'vagrant' do
       :box      => 'raring64',
       :box_url  => 'https://dl.dropboxusercontent.com/u/22904185/boxes/raring64.box',
       :file     => File.dirname(__FILE__)
-    },
-    :bind => {
-      :domain => "default.zone"
     }
   })
 
@@ -32,7 +29,7 @@ node 'vagrant' do
     ]
 
     address       '10.128.0.1/16'
-    bridge        :br0
+    bridge        'br0'
   end
 
   container "test-server" do
@@ -56,7 +53,7 @@ node 'vagrant' do
 
     interface do
       network_id  'labnet'
-      name        :eth0
+      name        'eth0'
       address     '10.128.0.254/16'
       mac         '00:00:5e:63:b5:9f'
     end

data/lib/testlab/container/actions.rb

@@ -72,7 +72,7 @@ class TestLab
             user.provision
           end
 
-          self.ssh.exec(%(sudo hostname #{self.fqdn}))
+          self.exec(%(sudo hostname #{self.fqdn}))
 
           do_provisioner_callbacks(self, :up, @ui)
         end
@@ -102,46 +102,6 @@ class TestLab
         true
       end
 
-      # Clone the container
-      #
-      # Prepares the container, if needed, for ephemeral cloning and clones it.
-      #
-      # @return [Boolean] True if successful.
-      def clone
-        @ui.logger.debug { "Container Clone: #{self.id}" }
-
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Clone', :yellow)) do
-
-          # ensure our container is in "ephemeral" mode
-          self.to_ephemeral
-
-          self.node.ssh.exec(%(sudo arp --verbose --delete #{self.ip}), :ignore_exit_status => true)
-
-          ephemeral_arguments = Array.new
-          ephemeral_arguments << %W(-o #{self.lxc_clone.name} -n #{self.lxc.name} -d)
-          ephemeral_arguments << %W(--keep-data) if self.persist
-          ephemeral_arguments.flatten!.compact!
-
-          self.lxc_clone.start_ephemeral(ephemeral_arguments)
-        end
-
-        true
-      end
-
-      # Configure the container
-      #
-      # Configures the LXC subsystem for the container.
-      #
-      # @return [Boolean] True if successful.
-      def configure
-        self.domain ||= self.node.domain
-        self.arch   ||= detect_arch
-
-        build_lxc_config(self.lxc.config)
-
-        true
-      end
-
     end
 
   end

data/lib/testlab/container/clone.rb

@@ -0,0 +1,87 @@
+class TestLab
+  class Container
+
+    module Clone
+
+      # Clone the container
+      #
+      # Prepares the container, if needed, for ephemeral cloning and clones it.
+      #
+      # @return [Boolean] True if successful.
+      def clone
+        @ui.logger.debug { "Container Clone: #{self.id}" }
+
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Clone', :yellow)) do
+
+          # ensure our container is in "ephemeral" mode
+          self.to_ephemeral
+
+          self.node.exec(%(sudo arp --verbose --delete #{self.ip}), :ignore_exit_status => true)
+
+          self.lxc_clone.start_ephemeral(clone_args)
+        end
+
+        true
+      end
+
+      # LXC::Container object
+      #
+      # Returns a *LXC::Container* class instance configured for the clone of
+      # this container.
+      #
+      # @return [LXC] An instance of LXC::Container configured for the clone of
+      #   this container.
+      def lxc_clone
+        @lxc_clone ||= self.node.lxc.container("#{self.id}-master")
+      end
+
+      # Convert to Static Container
+      #
+      # If the current container is operating as an ephemeral container, this
+      # will convert it back to a static container, otherwise no changes will
+      # occur.
+      #
+      # @return [Boolean] Returns true if successful.
+      def to_static
+        if self.lxc_clone.exists?
+          self.lxc.stop
+          self.lxc.destroy(%(-f))
+
+          self.lxc_clone.stop
+          self.lxc_clone.clone(%W(-o #{self.lxc_clone.name} -n #{self.lxc.name}))
+          self.lxc_clone.destroy(%(-f))
+
+          build_lxc_config(self.lxc.config)
+        end
+
+        true
+      end
+
+      # Convert to Ephemeral Container
+      #
+      # If the current container is operating as a static container, this will
+      # convert it to a ephemeral container, otherwise no changes will occur.
+      #
+      # @return [Boolean] Returns true if successful.
+      def to_ephemeral
+        if (self.lxc.exists? && !self.lxc_clone.exists?)
+          self.lxc_clone.stop
+          self.lxc_clone.destroy(%(-f))
+
+          self.lxc.stop
+          self.lxc.clone(%W(-o #{self.lxc.name} -n #{self.lxc_clone.name}))
+          self.lxc.destroy(%(-f))
+
+          build_lxc_config(self.lxc_clone.config)
+        else
+          self.lxc.stop
+          self.persist and self.lxc.destroy(%(-f))
+        end
+
+        true
+      end
+
+    end
+
+  end
+end

data/lib/testlab/container/configuration.rb

@@ -0,0 +1,67 @@
+class TestLab
+  class Container
+
+    module Configuration
+
+      # Configure the container
+      #
+      # Configures the LXC subsystem for the container.
+      #
+      # @return [Boolean] True if successful.
+      def configure
+        self.domain ||= self.node.domain
+        self.arch   ||= detect_arch
+
+        build_lxc_config(self.lxc.config)
+
+        true
+      end
+
+      # LXC Container Configuration
+      #
+      # Builds the LXC container configuration data.
+      #
+      # @return [Boolean] True if successful.
+      def build_lxc_config(lxc_config)
+        lxc_config.clear
+
+        lxc_config['lxc.arch']    = self.arch
+        lxc_config['lxc.utsname'] = self.fqdn
+        lxc_config.networks       = build_lxc_network_conf(self.interfaces)
+
+        lxc_config.save
+
+        true
+      end
+
+      # LXC Network Configuration
+      #
+      # Builds an array of hashes containing the lxc configuration options for
+      # our network interfaces.
+      #
+      # @return [Array<Hash>] An array of hashes defining the containers
+      #   interfaces for use in configuring LXC.
+      def build_lxc_network_conf(interfaces)
+        networks = Array.new
+
+        interfaces.each do |interface|
+          networks << Hash[
+            'lxc.network.type'   => :veth,
+            'lxc.network.flags'  => :up,
+            'lxc.network.link'   => interface.network.bridge,
+            'lxc.network.name'   => interface.name,
+            'lxc.network.hwaddr' => interface.mac,
+            'lxc.network.ipv4'   => "#{interface.ip}/#{interface.cidr} #{interface.netmask}"
+          ]
+          if (interface.primary == true) || (interfaces.count == 1)
+            networks.last.merge!('lxc.network.ipv4.gateway' => :auto)
+          end
+        end
+
+        networks
+      end
+
+    end
+
+  end
+end

data/lib/testlab/container/io.rb

@@ -25,7 +25,7 @@ class TestLab
         root_fs_path = self.lxc.fs_root.split(File::SEPARATOR).last
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
-          self.node.ssh.bootstrap(<<-EOF)
+          self.node.bootstrap(<<-EOF)
 set -x
 set -e
 
@@ -41,7 +41,7 @@ EOF
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Export', :cyan)) do
           File.exists?(local_file) and FileUtils.rm_f(local_file)
-          self.node.ssh.download(remote_file, local_file)
+          self.node.download(remote_file, local_file)
         end
 
         @ui.stdout.puts
@@ -70,12 +70,12 @@ EOF
         root_fs_path = self.lxc.fs_root.split(File::SEPARATOR).last
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Import', :cyan)) do
-          self.node.ssh.exec(%(sudo rm -fv #{remote_file}), :silence => true, :ignore_exit_status => true)
-          self.node.ssh.upload(local_file, remote_file)
+          self.node.exec(%(sudo rm -fv #{remote_file}), :silence => true, :ignore_exit_status => true)
+          self.node.upload(local_file, remote_file)
         end
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Expand', :cyan)) do
-          self.node.ssh.bootstrap(<<-EOF)
+          self.node.bootstrap(<<-EOF)
 set -x
 set -e
 
@@ -117,9 +117,9 @@ EOF
 
         self.down
         please_wait(:ui => @ui, :message => format_object_action(self, 'Copy', :yellow)) do
-          self.node.ssh.exec(%(sudo rm -rf #{target_container.lxc.fs_root}))
-          self.node.ssh.exec(%(sudo rsync -a #{self.lxc.fs_root} #{target_container.lxc.container_root}))
-          self.node.ssh.exec(%(sudo rm -fv #{File.join(self.lxc.fs_root, '.*provision')}))
+          self.node.exec(%(sudo rm -rf #{target_container.lxc.fs_root}))
+          self.node.exec(%(sudo rsync -a #{self.lxc.fs_root} #{target_container.lxc.container_root}))
+          self.node.exec(%(sudo rm -fv #{File.join(self.lxc.fs_root, '.*provision')}))
         end
 
         # bring the source container back online if it was running before the copy operation

data/lib/testlab/container/lifecycle.rb

@@ -3,46 +3,6 @@ class TestLab
 
     module Lifecycle
 
-      # Provision the container
-      #
-      # Attempts to provision the container.  We first create the container,
-      # then attempt to bring it online.  Afterwards the containers provisioner
-      # is called.
-      #
-      # @return [Boolean] True if successful.
-      def provision
-        @ui.logger.debug { "Container Provision: #{self.id} " }
-
-        (self.node.state != :running) and return false
-        (self.state != :running) and return false
-
-        please_wait(:ui => @ui, :message => format_object_action(self, :provision, :green)) do
-          do_provisioner_callbacks(self, :provision, @ui)
-        end
-
-        true
-      end
-
-      # Deprovision the container
-      #
-      # Attempts to deprovision the container.  We first call the provisioner
-      # deprovision method defined for the container, if any.  Next we attempt
-      # to offline the container.  Afterwards the container is destroy.
-      #
-      # @return [Boolean] True if successful.
-      def deprovision
-        @ui.logger.debug { "Container Deprovision: #{self.id} " }
-
-        (self.node.state != :running) and return false
-        (self.state != :running) and return false
-
-        please_wait(:ui => @ui, :message => format_object_action(self, :deprovision, :red)) do
-          do_provisioner_callbacks(self, :deprovision, @ui)
-        end
-
-        true
-      end
-
       # Build the container
       def build
         self.create

data/lib/testlab/container/lxc.rb

@@ -3,22 +3,6 @@ class TestLab
 
     module LXC
 
-      # Container Bootstrap
-      #
-      # Renders the supplied content into a file on the container and proceeds
-      # to execute it on the container as root.
-      #
-      # @param [String] content The content to render on the container and
-      #   execute.  This is generally a bash script of some sort for example.
-      # @return [String] The output of respective SSH/LXC bootstrap.
-      def bootstrap(content, options={})
-        if self.lxc_clone.exists?
-          self.ssh.bootstrap(content, options)
-        else
-          self.lxc.bootstrap(content)
-        end
-      end
-
       # Container Console
       #
       # Opens an LXC console into the container.
@@ -41,63 +25,6 @@ class TestLab
         @lxc ||= self.node.lxc.container(self.id)
       end
 
-      # LXC::Container object
-      #
-      # Returns a *LXC::Container* class instance configured for the clone of
-      # this container.
-      #
-      # @return [LXC] An instance of LXC::Container configured for the clone of
-      #   this container.
-      def lxc_clone
-        @lxc_clone ||= self.node.lxc.container("#{self.id}-master")
-      end
-
-      # Convert to Static Container
-      #
-      # If the current container is operating as an ephemeral container, this
-      # will convert it back to a static container, otherwise no changes will
-      # occur.
-      #
-      # @return [Boolean] Returns true if successful.
-      def to_static
-        if self.lxc_clone.exists?
-          self.lxc.stop
-          self.lxc.destroy(%(-f))
-
-          self.lxc_clone.stop
-          self.lxc_clone.clone(%W(-o #{self.lxc_clone.name} -n #{self.lxc.name}))
-          self.lxc_clone.destroy(%(-f))
-
-          build_lxc_config(self.lxc.config)
-        end
-
-        true
-      end
-
-      # Convert to Ephemeral Container
-      #
-      # If the current container is operating as a static container, this will
-      # convert it to a ephemeral container, otherwise no changes will occur.
-      #
-      # @return [Boolean] Returns true if successful.
-      def to_ephemeral
-        if (self.lxc.exists? && !self.lxc_clone.exists?)
-          self.lxc_clone.stop
-          self.lxc_clone.destroy(%(-f))
-
-          self.lxc.stop
-          self.lxc.clone(%W(-o #{self.lxc.name} -n #{self.lxc_clone.name}))
-          self.lxc.destroy(%(-f))
-
-          build_lxc_config(self.lxc_clone.config)
-        else
-          self.lxc.stop
-          self.persist and self.lxc.destroy(%(-f))
-        end
-
-        true
-      end
-
       # Does the container exist?
       #
       # @return [Boolean] True if the containers exists, false otherwise.
@@ -114,76 +41,6 @@ class TestLab
         self.lxc.fs_root(self.lxc_clone.exists?)
       end
 
-      # Returns arguments for lxc-create based on our distro
-      #
-      # @return [Array<String>] An array of arguments for lxc-create
-      def create_args
-        case self.distro.downcase
-        when "ubuntu" then
-          %W(-f /etc/lxc/#{self.id} -t #{self.distro} -- --release #{self.release} --arch #{self.arch})
-        when "fedora" then
-          %W(-f /etc/lxc/#{self.id} -t #{self.distro} -- --release #{self.release})
-        end
-      end
-
-      # Attempt to detect the architecture of the node.  The value returned is
-      # respective to the container distro.
-      #
-      # @return [String] The arch of the node in the context of the container
-      #   distro
-      def detect_arch
-        case self.distro.downcase
-        when "ubuntu" then
-          ((self.node.arch =~ /x86_64/) ? "amd64" : "i386")
-        when "fedora" then
-          ((self.node.arch =~ /x86_64/) ? "amd64" : "i686")
-        end
-      end
-
-      # LXC Container Configuration
-      #
-      # Builds the LXC container configuration data.
-      #
-      # @return [Boolean] True if successful.
-      def build_lxc_config(lxc_config)
-        lxc_config.clear
-
-        lxc_config['lxc.arch']    = self.arch
-        lxc_config['lxc.utsname'] = self.fqdn
-        lxc_config.networks       = build_lxc_network_conf(self.interfaces)
-
-        lxc_config.save
-
-        true
-      end
-
-      # LXC Network Configuration
-      #
-      # Builds an array of hashes containing the lxc configuration options for
-      # our network interfaces.
-      #
-      # @return [Array<Hash>] An array of hashes defining the containers
-      #   interfaces for use in configuring LXC.
-      def build_lxc_network_conf(interfaces)
-        networks = Array.new
-
-        interfaces.each do |interface|
-          networks << Hash[
-            'lxc.network.type'   => :veth,
-            'lxc.network.flags'  => :up,
-            'lxc.network.link'   => interface.network.bridge,
-            'lxc.network.name'   => interface.name,
-            'lxc.network.hwaddr' => interface.mac,
-            'lxc.network.ipv4'   => "#{interface.ip}/#{interface.cidr} #{interface.netmask}"
-          ]
-          if (interface.primary == true) || (interfaces.count == 1)
-            networks.last.merge!('lxc.network.ipv4.gateway' => :auto)
-          end
-        end
-
-        networks
-      end
-
     end
 
   end

data/lib/testlab/container/provision.rb

@@ -0,0 +1,49 @@
+class TestLab
+  class Container
+
+    module Provision
+
+      # Provision the container
+      #
+      # Attempts to provision the container.  We first create the container,
+      # then attempt to bring it online.  Afterwards the containers provisioner
+      # is called.
+      #
+      # @return [Boolean] True if successful.
+      def provision
+        @ui.logger.debug { "Container Provision: #{self.id} " }
+
+        (self.node.state != :running) and return false
+        (self.state != :running) and return false
+
+        please_wait(:ui => @ui, :message => format_object_action(self, :provision, :green)) do
+          do_provisioner_callbacks(self, :provision, @ui)
+        end
+
+        true
+      end
+
+      # Deprovision the container
+      #
+      # Attempts to deprovision the container.  We first call the provisioner
+      # deprovision method defined for the container, if any.  Next we attempt
+      # to offline the container.  Afterwards the container is destroy.
+      #
+      # @return [Boolean] True if successful.
+      def deprovision
+        @ui.logger.debug { "Container Deprovision: #{self.id} " }
+
+        (self.node.state != :running) and return false
+        (self.state != :running) and return false
+
+        please_wait(:ui => @ui, :message => format_object_action(self, :deprovision, :red)) do
+          do_provisioner_callbacks(self, :deprovision, @ui)
+        end
+
+        true
+      end
+
+    end
+
+  end
+end

data/lib/testlab/container/support.rb

@@ -0,0 +1,47 @@
+class TestLab
+  class Container
+
+    module Support
+
+      # Returns arguments for lxc-create based on our distro
+      #
+      # @return [Array<String>] An array of arguments for lxc-create
+      def create_args
+        case self.distro.downcase
+        when "ubuntu" then
+          %W(-f /etc/lxc/#{self.id} -t #{self.distro} -- --release #{self.release} --arch #{self.arch})
+        when "fedora" then
+          %W(-f /etc/lxc/#{self.id} -t #{self.distro} -- --release #{self.release})
+        end
+      end
+
+      # Returns arguments for lxc-start-ephemeral
+      #
+      # @return [Array<String>] An array of arguments for lxc-start-ephemeral
+      def clone_args
+        arguments = Array.new
+
+        arguments << %W(-o #{self.lxc_clone.name} -n #{self.lxc.name} -d)
+        arguments << %W(--keep-data) if self.persist
+
+        arguments.flatten.compact
+      end
+
+      # Attempt to detect the architecture of the node.  The value returned is
+      # respective to the container distro.
+      #
+      # @return [String] The arch of the node in the context of the container
+      #   distro
+      def detect_arch
+        case self.distro.downcase
+        when "ubuntu" then
+          ((self.node.arch =~ /x86_64/) ? "amd64" : "i386")
+        when "fedora" then
+          ((self.node.arch =~ /x86_64/) ? "amd64" : "i686")
+        end
+      end
+
+    end
+
+  end
+end

data/lib/testlab/container.rb

@@ -77,29 +77,39 @@ class TestLab
     # Sub-Modules
     autoload :Actions,       'testlab/container/actions'
     autoload :ClassMethods,  'testlab/container/class_methods'
+    autoload :Clone,         'testlab/container/clone'
+    autoload :Configuration, 'testlab/container/configuration'
     autoload :Generators,    'testlab/container/generators'
     autoload :Interface,     'testlab/container/interface'
     autoload :IO,            'testlab/container/io'
     autoload :Lifecycle,     'testlab/container/lifecycle'
     autoload :LXC,           'testlab/container/lxc'
     autoload :MethodMissing, 'testlab/container/method_missing'
+    autoload :Provision,     'testlab/container/provision'
     autoload :SSH,           'testlab/container/ssh'
     autoload :Status,        'testlab/container/status'
+    autoload :Support,       'testlab/container/support'
     autoload :User,          'testlab/container/user'
 
     include TestLab::Container::Actions
+    include TestLab::Container::Clone
+    include TestLab::Container::Configuration
     include TestLab::Container::Generators
     include TestLab::Container::Interface
     include TestLab::Container::IO
     include TestLab::Container::Lifecycle
     include TestLab::Container::LXC
     include TestLab::Container::MethodMissing
+    include TestLab::Container::Provision
     include TestLab::Container::SSH
     include TestLab::Container::Status
+    include TestLab::Container::Support
     include TestLab::Container::User
 
     extend  TestLab::Container::ClassMethods
 
+    include TestLab::Support::Execution
+
     include TestLab::Utility::Misc
 
     # Associations and Attributes