testlab 0.5.4 → 0.6.0

data/lib/testlab/provisioners/chef_gem.rb

@@ -15,10 +15,6 @@ class TestLab
         @config = (config || Hash.new)
         @ui     = (ui || TestLab.ui)
 
-        @config[:version]     ||= "latest"
-        @config[:prereleases] ||= false
-        @config[:nightlies]   ||= false
-
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
@@ -31,21 +27,9 @@ class TestLab
       #   provision.
       # @return [Boolean] True if successful.
       def setup(container)
-        omnibus_template = File.join(TestLab::Provisioner.template_dir, 'chef', 'omnitruck.erb')
-        config = {}.merge!({
-          :server_name => container.fqdn,
-          :chef_pre_11 => chef_pre_11?,
-          :chef_solo_attributes => build_chef_solo_attributes(container),
-          :chef_validator => (chef_pre_11? ? '/etc/chef/validation.pem' : '/etc/chef-server/chef-validator.pem'),
-          :chef_webui => (chef_pre_11? ? '/etc/chef/webui.pem' : '/etc/chef-server/chef-webui.pem'),
-          :chef_admin => (chef_pre_11? ? '/etc/chef/admin.pem' : '/etc/chef-server/admin.pem'),
-          :default_password => "p@ssw01d",
-          :user => ENV['USER'],
-          :hostname_short => container.id,
-          :hostname_full => container.fqdn,
-          :omnibus_version => omnibus_version
-        }).merge!(@config)
-        container.bootstrap(ZTK::Template.render(omnibus_template, config))
+        # NOOP
+
+        true
       end
 
       # ChefGem Provisioner Container Teardown
@@ -59,68 +43,6 @@ class TestLab
         true
       end
 
-    private
-
-      def build_chef_solo_10_attributes(container)
-        {
-          "chef_server" => {
-            "url" => "https://#{container.fqdn}",
-            "webui_enabled" => true
-          },
-          "run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server::apache-proxy])
-        }
-      end
-
-      def build_chef_solo_11_attributes(container)
-        {
-          "chef-server" => {
-            "api_fqdn" => container.fqdn,
-            "nginx" => {
-              "enable_non_ssl" => true,
-              "server_name" => container.fqdn,
-              "url" => "https://#{container.fqdn}"
-            },
-            "lb" => {
-              "fqdn" => container.fqdn
-            },
-            "bookshelf" => {
-              "vip" => container.fqdn
-            },
-            "chef_server_webui" => {
-              "enable" => true
-            },
-            "version" => @config[:version],
-            "prereleases" => @config[:prereleases],
-            "nightlies" => @config[:nightlies]
-          },
-          "run_list" => %w(recipe[chef-server::default])
-        }
-      end
-
-      def build_chef_solo_attributes(container)
-        if chef_pre_11?
-          build_chef_solo_10_attributes(container)
-        else
-          build_chef_solo_11_attributes(container)
-        end
-      end
-
-      def chef_pre_11?
-        if (@config[:version].to_s.downcase != "latest") && (@config[:version].to_f < 11.0)
-          true
-        else
-          false
-        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/raring.rb

@@ -0,0 +1,37 @@
+class TestLab
+
+  class Provisioner
+
+    # Ubuntu Raring Provisioner Error Class
+    class RaringError < ProvisionerError; end
+
+    # Ubuntu Raring Provisioner Class
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    class Raring
+
+      def initialize(config={}, ui=nil)
+        @config = (config || Hash.new)
+        @ui     = (ui     || TestLab.ui)
+
+        @config[:raring] ||= Hash.new
+
+        @ui.logger.debug { "config(#{@config.inspect})" }
+      end
+
+      # Ubuntu Raring 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 { "Ubuntu Raring Provisioner: Node #{node.id}" }
+
+        bootstrap_template = File.join(TestLab::Provisioner.template_dir, "raring", "bootstrap.erb")
+        node.ssh.bootstrap(ZTK::Template.render(bootstrap_template, @config))
+      end
+
+    end
+
+  end
+end

data/lib/testlab/provisioners/resolv.rb

@@ -0,0 +1,61 @@
+class TestLab
+
+  class Provisioner
+
+    # Resolv Provisioner Error Class
+    class ResolvError < ProvisionerError; end
+
+    # Resolv Provisioner Class
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    class Resolv
+
+      def initialize(config={}, ui=nil)
+        @config = (config || Hash.new)
+        @ui     = (ui     || TestLab.ui)
+
+        @config[:resolv] ||= Hash.new
+        @config[:resolv][:servers] ||= [TestLab::Network.ips, "8.8.8.8", "8.8.4.4" ].flatten.compact.uniq
+        @config[:resolv][:search]  ||= TestLab::Container.domains.join(' ')
+
+        @ui.logger.debug { "config(#{@config.inspect})" }
+      end
+
+      # Resolv 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 { "RESOLV Provisioner: Node #{node.id}" }
+
+        render_resolv_conf(node)
+
+        true
+      end
+
+      # Resolv 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 { "RESOLV Provisioner: Container #{container.id}" }
+
+        render_resolv_conf(container)
+
+        true
+      end
+
+      def render_resolv_conf(object)
+        resolv_conf_template = File.join(TestLab::Provisioner.template_dir, "resolv", "resolv.conf.erb")
+
+        object.ssh.file(:target => File.join("/etc/resolv.conf"), :chown => "root:root") do |file|
+          file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} RESOLVER Configuration"))
+          file.puts(ZTK::Template.render(resolv_conf_template, @config))
+        end
+      end
+
+    end
+
+  end
+end

data/lib/testlab/provisioners/shell.rb

@@ -32,17 +32,6 @@ class TestLab
         true
       end
 
-      # Shell Provisioner Container Teardown
-      #
-      # This is a NO-OP currently.
-      #
-      # @return [Boolean] True if successful.
-      def teardown(container)
-        # NOOP
-
-        true
-      end
-
     end
 
   end

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

@@ -0,0 +1,11 @@
+set -x
+
+export DEBIAN_FRONTEND="noninteractive"
+
+apt-get -y --force-yes 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 -%>

data/lib/testlab/provisioners/templates/apt_cacher_ng/00proxy.erb

@@ -0,0 +1,4 @@
+Acquire::HTTP::Proxy "<%= @apt[:cacher_ng][:proxy_url] %>";
+<% [@apt[:cacher_ng][:exclude_hosts]].flatten.compact.each do |exclude_host| -%>
+Acquire::HTTP::Proxy::<%= exclude_host %> "DIRECT";
+<% end -%>

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

@@ -0,0 +1,7 @@
+set -x
+
+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

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

@@ -1,4 +1,6 @@
 set -x
+
+export DEBIAN_FRONTEND="noninteractive"
 cd /tmp
 apt-get -y install wget || yum -y install wget
 rm -fv /tmp/install.sh

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

@@ -2,7 +2,7 @@
 <%= ZTK::Template.do_not_edit_notice(:message => "OmniTruck Bootstrap") %>
 set -x
 
-DEBIAN_FRONTEND="noninteractive"
+export DEBIAN_FRONTEND="noninteractive"
 CHEF_SOLO_ROOT="/tmp/chef-solo"
 KNIFE_CONFIG_EXP_FILE="/tmp/knife-config.exp"
 export DEBIAN_FRONTEND CHEF_SOLO_ROOT KNIFE_CONFIG_EXP_FILE

data/lib/testlab/{node/templates/node-setup.erb → provisioners/templates/raring/bootstrap.erb}

@@ -1,5 +1,7 @@
 set -x
 
+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

data/lib/testlab/provisioners/templates/resolv/resolv.conf.erb

@@ -0,0 +1,9 @@
+<% if !@resolv[:domain].nil? -%>
+domain <%= @resolv[:domain] %>
+<% end -%>
+<% if !@resolv[:search].nil? -%>
+search <%= @resolv[:search] %>
+<% end -%>
+<% @resolv[:servers].each do |server| -%>
+nameserver <%= server %>
+<% end -%>

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -162,6 +162,46 @@ class TestLab
     !alive?
   end
 
+  # Test Lab Up
+  #
+  # Attempts to up our lab topology.  This calls the up method on all of
+  # our nodes.
+  #
+  # @return [Boolean] True if successful.
+  def up
+    @labfile.nodes.map do |node|
+      node.up
+      node.networks.map do |network|
+        network.up
+      end
+      node.containers.map do |container|
+        container.up
+      end
+    end
+
+    true
+  end
+
+  # Test Lab Down
+  #
+  # Attempts to down our lab topology.  This calls the down method on all of
+  # our nodes.
+  #
+  # @return [Boolean] True if successful.
+  def down
+    @labfile.nodes.map do |node|
+      node.containers.map do |container|
+        container.down
+      end
+      node.networks.map do |network|
+        network.down
+      end
+      node.down
+    end
+
+    true
+  end
+
   # Test Lab Setup
   #
   # Attempts to setup our lab topology.  This calls the setup method on all of
@@ -169,7 +209,15 @@ class TestLab
   #
   # @return [Boolean] True if successful.
   def setup
-    node_method_proxy(:setup)
+    @labfile.nodes.map do |node|
+      node.setup
+      node.networks.map do |network|
+        network.setup
+      end
+      node.containers.map do |container|
+        container.setup
+      end
+    end
 
     true
   end
@@ -181,7 +229,15 @@ class TestLab
   #
   # @return [Boolean] True if successful.
   def teardown
-    node_method_proxy(:teardown)
+    @labfile.nodes.map do |node|
+      node.containers.map do |container|
+        container.teardown
+      end
+      node.networks.map do |network|
+        network.teardown
+      end
+      node.teardown
+    end
 
     true
   end

data/spec/node_spec.rb

@@ -43,22 +43,6 @@ describe TestLab::Node do
       end
     end
 
-    describe "#bind_setup" do
-      it "should setup bind" do
-        subject.ssh.stub(:exec) { true }
-        subject.ssh.stub(:file).and_yield(StringIO.new)
-        subject.bind_setup
-      end
-    end
-
-    describe "#build_resolv_conf" do
-      it "should build resolv.conf" do
-        subject.ssh.stub(:exec) { true }
-        subject.ssh.stub(:file).and_yield(StringIO.new)
-        subject.build_resolv_conf
-      end
-    end
-
     describe "#status" do
       it "should return a hash of status information about the node" do
         subject.instance_variable_get(:@provider).stub(:state) { :not_created }
@@ -112,11 +96,10 @@ describe TestLab::Node do
 
     describe "setup" 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(:build_resolv_conf) { true }
-        subject.stub(:bind_setup) { true }
-        subject.stub(:bind_reload) { true }
         subject.stub(:create) { true }
         subject.stub(:up) { true }
         subject.containers.each do |container|
@@ -131,6 +114,8 @@ describe TestLab::Node do
 
     describe "teardown" 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 }

data/spec/provisioners/shell_spec.rb

@@ -30,7 +30,7 @@ describe TestLab::Provisioner::Shell do
   describe "class" do
 
     it "should be an instance of TestLab::Provisioner::Shell" do
-      subject.provisioners.first.new(subject.config, @ui).should be_an_instance_of TestLab::Provisioner::Shell
+      subject.provisioners.last.new(subject.config, @ui).should be_an_instance_of TestLab::Provisioner::Shell
     end
 
   end
@@ -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.first.new(subject.config, @ui).setup(subject)
+          subject.provisioners.last.new(subject.config, @ui).setup(subject)
         end
       end
 
@@ -50,17 +50,11 @@ 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.first.new(subject.config, @ui).setup(subject) }.should raise_error TestLab::ContainerError
+          lambda{ subject.provisioners.last.new(subject.config, @ui).setup(subject) }.should raise_error TestLab::ContainerError
         end
       end
     end
 
-    describe "teardown" do
-      it "should decomission the container" do
-        subject.provisioners.first.new(subject.config, @ui).teardown(subject)
-      end
-    end
-
   end
 
 end

data/spec/support/Labfile

@@ -9,17 +9,18 @@ EOF
 
 REPO = File.dirname(__FILE__)
 
-config Hash[
+config ({
   :domain => "default.zone",
   :repo => REPO
-]
+})
 
 node :localhost do
 
-  components %w(resolv bind)
-
-  provider    TestLab::Provider::Vagrant
-  config      Hash[
+  provider      TestLab::Provider::Vagrant
+  provisioners  [
+    TestLab::Provisioner::Bind
+  ]
+  config        ({
     :vagrant => {
       :id       => "mytestlab-#{ENV['USER']}".downcase,
       :ip       => "192.168.255.1",
@@ -29,7 +30,7 @@ node :localhost do
       :memory   => 512,
       :file     => REPO
     }
-  ]
+  })
 
   network 'testnet' do
     address '192.168.255.254/16'
@@ -42,6 +43,12 @@ node :localhost do
     distro        "ubuntu"
     release       "precise"
 
+    provisioners  [
+      TestLab::Provisioner::Resolv,
+      TestLab::Provisioner::AptCacherNG,
+      TestLab::Provisioner::Apt
+    ]
+
     interface do
       name       :eth0
       network_id 'testnet'
@@ -61,6 +68,12 @@ node :localhost do
     distro        "ubuntu"
     release       "precise"
 
+    provisioners  [
+      TestLab::Provisioner::Resolv,
+      TestLab::Provisioner::AptCacherNG,
+      TestLab::Provisioner::Apt
+    ]
+
     interface do
       name       :eth0
       network_id 'testnet'
@@ -73,11 +86,17 @@ node :localhost do
     distro        "ubuntu"
     release       "precise"
 
-    provisioners  [TestLab::Provisioner::Shell]
-    config        Hash[
+    provisioners  [
+      TestLab::Provisioner::Resolv,
+      TestLab::Provisioner::AptCacherNG,
+      TestLab::Provisioner::Apt,
+      TestLab::Provisioner::Shell
+    ]
+
+    config        ({
       :shell => "/bin/bash",
       :script => shell_provision_script
-    ]
+    })
 
     interface do
       name       :eth0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -229,32 +229,38 @@ files:
 - lib/testlab/network/status.rb
 - lib/testlab/node.rb
 - lib/testlab/node/actions.rb
-- lib/testlab/node/bind.rb
 - lib/testlab/node/class_methods.rb
 - lib/testlab/node/lifecycle.rb
 - lib/testlab/node/lxc.rb
 - lib/testlab/node/method_missing.rb
-- lib/testlab/node/resolv.rb
 - lib/testlab/node/ssh.rb
 - lib/testlab/node/status.rb
-- lib/testlab/node/templates/bind-db.erb
-- lib/testlab/node/templates/bind-zone.erb
-- lib/testlab/node/templates/bind.erb
-- lib/testlab/node/templates/node-setup.erb
-- lib/testlab/node/templates/resolv.erb
 - lib/testlab/provider.rb
 - lib/testlab/providers/aws.rb
 - lib/testlab/providers/local.rb
 - lib/testlab/providers/templates/vagrant/Vagrantfile.erb
 - lib/testlab/providers/vagrant.rb
 - lib/testlab/provisioner.rb
+- lib/testlab/provisioners/apt.rb
 - lib/testlab/provisioners/apt_cacher_ng.rb
+- lib/testlab/provisioners/bind.rb
 - lib/testlab/provisioners/chef_gem.rb
 - lib/testlab/provisioners/omnibus.rb
 - lib/testlab/provisioners/omnitruck.rb
+- lib/testlab/provisioners/raring.rb
+- lib/testlab/provisioners/resolv.rb
 - lib/testlab/provisioners/shell.rb
+- lib/testlab/provisioners/templates/apt/bootstrap.erb
+- lib/testlab/provisioners/templates/apt_cacher_ng/00proxy.erb
+- lib/testlab/provisioners/templates/apt_cacher_ng/bootstrap.erb
+- lib/testlab/provisioners/templates/bind/bind-db.erb
+- lib/testlab/provisioners/templates/bind/bind-zone.erb
+- lib/testlab/provisioners/templates/bind/bind.erb
 - lib/testlab/provisioners/templates/chef/omnibus.erb
 - lib/testlab/provisioners/templates/chef/omnitruck.erb
+- lib/testlab/provisioners/templates/chef/rubygem.erb
+- lib/testlab/provisioners/templates/raring/bootstrap.erb
+- lib/testlab/provisioners/templates/resolv/resolv.conf.erb
 - lib/testlab/user.rb
 - lib/testlab/user/lifecycle.rb
 - lib/testlab/utility.rb
@@ -287,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2280277308738300092
+      hash: 2170053698694927612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -296,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2280277308738300092
+      hash: 2170053698694927612
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/testlab/node/resolv.rb

@@ -1,29 +0,0 @@
-class TestLab
-  class Node
-
-    module Resolv
-      require 'tempfile'
-
-      # Builds the main resolv configuration sections
-      def build_resolv_main_conf(file)
-        resolv_conf_template = File.join(self.class.template_dir, "resolv.erb")
-
-        context = {
-          :servers => [TestLab::Network.ips, "8.8.8.8", "8.8.4.4" ].flatten,
-          :search => TestLab::Container.domains.join(' ')
-        }
-
-        file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} RESOLVER Configuration"))
-        file.puts(ZTK::Template.render(resolv_conf_template, context))
-      end
-
-      def build_resolv_conf
-        self.ssh.file(:target => File.join("/etc/resolv.conf"), :chown => "root:root") do |file|
-          build_resolv_main_conf(file)
-        end
-      end
-
-    end
-
-  end
-end

data/lib/testlab/node/templates/resolv.erb

@@ -1,4 +0,0 @@
-search <%= @search %>
-<% @servers.each do |server| -%>
-nameserver <%= server %>
-<% end -%>