testlab 0.6.5 → 0.6.6

data/lib/testlab/provisioners/omnitruck.rb

@@ -30,7 +30,7 @@ class TestLab
       # @param [TestLab::Container] container The container which we want to
       #   provision.
       # @return [Boolean] True if successful.
-      def setup(container)
+      def on_container_setup(container)
         omnibus_template = File.join(TestLab::Provisioner.template_dir, 'chef', 'omnitruck.erb')
         config = {}.merge!({
           :server_name => container.fqdn,
@@ -53,7 +53,7 @@ class TestLab
       # This is a NO-OP currently.
       #
       # @return [Boolean] True if successful.
-      def teardown(container)
+      def on_container_teardown(container)
         # NOOP
 
         true

data/lib/testlab/provisioners/raring.rb

@@ -24,7 +24,7 @@ class TestLab
       # @param [TestLab::Node] node The node which we want to
       #   provision.
       # @return [Boolean] True if successful.
-      def node(node)
+      def on_node_setup(node)
         @ui.logger.debug { "Ubuntu Raring Provisioner: Node #{node.id}" }
 
         bootstrap_template = File.join(TestLab::Provisioner.template_dir, "raring", "bootstrap.erb")

data/lib/testlab/provisioners/resolv.rb

@@ -25,7 +25,7 @@ class TestLab
       #
       # @param [TestLab::Node] node The node which we want to provision.
       # @return [Boolean] True if successful.
-      def node(node)
+      def on_node_setup(node)
         @ui.logger.debug { "RESOLV Provisioner: Node #{node.id}" }
 
         render_resolv_conf(node)
@@ -38,7 +38,7 @@ class TestLab
       # @param [TestLab::Container] container The container which we want to
       #   provision.
       # @return [Boolean] True if successful.
-      def setup(container)
+      def on_container_setup(container)
         @ui.logger.debug { "RESOLV Provisioner: Container #{container.id}" }
 
         render_resolv_conf(container)

data/lib/testlab/provisioners/route.rb

@@ -0,0 +1,51 @@
+class TestLab
+
+  class Provisioner
+
+    # Route Provisioner Error Class
+    class RouteError < ProvisionerError; end
+
+    # Route Provisioner Class
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    class Route
+
+      def initialize(config={}, ui=nil)
+        @config = (config || Hash.new)
+        @ui     = (ui     || TestLab.ui)
+
+        @config[:route] ||= Hash.new
+
+        @ui.logger.debug { "config(#{@config.inspect})" }
+      end
+
+      # Route Provisioner Network Setup
+      def on_network_setup(network)
+        manage_route(:add, network)
+
+        true
+      end
+
+      # Route Provisioner Network Teardown
+      def on_network_teardown(network)
+        manage_route(:del, network)
+
+        true
+      end
+
+      def manage_route(action, network)
+        command = ZTK::Command.new(:ui => @ui, :silence => true, :ignore_exit_status => true)
+
+        case RUBY_PLATFORM
+        when /darwin/ then
+          action = ((action == :del) ? :delete : :add)
+          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/provisioners/shell.rb

@@ -24,7 +24,7 @@ class TestLab
       # @param [TestLab::Container] container The container which we want to
       #   provision.
       # @return [Boolean] True if successful.
-      def setup(container)
+      def on_container_setup(container)
         if !@config[:script].nil?
           container.bootstrap(@config[:script])
         end

data/lib/testlab/provisioners/templates/apt/bootstrap.erb

@@ -1,11 +1,16 @@
 set -x
+set -e
+
+[[ -f /.testlab-apt-bootstrap ]] && exit 0
 
 export DEBIAN_FRONTEND="noninteractive"
 
-apt-get -y --force-yes update
+apt-get -y update
 <% if !@apt[:install].nil? -%>
 apt-get -y install <%= @apt[:install].flatten.compact.join(' ') %>
 <% end -%>
 <% if !@apt[:remove].nil? -%>
 apt-get -y remove <%= @apt[:remove].flatten.compact.join(' ') %>
 <% end -%>
+
+touch /.testlab-apt-bootstrap

data/lib/testlab/provisioners/templates/apt_cacher_ng/bootstrap.erb

@@ -1,7 +1,10 @@
 set -x
+set -e
 
 export DEBIAN_FRONTEND="noninteractive"
 
 apt-get -y install apt-cacher-ng
 service apt-cacher-ng restart || service apt-cacher-ng start
-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
+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

data/lib/testlab/provisioners/templates/raring/bootstrap.erb

@@ -1,13 +1,18 @@
 set -x
+set -e
 
 export DEBIAN_FRONTEND="noninteractive"
 
-# 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
+if [ ! -f /.testlab-raring-bootstrap ]; then
+  # 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 pbzip2
+
+  touch /.testlab-raring-bootstrap
+fi
 
 # Ensure the default lxc networking services are off
-service lxc-net stop
+service lxc-net stop || (service lxc-net start ; service lxc-net stop)
 
 # Ensure NTP services are enabled and running
 service ntp restart || service ntp start

data/lib/testlab/utility/logger.rb

@@ -0,0 +1,87 @@
+class TestLab
+  module Utility
+
+    # Logger Error Class
+    class LoggerError < UtilityError; end
+
+    # Logger Module
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    module Logger
+      require 'active_support/version'
+
+      def log_key_value(key, value, max_key_length)
+        " %s%s: %s" % [ key.upcase, '.' * (max_key_length - key.length), value.to_s ]
+      end
+
+      def log_page_break(max_key_length, char='-')
+        (char * max_key_length)
+      end
+
+      def log_details
+        @command = ZTK::Command.new(:silence => true, :ignore_exit_status => true)
+        {
+          "program" => $0.to_s.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
+        }
+      end
+
+      def log_ruby
+        dependencies = {
+          "ruby_version" => RUBY_VERSION.inspect,
+          "ruby_patchlevel" => RUBY_PATCHLEVEL.inspect,
+          "ruby_platform" => RUBY_PLATFORM.inspect
+        }
+
+        defined?(RUBY_ENGINE) and dependencies.merge!("ruby_engine" => RUBY_ENGINE)
+
+        dependencies
+      end
+
+      def log_dependencies
+        {
+          "gli_version" => ::GLI::VERSION.inspect,
+          "lxc_version" => ::LXC::VERSION.inspect,
+          "ztk_version" => ::ZTK::VERSION.inspect,
+          "activesupport_version" => ::ActiveSupport::VERSION::STRING.inspect,
+        }
+      end
+
+      def log_header
+        log_lines = Array.new
+
+        details_hash       = log_details
+        ruby_hash          = log_ruby
+        dependencies_hash  = log_dependencies
+
+        max_key_length = [details_hash.keys, ruby_hash.keys, dependencies_hash.keys].flatten.compact.map(&:length).max + 2
+        max_value_length = [details_hash.values, ruby_hash.values, dependencies_hash.values].flatten.compact.map(&:length).max + 2
+
+        max_length = (max_key_length + max_value_length + 2)
+
+        log_lines << log_page_break(max_length, '=')
+        details_hash.sort.each do |key, value|
+          log_lines << log_key_value(key, value, max_key_length)
+        end
+
+        log_lines << log_page_break(max_length)
+        ruby_hash.sort.each do |key, value|
+          log_lines << log_key_value(key, value, max_key_length)
+        end
+
+        log_lines << log_page_break(max_length)
+        dependencies_hash.sort.each do |key, value|
+          log_lines << log_key_value(key, value, max_key_length)
+        end
+
+        log_lines << log_page_break(max_length, '=')
+
+        log_lines.flatten.compact
+      end
+
+
+    end
+
+  end
+end

data/lib/testlab/utility.rb

@@ -10,10 +10,12 @@ class TestLab
   #
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   module Utility
-    autoload :CIDR, 'testlab/utility/cidr'
-    autoload :Misc, 'testlab/utility/misc'
+    autoload :CIDR,   'testlab/utility/cidr'
+    autoload :Logger, 'testlab/utility/logger'
+    autoload :Misc,   'testlab/utility/misc'
 
     extend TestLab::Utility::CIDR
+    extend TestLab::Utility::Logger
     extend TestLab::Utility::Misc
 
   end

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -210,6 +210,34 @@ class TestLab
     true
   end
 
+  # Test Lab Build
+  #
+  # Attempts to build our lab topology.  This calls various methods on
+  # all of our nodes, networks and containers.
+  #
+  # @return [Boolean] True if successful.
+  def build
+    nodes.each do |node|
+      node.create
+      node.up
+      node.setup
+
+      node.networks.each do |network|
+        network.create
+        network.up
+        network.setup
+      end
+
+      node.containers.each do |container|
+        container.create
+        container.up
+        container.setup
+      end
+    end
+
+    true
+  end
+
   # Node Method Proxy
   #
   # Iterates all of the lab nodes, sending the supplied method name and arguments

data/spec/container_spec.rb

@@ -156,6 +156,8 @@ describe TestLab::Container do
 
     describe "#destroy" do
       it "should destroy the container" do
+        subject.lxc.stub(:exists?) { true }
+        subject.lxc.stub(:state) { :stopped }
         subject.lxc.stub(:destroy) { true }
         subject.lxc_clone.stub(:destroy) { true }
         subject.destroy
@@ -164,6 +166,7 @@ describe TestLab::Container do
 
     describe "#up" do
       it "should up the container" do
+        subject.lxc.stub(:exists?) { true }
         subject.lxc.stub(:start) { true }
         subject.lxc.stub(:wait) { true }
         subject.lxc.stub(:state) { :running }
@@ -177,6 +180,7 @@ describe TestLab::Container do
 
     describe "#down" do
       it "should down the container" do
+        subject.lxc.stub(:exists?) { true }
         subject.lxc.stub(:stop) { true }
         subject.lxc.stub(:wait) { true }
         subject.lxc.stub(:state) { :stopped }
@@ -186,9 +190,9 @@ describe TestLab::Container do
 
     describe "#setup" do
       context "with no provisioner" do
-        it "should create and online the container" do
-          subject.stub(:create) { true }
-          subject.stub(:up) { true }
+        it "should setup the container" do
+          subject.lxc.stub(:exists?) { true }
+          subject.lxc.stub(:state) { :stopped }
           subject.provisioners = Array.new
 
           subject.setup
@@ -196,10 +200,11 @@ describe TestLab::Container do
       end
 
       context "with the shell provisioner" do
-        it "should create and online the container" do
+        it "should setup the container" do
           subject = TestLab::Container.first('server-shell')
-          subject.stub(:create) { true }
-          subject.stub(:up) { true }
+
+          subject.lxc.stub(:exists?) { true }
+          subject.lxc.stub(:state) { :stopped }
           subject.provisioners = Array.new
 
           subject.setup
@@ -209,9 +214,9 @@ describe TestLab::Container do
 
     describe "#teardown" do
       context "with no provisioner" do
-        it "should create and online the container" do
-          subject.stub(:down) { true }
-          subject.stub(:destroy) { true }
+        it "should teardown the container" do
+          subject.lxc.stub(:exists?) { true }
+          subject.lxc.stub(:state) { :stopped }
           subject.provisioners = Array.new
 
           subject.teardown
@@ -219,10 +224,11 @@ describe TestLab::Container do
       end
 
       context "with the shell provisioner" do
-        it "should create and online the container" do
+        it "should teardown the container" do
           subject = TestLab::Container.first('server-shell')
-          subject.stub(:down) { true }
-          subject.stub(:destroy) { true }
+
+          subject.lxc.stub(:exists?) { true }
+          subject.lxc.stub(:state) { :stopped }
           subject.provisioners = Array.new
 
           subject.teardown

data/spec/network_spec.rb

@@ -108,6 +108,7 @@ describe TestLab::Network do
 
     describe "#create" do
       it "should create the network bridge" do
+        subject.stub(:state) { :not_created }
         subject.node.ssh.stub(:exec) { true }
         subject.create
       end
@@ -115,6 +116,7 @@ describe TestLab::Network do
 
     describe "#destroy" do
       it "should destroy the network bridge" do
+        subject.stub(:state) { :stopped }
         subject.node.ssh.stub(:exec) { true }
         subject.destroy
       end
@@ -122,6 +124,7 @@ describe TestLab::Network do
 
     describe "#up" do
       it "should online the network bridge" do
+        subject.stub(:state) { :stopped }
         subject.node.ssh.stub(:exec) { true }
         subject.up
       end
@@ -129,6 +132,7 @@ describe TestLab::Network do
 
     describe "#down" do
       it "should offline the network bridge" do
+        subject.stub(:state) { :running }
         subject.node.ssh.stub(:exec) { true }
         subject.down
       end

data/spec/node_spec.rb

@@ -69,6 +69,7 @@ describe TestLab::Node do
     describe "#create" do
       it "should create the node" do
         subject.instance_variable_get(:@provider).stub(:create) { true }
+        subject.stub(:state) { :not_created }
         subject.create
       end
     end
@@ -76,6 +77,7 @@ describe TestLab::Node do
     describe "#destroy" do
       it "should destroy the node" do
         subject.instance_variable_get(:@provider).stub(:destroy) { true }
+        subject.stub(:state) { :stopped }
         subject.destroy
       end
     end
@@ -83,6 +85,7 @@ describe TestLab::Node do
     describe "#up" do
       it "should online the node" do
         subject.instance_variable_get(:@provider).stub(:up) { true }
+        subject.stub(:state) { :stopped }
         subject.up
       end
     end
@@ -90,6 +93,7 @@ describe TestLab::Node do
     describe "#down" do
       it "should offline the node" do
         subject.instance_variable_get(:@provider).stub(:down) { true }
+        subject.stub(:state) { :running }
         subject.down
       end
     end
@@ -98,16 +102,7 @@ describe TestLab::Node do
       it "should setup the node" do
         subject.provisioners = Array.new
         subject.containers.each { |c| c.provisioners = Array.new }
-        subject.ssh.stub(:bootstrap) { true }
-        subject.stub(:route_setup) { true }
-        subject.stub(:create) { true }
-        subject.stub(:up) { true }
-        subject.containers.each do |container|
-          container.stub(:setup) { true }
-        end
-        subject.networks.each do |network|
-          network.stub(:setup) { true }
-        end
+        subject.stub(:state) { :running }
         subject.setup
       end
     end
@@ -116,15 +111,7 @@ describe TestLab::Node do
       it "should teardown the node" do
         subject.provisioners = Array.new
         subject.containers.each { |c| c.provisioners = Array.new }
-        subject.stub(:route_setup) { true }
-        subject.stub(:down) { true }
-        subject.stub(:destroy) { true }
-        subject.containers.each do |container|
-          container.stub(:teardown) { true }
-        end
-        subject.networks.each do |network|
-          network.stub(:teardown) { true }
-        end
+        subject.stub(:state) { :running }
         subject.teardown
       end
     end

data/spec/provisioners/shell_spec.rb

@@ -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.provisioners.last.new(subject.config, @ui).setup(subject)
+          subject.provisioners.last.new(subject.config, @ui).on_container_setup(subject)
         end
       end
 
@@ -50,7 +50,7 @@ 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.provisioners.last.new(subject.config, @ui).setup(subject) }.should raise_error TestLab::ContainerError
+          lambda{ subject.provisioners.last.new(subject.config, @ui).on_container_setup(subject) }.should raise_error TestLab::ContainerError
         end
       end
     end

data/spec/support/Labfile

@@ -33,9 +33,9 @@ node :localhost do
   })
 
   network 'testnet' do
-    address '192.168.255.254/16'
-    bridge  :br0
-    route   true
+    provisioners  [TestLab::Provisioner::Route]
+    address       '192.168.255.254/16'
+    bridge        :br0
   end
 
   # DUAL NICs

data/testlab.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.version       = TestLab::VERSION
   spec.authors       = ["Zachary Patten"]
   spec.email         = ["zachary AT jovelabs DOT com"]
-  spec.description   = %q{A framework for building lightweight virtual infrastructure using LXC}
-  spec.summary       = %q{A framework for building lightweight virtual infrastructure using LXC}
+  spec.description   = %q{A toolkit for building virtual computer labs}
+  spec.summary       = %q{A toolkit for building virtual computer labs}
   spec.homepage      = "https://github.com/zpatten/testlab"
   spec.license       = "Apache 2.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -187,7 +187,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A framework for building lightweight virtual infrastructure using LXC
+description: A toolkit for building virtual computer labs
 email:
 - zachary AT jovelabs DOT com
 executables:
@@ -206,12 +206,17 @@ files:
 - README.md
 - Rakefile
 - bin/tl
+- lib/commands/container.rb
+- lib/commands/network.rb
+- lib/commands/node.rb
+- lib/commands/testlab.rb
 - lib/testlab.rb
 - lib/testlab/container.rb
 - lib/testlab/container/actions.rb
 - lib/testlab/container/class_methods.rb
 - lib/testlab/container/generators.rb
 - lib/testlab/container/interface.rb
+- lib/testlab/container/io.rb
 - lib/testlab/container/lifecycle.rb
 - lib/testlab/container/lxc.rb
 - lib/testlab/container/method_missing.rb
@@ -249,6 +254,7 @@ files:
 - lib/testlab/provisioners/omnitruck.rb
 - lib/testlab/provisioners/raring.rb
 - lib/testlab/provisioners/resolv.rb
+- lib/testlab/provisioners/route.rb
 - lib/testlab/provisioners/shell.rb
 - lib/testlab/provisioners/templates/apt/bootstrap.erb
 - lib/testlab/provisioners/templates/apt_cacher_ng/00proxy.erb
@@ -265,6 +271,7 @@ files:
 - lib/testlab/user/lifecycle.rb
 - lib/testlab/utility.rb
 - lib/testlab/utility/cidr.rb
+- lib/testlab/utility/logger.rb
 - lib/testlab/utility/misc.rb
 - lib/testlab/version.rb
 - spec/container_spec.rb
@@ -293,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1637961077093843979
+      hash: -2743048303371547587
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -302,13 +309,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1637961077093843979
+      hash: -2743048303371547587
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A framework for building lightweight virtual infrastructure using LXC
+summary: A toolkit for building virtual computer labs
 test_files:
 - spec/container_spec.rb
 - spec/network_spec.rb