testlab 0.6.6 → 0.6.7

data/bin/tl

@@ -18,12 +18,16 @@
 #   limitations under the License.
 #
 ################################################################################
+require 'socket'
+
 require 'gli'
 require 'testlab'
 
 include GLI::App
 include TestLab::Utility::Misc
 
+HOSTNAME = Socket.gethostname.split('.').first.strip
+
 version TestLab::VERSION
 
 program_desc %(TestLab - A toolkit for building virtual computer labs)
@@ -41,11 +45,9 @@ switch [:v, :verbose]
 pre do |global,command,options,args|
   global[:v].nil? or (global[:v] == true) and ENV['LOG_LEVEL'] = 'DEBUG'
 
-  log_file = File.join(Dir.pwd, "testlab.log")
+  log_file = File.join(Dir.pwd, "testlab-#{HOSTNAME}.log")
   @logger = ZTK::Logger.new(log_file)
 
-  TestLab::Utility.log_header.each { |line| @logger.info { line } }
-
   @logger.debug { "global(#{global.inspect})" }
   @logger.debug { "options(#{options.inspect})" }
   @logger.debug { "args(#{args.inspect})" }
@@ -53,6 +55,8 @@ pre do |global,command,options,args|
   @ui = ZTK::UI.new(:logger => @logger)
   @testlab = TestLab.new(:ui => @ui)
 
+  TestLab::Utility.log_header(@testlab).each { |line| @logger.info { line } }
+
   message = format_message("TestLab v#{TestLab::VERSION} Loaded".black.bold)
   @testlab.ui.stdout.puts(message)
 

data/lib/commands/network.rb

@@ -187,7 +187,8 @@ EOF
         network = @testlab.networks.select{ |c| c.id.to_sym == options[:name].to_sym }.first
         network.nil? and raise TestLab::TestLabError, "We could not find the network you supplied!"
 
-        network.manage_route(:add)
+        p = TestLab::Provisioner::Route.new({}, @ui)
+        p.on_network_setup(network)
         @testlab.ui.stdout.puts("Added routes successfully!".green.bold)
         @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
       end
@@ -203,7 +204,8 @@ EOF
         network = @testlab.networks.select{ |c| c.id.to_sym == options[:name].to_sym }.first
         network.nil? and raise TestLab::TestLabError, "We could not find the network you supplied!"
 
-        network.manage_route(:del)
+        p = TestLab::Provisioner::Route.new({}, @ui)
+        p.on_network_teardown(network)
         @testlab.ui.stdout.puts("Deleted routes successfully!".red.bold)
         @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
       end

data/lib/testlab/container/io.rb

@@ -16,16 +16,17 @@ class TestLab
         sc_file = File.join("/", "tmp", "#{self.id}.sc")
         local_file = File.join(Dir.pwd, File.basename(sc_file))
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :blue)) do
-          script = <<-EOF
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
+          self.node.ssh.bootstrap(<<-EOF)
 set -x
+set -e
 find #{self.lxc.container_root} -print0 -depth | cpio -o0 | pbzip2 -#{compression} -vfcz > #{sc_file}
 chown ${SUDO_USER}:${SUDO_USER} #{sc_file}
 EOF
-          self.node.ssh.bootstrap(script)
         end
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Export', :blue)) do
+        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(sc_file, local_file)
         end
 
@@ -45,17 +46,17 @@ EOF
 
         sc_file = File.join("/", "tmp", "#{self.id}.sc")
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Import', :blue)) do
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Import', :cyan)) do
           self.node.ssh.exec(%(sudo rm -fv #{sc_file}), :silence => true, :ignore_exit_status => true)
           self.node.ssh.upload(local_file, sc_file)
         end
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Expand', :blue)) do
-          script = <<-EOF
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Expand', :cyan)) do
+          self.node.ssh.bootstrap(<<-EOF)
 set -x
+set -e
 pbzip2 -vdc #{sc_file} | cpio -uid && rm -fv #{sc_file}
 EOF
-          self.node.ssh.bootstrap(script)
         end
 
         puts("Your shipping container is now imported and available for use!")

data/lib/testlab/container/ssh.rb

@@ -13,6 +13,31 @@ class TestLab
         self.node.container_ssh(self, options)
       end
 
+      # Returns text suitable for use in an SSH configuration file
+      #
+      # @return [String] SSH configuration text blob.
+      def ssh_config
+        identities = [self.users.map(&:identity), self.node.identity].flatten.compact.uniq
+
+        output = <<-EOF
+#{ZTK::Template.do_not_edit_notice(:message => %(TestLab "#{self.fqdn}" SSH Configuration))}
+Host #{self.id}
+  HostName #{self.ip}
+  Port 22
+  UserKnownHostsFile /dev/null
+  StrictHostKeyChecking no
+  PasswordAuthentication no
+  ForwardAgent no
+  IdentitiesOnly yes
+EOF
+
+        identities.each do |identity|
+          output += "  IdentityFile #{identity}\n"
+        end
+
+        output
+      end
+
     end
 
   end

data/lib/testlab/network/lifecycle.rb

@@ -12,7 +12,7 @@ class TestLab
           self.provisioners.each do |provisioner|
             @ui.logger.info { ">>>>> NETWORK PROVISIONER SETUP: #{provisioner} <<<<<" }
             p = provisioner.new(self.config, @ui)
-            p.respond_to?(:on_node_teardown) and p.on_node_teardown(self)
+            p.respond_to?(:on_network_setup) and p.on_network_setup(self)
           end
 
         end
@@ -29,7 +29,7 @@ class TestLab
           self.provisioners.each do |provisioner|
             @ui.logger.info { ">>>>> NETWORK PROVISIONER TEARDOWN: #{provisioner} <<<<<" }
             p = provisioner.new(self.config, @ui)
-            p.respond_to?(:on_node_teardown) and p.on_node_teardown(self)
+            p.respond_to?(:on_network_teardown) and p.on_network_teardown(self)
           end
 
         end

data/lib/testlab/node/ssh.rb

@@ -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.identity || @provider.identity)
+            c.keys            = (options[:keys]   || [container.primary_user.identity, @provider.identity])
           end
         end
         @container_ssh[name]

data/lib/testlab/utility/logger.rb

@@ -8,6 +8,7 @@ class TestLab
     #
     # @author Zachary Patten <zachary AT jovelabs DOT com>
     module Logger
+      require 'socket'
       require 'active_support/version'
 
       def log_key_value(key, value, max_key_length)
@@ -18,10 +19,13 @@ class TestLab
         (char * max_key_length)
       end
 
-      def log_details
+      def log_details(testlab)
         @command = ZTK::Command.new(:silence => true, :ignore_exit_status => true)
         {
+          "hostname" => Socket.gethostname.inspect,
           "program" => $0.to_s.inspect,
+          "config_dir" => testlab.config_dir.inspect,
+          "logdev" => testlab.ui.logger.logdev.inspect,
           "vagrant_version" => @command.exec(%(/usr/bin/env vagrant --version)).output.strip.inspect,
           "virtualbox_version" => @command.exec(%(/usr/bin/env vboxmanage --version)).output.strip.inspect
         }
@@ -48,10 +52,10 @@ class TestLab
         }
       end
 
-      def log_header
+      def log_header(testlab)
         log_lines = Array.new
 
-        details_hash       = log_details
+        details_hash       = log_details(testlab)
         ruby_hash          = log_ruby
         dependencies_hash  = log_dependencies
 

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -1,3 +1,5 @@
+require 'socket'
+
 require 'ztk'
 require 'active_support/inflector'
 
@@ -101,7 +103,7 @@ class TestLab
   def initialize(options={})
     self.ui      = (options[:ui] || ZTK::UI.new)
 
-    labfile      = (options[:labfile] || 'Labfile')
+    labfile      = (options[:labfile] || File.join(Dir.pwd, 'Labfile'))
     labfile_path = ZTK::Locator.find(labfile)
     @labfile     = TestLab::Labfile.load(labfile_path)
     @labfile.config.merge!(:testlab => self)
@@ -295,7 +297,8 @@ class TestLab
   #
   # @return [String] The path to the TestLab configuration directory.
   def config_dir
-    directory = File.join(self.config[:repo], '.testlab')
+    @hostname ||= Socket.gethostname.split('.').first.strip
+    directory = File.join(self.config[:repo], ".testlab-#{@hostname}")
     File.expand_path(directory, File.dirname(__FILE__))
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -300,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2743048303371547587
+      hash: 1748419604064060777
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2743048303371547587
+      hash: 1748419604064060777
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25