testlab 0.0.4 → 0.1.0

data/lib/testlab/container/actions.rb

@@ -7,8 +7,10 @@ class TestLab
       def create
         @ui.logger.debug { "Container Create: #{self.id} " }
 
+        self.domain  ||= self.node.labfile.config[:domain]
         self.distro  ||= "ubuntu"
         self.release ||= "precise"
+
         self.arch    ||= detect_arch
 
         self.lxc.config.clear

data/lib/testlab/container/class_methods.rb

@@ -0,0 +1,16 @@
+class TestLab
+  class Container
+
+    module ClassMethods
+
+      def domains
+        self.all.map do |container|
+          container.domain ||= container.node.labfile.config[:domain]
+          container.domain
+        end.compact
+      end
+
+    end
+
+  end
+end

data/lib/testlab/container/interface.rb

@@ -0,0 +1,43 @@
+class TestLab
+  class Container
+
+    module Interface
+
+      def ip
+        TestLab::Utility.ip(self.primary_interface.last[:ip])
+      end
+
+      # Returns the CIDR of the container
+      def cidr
+        TestLab::Utility.cidr(self.primary_interface.last[:ip]).to_i
+      end
+
+      def ptr
+        octets = self.ip.split('.')
+
+        result = case self.cidr
+        when 0..7 then
+          octets[-4,4]
+        when 8..15 then
+          octets[-3,3]
+        when 16..23 then
+          octets[-2,2]
+        when 24..31 then
+          octets[-1,1]
+        end
+
+        result.reverse.join('.')
+      end
+
+      def primary_interface
+        if self.interfaces.any?{ |i,c| c[:primary] == true }
+          self.interfaces.find{ |i,c| c[:primary] == true }
+        else
+          self.interfaces.first
+        end
+      end
+
+    end
+
+  end
+end

data/lib/testlab/container/lxc.rb

@@ -11,6 +11,18 @@ class TestLab
         @lxc ||= self.node.lxc.container(self.id)
       end
 
+      # SSH to the container
+      def ssh(options={})
+        self.node.container_ssh(self, options)
+      end
+
+      # Does the container exist?
+      def exists?
+        @ui.logger.debug { "Container Exists?: #{self.id} " }
+
+        self.lxc.exists?
+      end
+
       # Returns arguments for lxc-create based on our distro
       #
       # @return [Array] An array of arguments for lxc-create
@@ -37,6 +49,28 @@ class TestLab
         end
       end
 
+      # Builds an array of hashes containing the lxc configuration options for
+      # our networks
+      def build_lxc_network_conf(interfaces)
+        networks = Array.new
+
+        interfaces.each do |network, network_config|
+          networks << Hash[
+            'lxc.network.type'         => :veth,
+            'lxc.network.flags'        => :up,
+            'lxc.network.link'         => TestLab::Network.first(network).bridge,
+            'lxc.network.name'         => network_config[:name],
+            'lxc.network.hwaddr'       => network_config[:mac],
+            'lxc.network.ipv4'         => network_config[:ip]
+          ]
+          if (network_config[:primary] == true) || (interfaces.count == 1)
+            networks.last.merge!('lxc.network.ipv4.gateway' => :auto)
+          end
+        end
+
+        networks
+      end
+
     end
 
   end

data/lib/testlab/container/method_missing.rb

@@ -0,0 +1,20 @@
+class TestLab
+  class Container
+
+    module MethodMissing
+
+      # Method missing handler
+      def method_missing(method_name, *method_args)
+        @ui.logger.debug { "CONTAINER METHOD MISSING: #{method_name.inspect}(#{method_args.inspect})" }
+
+        if (defined?(@provisioner) && @provisioner.respond_to?(method_name))
+          @provisioner.send(method_name, [self, *method_args].flatten)
+        else
+          super(method_name, *method_args)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/testlab/container/status.rb

@@ -3,11 +3,17 @@ class TestLab
 
     module Status
 
+      def fqdn
+        self.domain ||= self.node.labfile.config[:domain]
+
+        [self.id, self.domain].join('.')
+      end
+
       def status
         interfaces = self.interfaces.collect{ |network, network_config| "#{network}:#{network_config[:name]}:#{network_config[:ip]}" }.join(', ')
-
         {
           :id => self.id,
+          :fqdn => self.fqdn,
           :state => self.state,
           :distro => self.distro,
           :release => self.release,

data/lib/testlab/container.rb

@@ -7,8 +7,29 @@ class TestLab
   #
   # @author Zachary Patten <zachary@jovelabs.net>
   class Container < ZTK::DSL::Base
-    STATUS_KEYS   = %w(node_id id state distro release interfaces provisioner).map(&:to_sym)
+    STATUS_KEYS   = %w(node_id id fqdn state distro release interfaces provisioner).map(&:to_sym)
+
+    # Sub-Modules
+    autoload :Actions,       'testlab/container/actions'
+    autoload :ClassMethods,  'testlab/container/class_methods'
+    autoload :Generators,    'testlab/container/generators'
+    autoload :Interface,     'testlab/container/interface'
+    autoload :Lifecycle,     'testlab/container/lifecycle'
+    autoload :LXC,           'testlab/container/lxc'
+    autoload :MethodMissing, 'testlab/container/method_missing'
+    autoload :Status,        'testlab/container/status'
 
+    include TestLab::Container::Actions
+    include TestLab::Container::Generators
+    include TestLab::Container::Interface
+    include TestLab::Container::Lifecycle
+    include TestLab::Container::LXC
+    include TestLab::Container::MethodMissing
+    include TestLab::Container::Status
+
+    extend  TestLab::Container::ClassMethods
+
+    # Associations and Attributes
     belongs_to  :node,        :class_name => 'TestLab::Node'
 
     attribute   :provisioner
@@ -28,21 +49,6 @@ class TestLab
     attribute   :persist
 
 
-    autoload :Actions,    'testlab/container/actions'
-    autoload :Generators, 'testlab/container/generators'
-    autoload :Lifecycle,  'testlab/container/lifecycle'
-    autoload :LXC,        'testlab/container/lxc'
-    autoload :Network,    'testlab/container/network'
-    autoload :Status,     'testlab/container/status'
-
-    include TestLab::Container::Actions
-    include TestLab::Container::Generators
-    include TestLab::Container::Lifecycle
-    include TestLab::Container::LXC
-    include TestLab::Container::Network
-    include TestLab::Container::Status
-
-
     def initialize(*args)
       super(*args)
 
@@ -50,77 +56,6 @@ class TestLab
       @provisioner = self.provisioner.new(self.config) if !self.provisioner.nil?
     end
 
-################################################################################
-
-    # Does the container exist?
-    def exists?
-      @ui.logger.debug { "Container Exists?: #{self.id} " }
-
-      self.lxc.exists?
-    end
-
-################################################################################
-
-    # SSH to the container
-    def ssh(options={})
-      self.node.container_ssh(self, options)
-    end
-
-    def ip
-      self.primary_interface.last[:ip].split('/').first
-    end
-
-    # Returns the CIDR of the container
-    def cidr
-      self.primary_interface.last[:ip].split('/').last.to_i
-    end
-
-    def ptr
-      octets = self.ip.split('.')
-
-      result = case self.cidr
-      when 0..7 then
-        octets[-4,4]
-      when 8..15 then
-        octets[-3,3]
-      when 16..23 then
-        octets[-2,2]
-      when 24..31 then
-        octets[-1,1]
-      end
-
-      result.reverse.join('.')
-    end
-
-    def primary_interface
-      if self.interfaces.any?{ |i,c| c[:primary] == true }
-        self.interfaces.find{ |i,c| c[:primary] == true }
-      else
-        self.interfaces.first
-      end
-    end
-
-    class << self
-
-      def domains
-        self.all.map(&:domain).compact
-      end
-
-    end
-
-################################################################################
-
-    # Method missing handler
-    def method_missing(method_name, *method_args)
-      @ui.logger.debug { "CONTAINER METHOD MISSING: #{method_name.inspect}(#{method_args.inspect})" }
-
-      if (defined?(@provisioner) && @provisioner.respond_to?(method_name))
-        @provisioner.send(method_name, [self, *method_args].flatten)
-      else
-        super(method_name, *method_args)
-      end
-    end
-
   end
 
 end

data/lib/testlab/network/bind.rb

@@ -0,0 +1,19 @@
+class TestLab
+  class Network
+
+    module Bind
+
+      # BIND PTR Record
+      def ptr
+        TestLab::Utility.ptr(self.ip)
+      end
+
+      # Returns the ARPA network
+      def arpa
+        TestLab::Utility.arpa(self.ip)
+      end
+
+    end
+
+  end
+end

data/lib/testlab/network/class_methods.rb

@@ -0,0 +1,13 @@
+class TestLab
+  class Network
+
+    module ClassMethods
+
+      def ips
+        self.all.map(&:ip).collect{ |ip| TestLab::Utility.ip(ip) }.compact
+      end
+
+    end
+
+  end
+end

data/lib/testlab/network/status.rb

@@ -10,10 +10,28 @@ class TestLab
           :id => self.id,
           :node_id => self.node.id,
           :state => self.state,
-          :interface => interface
+          :interface => interface,
+          :broadcast => self.broadcast,
+          :network => self.network,
+          :netmask => self.netmask
         }
       end
 
+      # Returns the network mask
+      def netmask
+        TestLab::Utility.netmask(self.ip)
+      end
+
+      # Returns the network address
+      def network
+        TestLab::Utility.network(self.ip)
+      end
+
+      # Returns the broadcast address
+      def broadcast
+        TestLab::Utility.broadcast(self.ip)
+      end
+
       # Network Bridge State
       def state
         output = self.node.ssh.exec(%(sudo ifconfig #{self.bridge} | grep 'MTU'), :silence => true, :ignore_exit_status => true).output.strip

data/lib/testlab/network.rb

@@ -7,8 +7,23 @@ class TestLab
   #
   # @author Zachary Patten <zachary@jovelabs.net>
   class Network < ZTK::DSL::Base
-    STATUS_KEYS   = %w(node_id id state interface).map(&:to_sym)
+    STATUS_KEYS   = %w(node_id id state interface network netmask broadcast).map(&:to_sym)
 
+    # Sub-Modules
+    autoload :Actions,      'testlab/network/actions'
+    autoload :Bind,         'testlab/network/bind'
+    autoload :ClassMethods, 'testlab/network/class_methods'
+    autoload :Lifecycle,    'testlab/network/lifecycle'
+    autoload :Status,       'testlab/network/status'
+
+    include TestLab::Network::Actions
+    include TestLab::Network::Bind
+    include TestLab::Network::Lifecycle
+    include TestLab::Network::Status
+
+    extend  TestLab::Network::ClassMethods
+
+    # Associations and Attributes
     belongs_to  :node,        :class_name => 'TestLab::Node'
 
     attribute   :bridge
@@ -16,15 +31,6 @@ class TestLab
     attribute   :ip
     attribute   :config
 
-    autoload :Actions, 'testlab/network/actions'
-    autoload :CIDR, 'testlab/network/cidr'
-    autoload :Lifecycle, 'testlab/network/lifecycle'
-    autoload :Status, 'testlab/network/status'
-
-    include TestLab::Network::Actions
-    include TestLab::Network::CIDR
-    include TestLab::Network::Lifecycle
-    include TestLab::Network::Status
 
     def initialize(*args)
       super(*args)

data/lib/testlab/node/bind.rb

@@ -17,14 +17,14 @@ class TestLab
         reverse_records = Hash.new
 
         TestLab::Container.all.each do |container|
-          interface = container.primary_interface
-          domain       = (container.domain || container.node.labfile.config[:domain])
+          interface          = container.primary_interface
+          container.domain ||= container.node.labfile.config[:domain]
 
-          forward_records[domain] ||= Array.new
-          forward_records[domain] << %(#{container.id} IN A #{container.ip})
+          forward_records[container.domain] ||= Array.new
+          forward_records[container.domain] << %(#{container.id} IN A #{container.ip})
 
           reverse_records[interface.first] ||= Array.new
-          reverse_records[interface.first] << %(#{container.ptr} IN PTR #{container.id}.#{domain}.)
+          reverse_records[interface.first] << %(#{container.ptr} IN PTR #{container.id}.#{container.domain}.)
         end
         { :forward => forward_records, :reverse => reverse_records }
       end
@@ -48,8 +48,7 @@ class TestLab
           build_bind_db(network.arpa, reverse_records[network.id])
         end
 
-        domains = ([self.labfile.config[:domain]] + TestLab::Container.domains).flatten
-        domains.each do |domain|
+        TestLab::Container.domains.each do |domain|
           context = {
             :zone => domain
           }
@@ -68,8 +67,6 @@ class TestLab
           file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} BIND DB: #{zone}", :char => ';'))
           file.puts(ZTK::Template.render(bind_db_template, { :zone => zone, :records => records }))
         end
-
-        # self.ssh.exec(%(sudo rm -fv /etc/bind/db.#{zone}.jnl))
       end
 
       # Builds the BIND configuration
@@ -80,13 +77,18 @@ class TestLab
         end
       end
 
-      def bind_setup
-        bind_setup_template = File.join(self.class.template_dir, 'bind-setup.erb')
-        self.ssh.bootstrap(ZTK::Template.render(bind_setup_template))
+      def bind_install
+        self.ssh.exec(%(sudo apt-get -y install bind9))
+      end
 
-        build_bind_conf
+      def bind_reload
+        self.ssh.exec(%(sudo rndc reload))
+      end
 
-        self.ssh.exec(%(sudo /bin/bash -c 'service bind9 restart || service bind9 start'))
+      def bind_setup
+        bind_install
+        build_bind_conf
+        bind_reload
       end
 
     end

data/lib/testlab/node/class_methods.rb

@@ -0,0 +1,14 @@
+class TestLab
+  class Node
+
+    module ClassMethods
+
+      # Returns the path to the node templates
+      def template_dir
+        File.join(TestLab.gem_dir, "lib", "testlab", "node", "templates")
+      end
+
+    end
+
+  end
+end

data/lib/testlab/node/lifecycle.rb

@@ -3,6 +3,23 @@ class TestLab
 
     module Lifecycle
 
+      # 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
+
+      # Calls the specified method on all the objects supplied
+      def call_methods(objects, method_name)
+        objects.each do |object|
+          if object.respond_to?(method_name)
+            object.send(method_name)
+          end
+        end
+      end
+
       # Bootstrap the node
       def node_setup
         node_setup_template = File.join(self.class.template_dir, 'node-setup.erb')
@@ -25,6 +42,10 @@ class TestLab
 
         call_collections([self.networks, self.routers, self.containers], :setup)
 
+        if self.components.include?('bind')
+          bind_reload
+        end
+
         true
       end
 

data/lib/testlab/node/method_missing.rb

@@ -0,0 +1,29 @@
+class TestLab
+  class Node
+
+    module MethodMissing
+
+      # Node 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
+
+          if @provider.respond_to?(method_name)
+            @ui.logger.debug { "@provider.send(#{method_name.inspect}, #{method_args.inspect})" }
+            result = @provider.send(method_name, *method_args)
+          else
+            raise TestLab::ProviderError, "Your provider does not respond to the method '#{method_name}'!"
+          end
+
+          result
+        else
+          super(method_name, *method_args)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/testlab/node/resolv.rb

@@ -8,10 +8,9 @@ class TestLab
       def build_resolv_main_conf(file)
         resolv_conf_template = File.join(self.class.template_dir, "resolv.erb")
 
-        domains = ([self.labfile.config[:domain]] + TestLab::Container.domains).flatten
         context = {
-          :servers => [TestLab::Network.all.map(&:clean_ip), "8.8.8.8", "8.8.4.4" ].flatten,
-          :search => domains.join(' ')
+          :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"))

data/lib/testlab/node/status.rb

@@ -8,6 +8,7 @@ class TestLab
       # @return [Hash] A hash detailing the status of the node.
       def status
         {
+          :id => self.id,
           :instance_id => @provider.instance_id,
           :state => @provider.state,
           :user => @provider.user,

data/lib/testlab/node/templates/bind-db.erb

@@ -1,6 +1,6 @@
 $TTL 1d
 @ IN  SOA localhost. root.localhost. (
-            0   ; Serial
+   <%= Time.now.to_i %>   ; Serial
            1w   ; Refresh
            1d   ; Retry
            4w   ; Expire

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

@@ -10,9 +10,10 @@ options {
   // Uncomment the following block, and insert the addresses replacing
   // the all-0's placeholder.
 
-  // forwarders {
-  //  0.0.0.0;
-  // };
+  forwarders {
+    8.8.8.8;
+    8.8.4.4;
+  };
 
   //========================================================================
   // If BIND logs error messages about the root key being expired,

data/lib/testlab/node.rb

@@ -9,6 +9,27 @@ class TestLab
   class Node < ZTK::DSL::Base
     STATUS_KEYS   = %w(id instance_id state user ip port provider con net rtr).map(&:to_sym)
 
+    # Sub-Modules
+    autoload :Bind,          'testlab/node/bind'
+    autoload :ClassMethods,  'testlab/node/class_methods'
+    autoload :Lifecycle,     'testlab/node/lifecycle'
+    autoload :LXC,           'testlab/node/lxc'
+    autoload :MethodMissing, 'testlab/node/method_missing'
+    autoload :Resolv,        'testlab/node/resolv'
+    autoload :SSH,           'testlab/node/ssh'
+    autoload :Status,        'testlab/node/status'
+
+    include TestLab::Node::Bind
+    include TestLab::Node::Lifecycle
+    include TestLab::Node::LXC
+    include TestLab::Node::MethodMissing
+    include TestLab::Node::Resolv
+    include TestLab::Node::SSH
+    include TestLab::Node::Status
+
+    extend  TestLab::Node::ClassMethods
+
+    # Associations and Attributes
     belongs_to :labfile,    :class_name => 'TestLab::Lab'
 
     has_many   :routers,    :class_name => 'TestLab::Router'
@@ -20,21 +41,6 @@ class TestLab
     attribute  :components
 
 
-    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'
-
-    include TestLab::Node::Bind
-    include TestLab::Node::Lifecycle
-    include TestLab::Node::LXC
-    include TestLab::Node::Resolv
-    include TestLab::Node::SSH
-    include TestLab::Node::Status
-
-
     def initialize(*args)
       super(*args)
 
@@ -42,54 +48,6 @@ class TestLab
       @provider = self.provider.new(self.config)
     end
 
-################################################################################
-
-    # 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
-
-    # Calls the specified method on all the objects supplied
-    def call_methods(objects, method_name)
-      objects.each do |object|
-        if object.respond_to?(method_name)
-          object.send(method_name)
-        end
-      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
-
-        if @provider.respond_to?(method_name)
-          @ui.logger.debug { "@provider.send(#{method_name.inspect}, #{method_args.inspect})" }
-          result = @provider.send(method_name, *method_args)
-        else
-          raise TestLab::ProviderError, "Your provider does not respond to the method '#{method_name}'!"
-        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/{network → utility}/cidr.rb

@@ -1,6 +1,12 @@
 class TestLab
-  class Network
+  module Utility
 
+    # CIDR Error Class
+    class CIDRError < UtilityError; end
+
+    # CIDR Module
+    #
+    # @author Zachary Patten <zachary@jovelabs.net>
     module CIDR
 
       CIDR_MATRIX = {
@@ -39,61 +45,81 @@ class TestLab
          0 => { :netmask => '0.0.0.0',         :broadcast => '255.255.255.255', :network => '0.0.0.0' }
       }
 
-      # Returns the CIDR of the network
-      def cidr
-        self.ip.split('/').last.to_i
+      def ip(ip)
+        ip.split('/').first
+      end
+
+      def cidr(ip)
+        ip.split('/').last.to_i
       end
 
-      # Returns the IP with the CIDR notation stripped away
-      def clean_ip
-        self.ip.split('/').first
+      def octets(ip)
+        ip.split('.')
       end
 
-      # Returns the entry from the CIDR_MATRIX constant based on our CIDR
-      def cidr_matrix
-        CIDR_MATRIX[self.cidr]
+      def cidr_matrix(cidr)
+        CIDR_MATRIX[cidr.to_i]
       end
 
-      # Returns the network mask
-      def netmask
-        cidr_matrix[:netmask]
+      def netmask(ip)
+        ip, cidr = ip.split('/')
+        cidr_matrix(cidr)[:netmask]
       end
 
       # Returns the network address
-      def network
-        cidr_matrix[:network] % clean_ip.split('.')
+      def network(ip)
+        ip, cidr = ip.split('/')
+        cidr_matrix(cidr)[:network] % ip.split('.')
       end
 
       # Returns the broadcast address
-      def broadcast
-        cidr_matrix[:broadcast] % clean_ip.split('.')
+      def broadcast(ip)
+        ip, cidr = ip.split('/')
+        cidr_matrix(cidr)[:broadcast] % ip.split('.')
       end
 
-      def cidr_octets(fill=nil)
-        octets = self.clean_ip.split('.')
+      def cidr_octets(ip, fill=nil)
+        ip, cidr = ip.split('/')
+        oct = octets(ip)
 
-        result = case self.cidr
+        result = case cidr.to_i
         when 0..7 then
-          octets[-4,4]
+          oct[-4,4]
         when 8..15 then
-          [octets[-3,3], fill]
+          [fill, oct[-3,3]]
         when 16..23 then
-          [octets[-2,2], fill, fill]
+          [fill, fill, oct[-2,2]]
         when 24..31 then
-          [octets[-1,1], fill, fill, fill]
+          [fill, fill, fill, oct[-1,1]]
         end
 
         result.flatten.compact
       end
 
-      def ptr
-        cidr_octets.reverse.join('.')
+      def arpa_octets(ip, fill=nil)
+        ip, cidr = ip.split('/')
+        oct = octets(ip)
+
+        result = case cidr.to_i
+        when 0..7 then
+          [fill, fill, fill, fill]
+        when 8..15 then
+          [oct[0,1], fill, fill, fill]
+        when 16..23 then
+          [oct[0,2], fill, fill]
+        when 24..31 then
+          [oct[0,3], fill]
+        end
+
+        result.flatten.compact.reverse
+      end
+
+      def ptr(ip)
+        cidr_octets(ip).reverse.join('.')
       end
 
-      # Returns the ARPA address
-      def arpa
-        result = self.network.split('.').delete_if{ |ip| ip == '0' }.reverse.join('.')
-        "#{result}.in-addr.arpa"
+      def arpa(ip)
+        [arpa_octets(ip), 'in-addr', 'arpa'].flatten.join('.')
       end
 
     end

data/lib/testlab/utility.rb

@@ -0,0 +1,16 @@
+class TestLab
+
+  # Utility Error Class
+  class UtilityError < TestLabError; end
+
+  # Utility Module
+  #
+  # @author Zachary Patten <zachary@jovelabs.net>
+  module Utility
+    autoload :CIDR, 'testlab/utility/cidr'
+
+    extend TestLab::Utility::CIDR
+
+  end
+
+end

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -10,15 +10,15 @@ class TestLab
   # Top-Level Error Class
   class TestLabError < StandardError; end
 
-  autoload :Provider, 'testlab/provider'
+  # Main Classes
+  autoload :Container,   'testlab/container'
+  autoload :Labfile,     'testlab/labfile'
+  autoload :Network,     'testlab/network'
+  autoload :Node,        'testlab/node'
+  autoload :Provider,    'testlab/provider'
   autoload :Provisioner, 'testlab/provisioner'
-
-  autoload :Labfile, 'testlab/labfile'
-  autoload :Node, 'testlab/node'
-  autoload :Router, 'testlab/router'
-  autoload :Container, 'testlab/container'
-  autoload :Network, 'testlab/network'
-  autoload :Link, 'testlab/link'
+  autoload :Router,      'testlab/router'
+  autoload :Utility,     'testlab/utility'
 
   @@ui ||= nil
 
@@ -63,17 +63,17 @@ class TestLab
     if alive?
       @@ui.stdout.puts("NODES:")
       ZTK::Report.new(:ui => @@ui).spreadsheet(TestLab::Node.all, TestLab::Node::STATUS_KEYS) do |node|
-        OpenStruct.new(node.status.merge(:id => node.id))
+        OpenStruct.new(node.status)
       end
       @@ui.stdout.puts
       @@ui.stdout.puts("NETWORKS:")
       ZTK::Report.new(:ui => @@ui).spreadsheet(TestLab::Network.all, TestLab::Network::STATUS_KEYS) do |network|
-        OpenStruct.new(network.status.merge(:id => network.id))
+        OpenStruct.new(network.status)
       end
       @@ui.stdout.puts
       @@ui.stdout.puts("CONTAINERS:")
       ZTK::Report.new(:ui => @@ui).spreadsheet(TestLab::Container.all, TestLab::Container::STATUS_KEYS) do |container|
-        OpenStruct.new(container.status.merge(:id => container.id))
+        OpenStruct.new(container.status)
       end
 
       true

data/spec/support/Labfile

@@ -18,7 +18,7 @@ node :localhost do
   ]
 
   network :testnet do
-    cidr        "192.168.255.254/16"
+    ip          "192.168.255.254/16"
     bridge      :br0
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -161,26 +161,30 @@ files:
 - 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/lifecycle.rb
 - lib/testlab/container/lxc.rb
-- lib/testlab/container/network.rb
+- lib/testlab/container/method_missing.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/bind.rb
+- lib/testlab/network/class_methods.rb
 - lib/testlab/network/lifecycle.rb
 - lib/testlab/network/status.rb
 - lib/testlab/node.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-setup.erb
 - lib/testlab/node/templates/bind-zone.erb
 - lib/testlab/node/templates/bind.erb
 - lib/testlab/node/templates/node-setup.erb
@@ -195,6 +199,8 @@ files:
 - lib/testlab/provisioners/shell.rb
 - lib/testlab/provisioners/templates/chef/bootstrap.erb
 - lib/testlab/router.rb
+- lib/testlab/utility.rb
+- lib/testlab/utility/cidr.rb
 - lib/testlab/version.rb
 - spec/provider_spec.rb
 - spec/provisioner_spec.rb
@@ -217,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3944268925164045043
+      hash: 4469350422868766283
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -226,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3944268925164045043
+      hash: 4469350422868766283
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/testlab/container/network.rb

@@ -1,31 +0,0 @@
-class TestLab
-  class Container
-
-    module Network
-
-      # Builds an array of hashes containing the lxc configuration options for
-      # our networks
-      def build_lxc_network_conf(interfaces)
-        networks = Array.new
-
-        interfaces.each do |network, network_config|
-          networks << Hash[
-            'lxc.network.type'         => :veth,
-            'lxc.network.flags'        => :up,
-            'lxc.network.link'         => TestLab::Network.first(network).bridge,
-            'lxc.network.name'         => network_config[:name],
-            'lxc.network.hwaddr'       => network_config[:mac],
-            'lxc.network.ipv4'         => network_config[:ip]
-          ]
-          if (network_config[:primary] == true) || (interfaces.count == 1)
-            networks.last.merge!('lxc.network.ipv4.gateway' => :auto)
-          end
-        end
-
-        networks
-      end
-
-    end
-
-  end
-end

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

@@ -1,6 +0,0 @@
-set -x
-
-apt-get -y install bind9
-service bind9 restart || service bind9 start
-
-exit 0