testlab 0.4.0 → 0.4.1

data/.travis.yml

@@ -2,13 +2,10 @@ language: ruby
 
 rvm:
   - ree
+  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
 
 notifications:
   irc: "irc.freenode.net#jovelabs"
-
-matrix:
-  allow_failures:
-    - rvm: ree

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem "json" if (RUBY_VERSION == "1.8.7")
+
 gemspec

data/README.md

@@ -34,6 +34,14 @@ For more information see the TestLab Documentation, `testlab-repo`, command-line
 
 * See the `testlab-repo` - https://github.com/zpatten/testlab-repo
 
+# RUBIES TESTED AGAINST
+
+* Ruby 1.8.7 (REE)
+* Ruby 1.8.7 (MBARI)
+* Ruby 1.9.2
+* Ruby 1.9.3
+* Ruby 2.0.0
+
 # RESOURCES
 
 IRC:

data/lib/testlab/container/actions.rb

@@ -26,6 +26,18 @@ class TestLab
           self.lxc.config.save
 
           self.lxc.create(*create_args)
+
+          # TODO: This needs to really go somewhere else:
+          home_dir = ((self.node.user == "root") ? %(/root) : %(/home/#{self.node.user}))
+          container_home_dir = File.join(self.lxc.fs_root, "/home/ubuntu")
+
+          home_authkeys = File.join(home_dir, %(.ssh), %(authorized_keys))
+          container_authkeys = File.join(container_home_dir, %(.ssh), %(authorized_keys))
+
+          self.node.ssh.exec(%(mkdir -pv #{File.join(container_home_dir, %(.ssh))}))
+          self.node.ssh.exec(%(sudo cp -v #{home_authkeys} #{container_authkeys}))
+          self.node.ssh.exec(%(sudo chown -v 1000:1000 #{container_authkeys}))
+          self.node.ssh.exec(%(sudo chmod -v 644 #{container_authkeys}))
         end
 
         true
@@ -54,13 +66,16 @@ class TestLab
       def up
         @ui.logger.debug { "Container Up: #{self.id} " }
 
-        (self.lxc.state == :not_created) and raise ContainerError, "We can not online a non-existant container!"
+        (self.lxc.state == :not_created) and return false #raise ContainerError, "We can not online a non-existant container!"
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           self.lxc.start
           self.lxc.wait(:running)
 
           (self.lxc.state != :running) and raise ContainerError, "The container failed to online!"
+
+          # TODO: This needs to really go somewhere else:
+          self.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'))
         end
 
         true
@@ -74,7 +89,7 @@ class TestLab
       def down
         @ui.logger.debug { "Container Down: #{self.id} " }
 
-        (self.lxc.state == :not_created) and raise ContainerError, "We can not offline a non-existant container!"
+        (self.lxc.state == :not_created) and return false # raise ContainerError, "We can not offline a non-existant container!"
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
           self.lxc.stop

data/lib/testlab/container/lxc.rb

@@ -16,10 +16,11 @@ class TestLab
 
         ZTK::RescueRetry.try(:tries => 3, :on => ContainerError) do
           tempfile = Tempfile.new("bootstrap")
-          self.node.ssh.file(:target => File.join(self.lxc.fs_root, tempfile.path), :chmod => '0777', :chown => 'root:root') do |file|
+          remote_tempfile = File.join("/tmp", File.basename(tempfile.path))
+          self.node.ssh.file(:target => File.join(self.lxc.fs_root, remote_tempfile), :chmod => '0777', :chown => 'root:root') do |file|
             file.puts(content)
           end
-          output = self.lxc.attach(%(/bin/bash), tempfile.path)
+          output = self.lxc.attach(%(/bin/bash), remote_tempfile)
           if output =~ /No such file or directory/
             raise ContainerError, "We could not find the bootstrap file!"
           end

data/lib/testlab/network/lifecycle.rb

@@ -9,16 +9,31 @@ class TestLab
 
         self.create
         self.up
+        self.route and route(:add)
       end
 
       # Network Teardown
       def teardown
         @ui.logger.debug { "Network Teardown: #{self.id} " }
 
+        self.route and route(:del)
         self.down
         self.destroy
       end
 
+      def route(action)
+        self.networks.each do |network|
+          command = ZTK::Command.new(:ui => @ui, :silence => true, :ignore_exit_status => true)
+
+          case RUBY_PLATFORM
+          when /darwin/ then
+            command.exec(%(sudo route #{action} -net #{TestLab::Utility.network(network.address)} #{network.node.ip} #{TestLab::Utility.netmask(network.address)}))
+          when /linux/ then
+            command.exec(%(sudo route #{action} -net #{TestLab::Utility.network(network.address)} netmask #{TestLab::Utility.netmask(network.address)} gw #{network.node.ip}))
+          end
+        end
+      end
+
     end
 
   end

data/lib/testlab/network.rb

@@ -31,6 +31,7 @@ class TestLab
 
     attribute   :address
     attribute   :bridge
+    attribute   :route,       :default => false
 
     attribute   :config
 

data/lib/testlab/node/lifecycle.rb

@@ -26,23 +26,12 @@ class TestLab
         self.ssh.bootstrap(ZTK::Template.render(node_setup_template))
       end
 
-      def route_setup(action)
-        self.networks.each do |network|
-          command = ZTK::Command.new(:silence => true, :ignore_exit_status => true)
-          command.exec(%(sudo route #{action} -net #{TestLab::Utility.network(network.address)} netmask #{TestLab::Utility.netmask(network.address)} gw #{network.node.ip}))
-        end
-      end
-
       # Setup the node.
       def setup
         @ui.logger.debug { "Node Setup: #{self.id} " }
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Setup', :green)) do
 
-          if (self.route == true)
-            route_setup(:add)
-          end
-
           node_setup
 
           if self.components.include?('resolv')
@@ -70,10 +59,7 @@ class TestLab
         call_collections([self.containers, self.networks], :teardown)
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Teardown', :red)) do
-
-          if (self.route == true)
-            route_setup(:del)
-          end
+          # NOOP
         end
 
         true

data/lib/testlab/node/status.rb

@@ -12,6 +12,7 @@ class TestLab
           :instance_id => @provider.instance_id,
           :state => @provider.state,
           :user => @provider.user,
+          :identity => @provider.identity,
           :ip => @provider.ip,
           :port => @provider.port,
           :provider => @provider.class,

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

@@ -15,4 +15,3 @@ sysctl net.ipv4.ip_forward | grep "net.ipv4.ip_forward = 1" || sysctl -w net.ipv
 
 # Install an iptable NAT rule
 iptables -t nat --list -v | grep "MASQUERADE  all  --  any    eth0    anywhere             anywhere" || iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
-

data/lib/testlab/node.rb

@@ -34,15 +34,14 @@ class TestLab
     include TestLab::Utility::Misc
 
     # Associations and Attributes
-    belongs_to :labfile,    :class_name => 'TestLab::Lab'
+    belongs_to :labfile,    :class_name => 'TestLab::Labfile'
 
     has_many   :containers, :class_name => 'TestLab::Container'
     has_many   :networks,   :class_name => 'TestLab::Network'
 
     attribute  :provider
-    attribute  :config
+    attribute  :config,     :default => Hash.new
     attribute  :components, :default => Array.new
-    attribute  :route,      :default => false
 
 
     def initialize(*args)

data/lib/testlab/provider.rb

@@ -7,7 +7,7 @@ class TestLab
   #
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   class Provider
-    PROXY_METHODS = %w(instance_id state user ip port create destroy up down reload status alive? dead? exists?).map(&:to_sym)
+    PROXY_METHODS = %w(instance_id state user identity ip port create destroy up down reload status alive? dead? exists?).map(&:to_sym)
 
     autoload :AWS, 'testlab/providers/aws'
     autoload :Local, 'testlab/providers/local'

data/lib/testlab/providers/vagrant.rb

@@ -174,7 +174,7 @@ class TestLab
         command = TestLab.build_command_line("vagrant", *args)
         @ui.logger.debug { "command == #{command.inspect}" }
 
-        ZTK::Command.new(:ui => @ui).exec(command, :silence => true)
+        ZTK::Command.new(:ui => @ui, :silence => true).exec(command)
       end
 
       def render_vagrantfile
@@ -191,15 +191,10 @@ class TestLab
         }
 
         vagrantfile_template = File.join(TestLab::Provider.template_dir, "vagrant", "Vagrantfile.erb")
-        vagrantfile          = File.join(@config[:repo], "Vagrantfile")
+        vagrantfile          = File.join(@config[:vagrant][:file], "Vagrantfile")
 
-        # UGLY; but it makes it run under 1.9.2
-        if RUBY_VERSION < "1.9.3"
-          File.open(vagrantfile, 'w') do |file|
-            file.puts(ZTK::Template.render(vagrantfile_template, context))
-          end
-        else
-          IO.write(vagrantfile, ZTK::Template.render(vagrantfile_template, context))
+        File.open(vagrantfile, 'w') do |file|
+          file.puts(ZTK::Template.render(vagrantfile_template, context))
         end
       end
 

data/lib/testlab/provisioners/omnitruck.rb

@@ -40,7 +40,8 @@ class TestLab
           :default_password => "p@ssw01d",
           :user => ENV['USER'],
           :hostname_short => container.id,
-          :hostname_full => container.fqdn
+          :hostname_full => container.fqdn,
+          :omnibus_version => omnibus_version
         }).merge!(@config)
         container.bootstrap(ZTK::Template.render(omnibus_template, config))
       end
@@ -60,7 +61,8 @@ class TestLab
 
       def build_chef_solo_10_attributes(container)
         {
-          "chef-server" => {
+          "chef_server" => {
+            "url" => "https://#{container.fqdn}",
             "webui_enabled" => true
           },
           "run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server::apache-proxy])
@@ -109,6 +111,14 @@ class TestLab
         end
       end
 
+      def omnibus_version
+        if (@config[:version].to_f == 0.1)
+          "10.12.0"
+        else
+          @config[:version]
+        end
+      end
+
     end
 
   end

data/lib/testlab/provisioners/templates/chef/omnitruck.erb

@@ -7,11 +7,11 @@ CHEF_SOLO_ROOT="/tmp/chef-solo"
 KNIFE_CONFIG_EXP_FILE="/tmp/knife-config.exp"
 export DEBIAN_FRONTEND CHEF_SOLO_ROOT KNIFE_CONFIG_EXP_FILE
 
-mkdir -p /tmp/chef-solo/
+mkdir -p ${CHEF_SOLO_ROOT}
 cd ${CHEF_SOLO_ROOT}
 
 apt-get -y --force-yes update
-apt-get -y --force-yes install build-essential expect wget curl
+apt-get -y --force-yes install build-essential expect wget curl libgecode-dev
 
 mkdir -pv /etc/chef /var/log/chef ${HOME}/.chef
 
@@ -25,8 +25,8 @@ cat <<EOF | tee ${CHEF_SOLO_ROOT}/attributes.json
 <%= @chef_solo_attributes.to_json %>
 EOF
 
-curl -L https://www.opscode.com/chef/install.sh | bash
-# bash install.sh -v <%= @version %>
+wget -v https://www.opscode.com/chef/install.sh
+bash install.sh -v <%= @omnibus_version %>
 <% if (@chef_pre_11 == false) -%>
 
 mkdir -pv /var/chef/cache ${CHEF_SOLO_ROOT}/cookbooks/chef-server
@@ -49,11 +49,10 @@ EOF
 
 gem install bundler --no-ri --no-rdoc
 bundle install --standalone --path vendor/bundle --binstubs
-mv -v ${CHEF_SOLO_ROOT}/cookbooks ${CHEF_SOLO_ROOT}/site-cookbooks
 bin/berks install --path ${CHEF_SOLO_ROOT}/cookbooks/
 <% end -%>
 
-chef-solo --config /etc/chef/solo.rb --json-attributes ${CHEF_SOLO_ROOT}/attributes.json --logfile /var/log/chef/chef-solo.log --log_level debug
+PATH=./bin/:$PATH chef-solo --config /etc/chef/solo.rb --json-attributes ${CHEF_SOLO_ROOT}/attributes.json --logfile /var/log/chef/chef-solo.log --log_level debug
 <% if (@chef_pre_11 == false) -%>
 
 cat << EOF | tee /etc/chef-server/chef-server.rb

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -22,7 +22,8 @@ require 'testlab/monkeys'
 #   EOF
 #
 #   config Hash[
-#     :domain => "default.zone"
+#     :domain => "default.zone",
+#     :repo => File.join(ENV['HOME'], "code", "personal", "testlab-repo")
 #   ]
 #
 #   node :localhost do
@@ -39,8 +40,7 @@ require 'testlab/monkeys'
 #         :cpus     => 8,
 #         :memory   => 16384,
 #         :box      => 'raring64'
-#       },
-#       :repo => File.join(ENV['HOME'], "code", "personal", "testlab-repo")
+#       }
 #     ]
 #
 #     network :east do
@@ -103,6 +103,7 @@ class TestLab
     labfile      = (options[:labfile] || 'Labfile')
     labfile_path = ZTK::Locator.find(labfile)
     @labfile     = TestLab::Labfile.load(labfile_path)
+    @labfile.config.merge!(:testlab => self)
   end
 
   # Test Lab Nodes
@@ -202,6 +203,17 @@ class TestLab
     true
   end
 
+  # TestLab Configuration Directory
+  #
+  # Returns the path to the test lab configuration directory which is located
+  # off the repo directory under '.testlab'.
+  #
+  # @return [String] The path to the TestLab configuration directory.
+  def config_dir
+    directory = File.join(self.config[:repo], '.testlab')
+    File.expand_path(directory, File.dirname(__FILE__))
+  end
+
   # Provider Method Handler
   #
   # Proxies missing provider method calls to all nodes.
@@ -221,7 +233,7 @@ class TestLab
   #
   # These are special methods that we both include and extend on the parent
   # class.
-  module ClassMethods
+  module DualMethods
 
     @@ui ||= nil
 
@@ -266,13 +278,13 @@ class TestLab
     #
     # @return [String] Constructed command line with arguments.
     def build_command_line(name, *args)
-      executable = (ZTK::Locator.find('bin', name) rescue "/bin/env #{name}")
+      executable = (ZTK::Locator.find('bin', name) rescue "/usr/bin/env #{name}")
       [executable, args].flatten.compact.join(' ')
     end
 
   end
 
-  include TestLab::ClassMethods
-  extend  TestLab::ClassMethods
+  include TestLab::DualMethods
+  extend  TestLab::DualMethods
 
 end

data/spec/container_spec.rb

@@ -147,6 +147,7 @@ describe TestLab::Container do
         subject.lxc.config.stub(:save) { true }
         subject.stub(:detect_arch) { "amd64" }
         subject.lxc.stub(:create) { true }
+        subject.node.ssh.stub(:exec)
         subject.create
       end
     end
@@ -163,6 +164,7 @@ describe TestLab::Container do
         subject.lxc.stub(:start) { true }
         subject.lxc.stub(:wait) { true }
         subject.lxc.stub(:state) { :running }
+        subject.lxc.stub(:attach)
         subject.up
       end
     end

data/spec/support/Labfile

@@ -7,14 +7,16 @@ apt-get -y update
 apt-get -y install dnsutils
 EOF
 
+REPO = File.dirname(__FILE__)
+
 config Hash[
-  :domain => "default.zone"
+  :domain => "default.zone",
+  :repo => REPO
 ]
 
 node :localhost do
 
   components %w(resolv bind)
-  route true
 
   provider    TestLab::Provider::Vagrant
   config      Hash[
@@ -24,14 +26,15 @@ node :localhost do
       :user     => "vagrant",
       :port     => 22,
       :cpus     => 1,
-      :memory   => 512
-    },
-    :repo => File.dirname(__FILE__)
+      :memory   => 512,
+      :file     => REPO
+    }
   ]
 
   network :testnet do
     address '192.168.255.254/16'
     bridge  :br0
+    route   true
   end
 
   # DUAL NICs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -281,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2598342112570301025
+      hash: 3337879606359400445
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2598342112570301025
+      hash: 3337879606359400445
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25