testlab 0.0.3 → 0.0.4

data/lib/testlab/node.rb

@@ -1,5 +1,3 @@
-require 'lxc'
-
 class TestLab
 
   # Node Error Class
@@ -19,111 +17,57 @@ class TestLab
 
     attribute  :provider
     attribute  :config
+    attribute  :components
 
-    def initialize(*args)
-      super(*args)
-
-      @ui       = TestLab.ui
-      @provider = self.provider.new(self.config)
-    end
 
-    def status
-      {
-        :instance_id => @provider.instance_id,
-        :state => @provider.state,
-        :user => @provider.user,
-        :ip => @provider.ip,
-        :port => @provider.port,
-        :provider => @provider.class,
-        :con => self.containers.count,
-        :net => self.networks.count,
-        :rtr => self.routers.count
-      }
-    end
+    autoload :Bind,      'testlab/node/bind'
+    autoload :Lifecycle, 'testlab/node/lifecycle'
+    autoload :LXC,       'testlab/node/lxc'
+    autoload :Resolv,    'testlab/node/resolv'
+    autoload :SSH,       'testlab/node/ssh'
+    autoload :Status,    'testlab/node/status'
 
-    # SSH to the Node
-    def ssh(options={})
-      if (!defined?(@ssh) || @ssh.nil?)
-        @ssh ||= ZTK::SSH.new({:ui => @ui, :timeout => 1200, :silence => true}.merge(options))
-        @ssh.config do |c|
-          c.host_name = @provider.ip
-          c.user      = @provider.user
-          c.keys      = @provider.identity
-        end
-      end
-      @ssh
-    end
+    include TestLab::Node::Bind
+    include TestLab::Node::Lifecycle
+    include TestLab::Node::LXC
+    include TestLab::Node::Resolv
+    include TestLab::Node::SSH
+    include TestLab::Node::Status
 
-    # SSH to a container running on the Node
-    def ssh_container(id, options={})
-    end
 
-    # Returns the LXC object for this Node
-    #
-    # This object is used to control containers on the node via it's provider
-    def lxc(options={})
-      if (!defined?(@lxc) || @lxc.nil?)
-        @lxc ||= LXC.new
-        @lxc.use_sudo = true
-        @lxc.use_ssh = self.ssh
-      end
-      @lxc
-    end
+    def initialize(*args)
+      super(*args)
 
-    def arch
-      @arch ||= self.ssh.exec(%(uname -m)).output.strip
+      @ui       = TestLab.ui
+      @provider = self.provider.new(self.config)
     end
 
 ################################################################################
 
-    # Callback: After Create
-    # Ensure our packages are installed.
-    def after_create
-      self.ssh.exec(%(sudo apt-get -qq -y --force-yes update))
-      self.ssh.exec(%(sudo apt-get -qq -y --force-yes install lxc bridge-utils debootstrap yum isc-dhcp-server bind9 ntpdate ntp))
-    end
-
-    # Callback: After Up
-    def after_up
+    # Iterates an array of arrays calling the specified method on all the
+    # collections of objects
+    def call_collections(collections, method_name)
+      collections.each do |collection|
+        call_methods(collection, method_name)
+      end
     end
 
-################################################################################
-
-    # Provides a generic interface for triggering our callback framework
-    def proxy_callbacks(action, objects, method_name, *method_args)
-      callback_method = "#{action}_#{method_name}".to_sym
-
+    # Calls the specified method on all the objects supplied
+    def call_methods(objects, method_name)
       objects.each do |object|
-        if object.respond_to?(callback_method)
-          object.send(callback_method, *method_args)
+        if object.respond_to?(method_name)
+          object.send(method_name)
         end
       end
     end
 
-    # Provides a generic interface for triggering our callback framework
-    def self_callbacks(action, method_name, *method_args)
-      callback_method = "#{action}_#{method_name}".to_sym
-
-      if self.respond_to?(callback_method)
-        self.send(callback_method, *method_args)
-      end
-    end
-
     # Method missing handler
     def method_missing(method_name, *method_args)
       @ui.logger.debug { "NODE METHOD MISSING: #{method_name.inspect}(#{method_args.inspect})" }
 
       if TestLab::Provider::PROXY_METHODS.include?(method_name)
         result = nil
-        object_collections = [self.containers, self.routers, self.networks]
 
-        self_callbacks(:before, method_name, *method_args)
-
-        object_collections.each do |object_collection|
-          proxy_callbacks(:before, object_collection, method_name, *method_args)
-        end
-
-        @ui.logger.debug { "method_name == #{method_name.inspect}" }
         if @provider.respond_to?(method_name)
           @ui.logger.debug { "@provider.send(#{method_name.inspect}, #{method_args.inspect})" }
           result = @provider.send(method_name, *method_args)
@@ -131,18 +75,21 @@ class TestLab
           raise TestLab::ProviderError, "Your provider does not respond to the method '#{method_name}'!"
         end
 
-        self_callbacks(:after, method_name, *method_args)
-
-        object_collections.reverse.each do |object_collection|
-          proxy_callbacks(:after, object_collection, method_name, *method_args)
-        end
-
         result
       else
         super(method_name, *method_args)
       end
     end
 
+    class << self
+
+      # Returns the path to the gems provider templates
+      def template_dir
+        File.join(TestLab.gem_dir, "lib", "testlab", "node", "templates")
+      end
+
+    end
+
   end
 
 end

data/lib/testlab/providers/vagrant.rb

@@ -192,7 +192,15 @@ class TestLab
 
         vagrantfile_template = File.join(TestLab::Provider.template_dir, "vagrant", "Vagrantfile.erb")
         vagrantfile          = File.join(@config[:repo], "Vagrantfile")
-        IO.write(vagrantfile, ZTK::Template.render(vagrantfile_template, context))
+
+        # 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))
+        end
       end
 
 ################################################################################

data/lib/testlab/provisioner.rb

@@ -7,7 +7,6 @@ class TestLab
   #
   # @author Zachary Patten <zachary@jovelabs.net>
   class Provisioner
-
     autoload :Shell, 'testlab/provisioners/shell'
     autoload :Chef, 'testlab/provisioners/chef'
 

data/lib/testlab/router.rb

@@ -37,27 +37,22 @@ class TestLab
       @ui.logger.debug { "Router Down: #{self.id} " }
     end
 
-    # Reload the router
-    def reload
-      self.down
-      self.up
-    end
-
     # State of the router
     def state
     end
 
     # Router Callback: after_up
-    def after_up
+    def setup
       @ui.logger.debug { "Router Callback: After Up: #{self.id} " }
       self.create
       self.up
     end
 
     # Router Callback: before_down
-    def before_down
+    def teardown
       @ui.logger.debug { "Router Callback: Before Down: #{self.id} " }
       self.down
+      self.destroy
     end
 
     # Method missing handler

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -22,11 +22,13 @@ class TestLab
 
   @@ui ||= nil
 
-  def initialize(ui=ZTK::UI.new)
-    labfile = ZTK::Locator.find('Labfile')
+  def initialize(options={})
+    labfile      = (options[:labfile] || 'Labfile')
+    labfile_path = ZTK::Locator.find(labfile)
 
-    @@ui          = ui
-    @labfile      = TestLab::Labfile.load(labfile)
+    @@ui         = (options[:ui] || ZTK::UI.new)
+
+    @labfile     = TestLab::Labfile.load(labfile_path)
   end
 
   def nodes
@@ -82,8 +84,20 @@ class TestLab
     end
   end
 
+  def setup
+    self.dead? and raise TestLabError, "You must have a running node in order to setup your infrastructure!"
+
+    node_method_proxy(:setup)
+  end
+
+  def teardown
+    self.dead? and raise TestLabError, "You must have a running node in order to teardown your infrastructure!"
+
+    node_method_proxy(:teardown)
+  end
+
   # Proxy various method calls to our subordinate classes
-  def method_proxy(method_name, *method_args)
+  def node_method_proxy(method_name, *method_args)
     @@ui.logger.debug { "TestLab.#{method_name}" }
     TestLab::Node.all.map do |node|
       node.send(method_name.to_sym, *method_args)
@@ -94,8 +108,8 @@ class TestLab
   def method_missing(method_name, *method_args)
     @@ui.logger.debug { "TESTLAB METHOD MISSING: #{method_name.inspect}(#{method_args.inspect})" }
 
-    if TestLab::Provider::PROXY_METHODS.include?(method_name)
-      method_proxy(method_name, *method_args)
+    if TestLab::Provider::PROXY_METHODS.include?(method_name) # || %w(setup teardown).map(&:to_sym).include?(method_name))
+      node_method_proxy(method_name, *method_args)
     else
       super(method_name, *method_args)
     end

data/spec/spec_helper.rb

@@ -21,3 +21,5 @@ require 'coveralls'
 Coveralls.wear!
 ################################################################################
 require 'testlab'
+
+LABFILE = File.join(File.dirname(__FILE__), 'support', 'Labfile')

data/spec/testlab_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe TestLab do
 
-  subject { TestLab.new(File.join(File.dirname(__FILE__), 'support', 'Labfile')) }
+  subject { TestLab.new(:labfile => LABFILE) }
 
   describe "class" do
 

data/testlab.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.version       = TestLab::VERSION
   spec.authors       = ["Zachary Patten"]
   spec.email         = ["zachary@jovelabs.com"]
-  spec.description   = %q{A framework for building virtual laboratories}
-  spec.summary       = %q{A framework for building virtual laboratories}
+  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.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.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lxc
@@ -139,7 +139,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A framework for building virtual laboratories
+description: A framework for building lightweight virtual infrastructure using LXC
 email:
 - zachary@jovelabs.com
 executables:
@@ -160,9 +160,31 @@ files:
 - bin/testlab-console
 - lib/testlab.rb
 - lib/testlab/container.rb
+- lib/testlab/container/actions.rb
+- lib/testlab/container/generators.rb
+- lib/testlab/container/lifecycle.rb
+- lib/testlab/container/lxc.rb
+- lib/testlab/container/network.rb
+- lib/testlab/container/status.rb
 - lib/testlab/labfile.rb
 - lib/testlab/network.rb
+- lib/testlab/network/actions.rb
+- lib/testlab/network/cidr.rb
+- lib/testlab/network/lifecycle.rb
+- lib/testlab/network/status.rb
 - lib/testlab/node.rb
+- lib/testlab/node/bind.rb
+- lib/testlab/node/lifecycle.rb
+- lib/testlab/node/lxc.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-setup.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
@@ -195,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2122627985172332229
+      hash: -3944268925164045043
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,13 +226,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2122627985172332229
+      hash: -3944268925164045043
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A framework for building virtual laboratories
+summary: A framework for building lightweight virtual infrastructure using LXC
 test_files:
 - spec/provider_spec.rb
 - spec/provisioner_spec.rb