testlab 0.7.4 → 0.7.5

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 *log
 Vagrantfile
+.vagrant

data/Rakefile

@@ -18,6 +18,7 @@
 #
 ################################################################################
 
+require 'rake/clean'
 require 'bundler/gem_tasks'
 
 ################################################################################
@@ -29,6 +30,17 @@ task :test => [:spec]
 
 ################################################################################
 
+require 'cucumber/rake/task'
+desc 'Run features'
+Cucumber::Rake::Task.new(:features) do |t|
+  opts = "features --format pretty -x"
+  opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
+  t.cucumber_opts =  opts
+  t.fork = false
+end
+
+################################################################################
+
 require 'coveralls/rake/task'
 Coveralls::RakeTask.new
 task :coveralls => [:spec, 'coveralls:push']

data/bin/tl

@@ -18,8 +18,6 @@
 #   limitations under the License.
 #
 ################################################################################
-require 'socket'
-
 require 'gli'
 require 'testlab'
 
@@ -34,6 +32,8 @@ program_desc %(TestLab - A toolkit for building virtual computer labs)
 sort_help :manually
 default_command :help
 
+preserve_argv true
+
 commands_from 'commands'
 
 desc 'Show verbose output'
@@ -44,9 +44,9 @@ desc 'Quiet mode'
 default_value false
 switch [:q, :quiet]
 
-desc 'Path to Labfile: ${PWD}/Labfile'
+desc 'Path to Labfile: ${REPO}/Labfile'
 arg_name 'path/to/file'
-default_value File.join(Dir.pwd, 'Labfile')
+# default_value File.join(Dir.pwd, 'Labfile')
 flag [:l, :labfile]
 
 desc 'Path to Repository directory: ${PWD}'
@@ -54,15 +54,15 @@ arg_name 'path/to/directory'
 default_value Dir.pwd
 flag [:r, :repo]
 
-desc 'Path to Configuration directory: ${PWD}/.testlab-$(hostname -s)'
+desc 'Path to Configuration directory: ${REPO}/.testlab-$(hostname -s)'
 arg_name 'path/to/directory'
-default_value File.join(Dir.pwd, ".testlab-#{TestLab.hostname}")
+# default_value File.join(Dir.pwd, ".testlab-#{TestLab.hostname}")
 flag [:c, :config]
 
 pre do |global,command,options,args|
   (global[:verbose] == true) and (ENV['LOG_LEVEL'] = 'DEBUG')
 
-  log_file = File.join(Dir.pwd, "testlab-#{TestLab.hostname}.log")
+  log_file = File.join(global[:repo], "testlab-#{TestLab.hostname}.log")
   @logger = ZTK::Logger.new(log_file)
 
   @ui = ZTK::UI.new(
@@ -73,9 +73,9 @@ pre do |global,command,options,args|
 
   @testlab = TestLab.new(
     :ui => @ui,
-    :labfile    => global[:labfile],
-    :config_dir => global[:config],
-    :repo_dir   => global[:repo]
+    :labfile_path => global[:labfile],
+    :config_dir   => global[:config],
+    :repo_dir     => global[:repo]
   )
 
   @ui.logger.debug { "global(#{global.inspect})" }

data/features/step_definitions/container_steps.rb

@@ -0,0 +1,35 @@
+When /^I get the containers status with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(status -n test-server))
+end
+
+When /^I get the containers ssh-config with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(ssh-config -n test-server))
+end
+
+When /^I up the containers with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(up -n test-server))
+end
+
+When /^I down the containers with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(down -n test-server))
+end
+
+When /^I clone the containers with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(clone -n test-server))
+end
+
+When /^I build the containers with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(build -n test-server))
+end
+
+When /^I export the containers with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(export -n test-server --output=/tmp/test-server.sc))
+end
+
+When /^I import the containers with "([^"]*)"$/ do |app_name|
+  container_cmd(app_name, %W(import -n test-server --input=/tmp/test-server.sc))
+end
+
+def container_cmd(app_name, *args)
+  testlab_cmd(app_name, [%(container), args].flatten)
+end

data/features/step_definitions/network_steps.rb

@@ -0,0 +1,7 @@
+When /^I get the networks status with "([^"]*)"$/ do |app_name|
+  network_cmd(app_name, %W(status -n labnet))
+end
+
+def network_cmd(app_name, *args)
+  testlab_cmd(app_name, [%(network), args].flatten)
+end

data/features/step_definitions/node_steps.rb

@@ -0,0 +1,19 @@
+When /^I get the nodes status with "([^"]*)"$/ do |app_name|
+  node_cmd(app_name, %W(status -n vagrant))
+end
+
+When /^I up the nodes with "([^"]*)"$/ do |app_name|
+  node_cmd(app_name, %W(up -n vagrant))
+end
+
+When /^I down the nodes with "([^"]*)"$/ do |app_name|
+  node_cmd(app_name, %W(down -n vagrant))
+end
+
+When /^I build the nodes with "([^"]*)"$/ do |app_name|
+  node_cmd(app_name, %W(build -n vagrant))
+end
+
+def node_cmd(app_name, *args)
+  testlab_cmd(app_name, [%(node), args].flatten)
+end

data/features/step_definitions/testlab_steps.rb

@@ -0,0 +1,28 @@
+When /^I get help for "([^"]*)"$/ do |app_name|
+  testlab_cmd(app_name, %W(help))
+end
+
+When /^I get the status with "([^"]*)"$/ do |app_name|
+  testlab_cmd(app_name, %W(status))
+end
+
+When /^I build the lab with "([^"]*)"$/ do |app_name|
+  testlab_cmd(app_name, %W(build))
+end
+
+When /^I up the lab with "([^"]*)"$/ do |app_name|
+  testlab_cmd(app_name, %W(up))
+end
+
+When /^I down the lab with "([^"]*)"$/ do |app_name|
+  testlab_cmd(app_name, %W(down))
+end
+
+When /^I destroy the lab with "([^"]*)"$/ do |app_name|
+  testlab_cmd(app_name, %W(destroy))
+end
+
+def testlab_cmd(app_name, *args)
+  args = args.join(' ')
+  step %(I run `#{app_name} --repo=#{TEST_REPO} #{args}`)
+end

data/features/support/Labfile

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
+# Labfile Simple Example
+#########################
+# This is a simple example that builds a lab with a chef-server and chef-client.
+
+# Here we define our node; in this case we are using the localhost.  We've
+# selected the Vagrant provider so the Vagrant VM will be our target LXC node.
+node :vagrant do
+
+  # This sets the provider for our node.  This could be many things, from
+  # Vagrant, to AWS, to Local, to custom internal providers.  Any class can be
+  # supplied assuming it's interface honors our contract.
+  provider      TestLab::Provider::Vagrant
+
+  # These are provisioners that only need to run against the node (i.e. they
+  # do not have any container components).  Provisioner classes applied to
+  # containers only are automatically interogated and executed during runtime
+  # if they have a node component.
+  provisioners  [
+    TestLab::Provisioner::Raring,
+    TestLab::Provisioner::Bind
+  ]
+
+  # this is a generic configuration object (hash) which is supplied to
+  # the provider
+  config      ({
+    :vagrant => {
+      :id       => "test-cucumber-#{TestLab.hostname}".downcase,
+      :cpus     => ZTK::Parallel::MAX_FORKS.div(2),                    # use half of the available processors
+      :memory   => ZTK::Parallel::MAX_MEMORY.div(3).div(1024 * 1024),  # use a third of available RAM
+      :box      => 'raring64',
+      :box_url  => 'https://dl.dropboxusercontent.com/u/22904185/boxes/raring64.box',
+      :file     => File.dirname(__FILE__)
+    },
+    :bind => {
+      :domain => "default.zone"
+    }
+  })
+
+  # Here we define our network segments; these will manifest into network
+  # bridges on the target LXC node.
+  network 'labnet' do
+    # provisioners  [TestLab::Provisioner::Route]
+    address       '10.128.0.1/16'
+    bridge        :br0
+  end
+
+  # test-server.default.zone
+  ###########################
+  container "test-server" do
+    distro        "ubuntu"
+    release       "precise"
+
+    provisioners   [
+      TestLab::Provisioner::Resolv,
+      TestLab::Provisioner::AptCacherNG,
+      TestLab::Provisioner::Apt
+    ]
+
+    # Here we define a default user to seed onto the box.  This user will be
+    # given passwordless sudo access as well.
+    user 'deployer' do
+      password         'deployer'
+      identity         File.join(ENV['HOME'], '.ssh', 'id_rsa')
+      public_identity  File.join(ENV['HOME'], '.ssh', 'id_rsa.pub')
+      uid              2600
+      gid              2600
+    end
+
+    # Interfaces define what networks this container is linked to and what our
+    # configuration on that network should be.  In the event we have more than
+    # one interface we should define one as the "primary".  When multiple
+    # interfaces are at play, the default route for the container will be off
+    # the primary interface.
+    interface do
+      network_id  'labnet'
+      name        :eth0
+      address     '10.128.0.254/16'
+      mac         '00:00:5e:63:b5:9f'
+    end
+  end
+
+end

data/features/support/env.rb

@@ -0,0 +1,18 @@
+require 'aruba/cucumber'
+
+ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
+TEST_REPO = File.dirname(__FILE__)
+
+Before do
+  # Using "announce" causes massive warnings on 1.9.2
+  @aruba_timeout_seconds = 3600
+  @puts = true
+  @original_rubylib = ENV['RUBYLIB']
+  ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
+  # ENV['VAGRANT_HOME'] = File.join("", "tmp", ".vagrant.d")
+end
+
+After do
+  ENV['RUBYLIB'] = @original_rubylib
+end

data/features/testlab.feature

@@ -0,0 +1,64 @@
+Feature: TestLab command-line
+
+  Background: TestLab status
+    When I get the status with "tl"
+    Then the exit status should be 0
+    When I get the nodes status with "tl"
+    Then the exit status should be 0
+    When I get the networks status with "tl"
+    Then the exit status should be 0
+    When I get the containers status with "tl"
+    Then the exit status should be 0
+    When I get the containers ssh-config with "tl"
+    Then the exit status should be 0
+
+
+  Scenario: TestLab help
+    When I get help for "tl"
+    Then the exit status should be 0
+
+
+  Scenario: TestLab export
+    When I build the lab with "tl"
+    Then the exit status should be 0
+    When I export the containers with "tl"
+    Then the exit status should be 0
+
+
+  Scenario: TestLab import
+    When I down the lab with "tl"
+    Then the exit status should be 0
+    When I build the nodes with "tl"
+    Then the exit status should be 0
+    When I import the containers with "tl"
+    Then the exit status should be 0
+    When I build the lab with "tl"
+    Then the exit status should be 0
+
+
+  Scenario: TestLab clone
+    When I down the lab with "tl"
+    Then the exit status should be 0
+    When I build the lab with "tl"
+    Then the exit status should be 0
+    When I clone the containers with "tl"
+    Then the exit status should be 0
+    When I build the containers with "tl"
+    Then the exit status should be 0
+    When I clone the containers with "tl"
+    Then the exit status should be 0
+    When I build the containers with "tl"
+    Then the exit status should be 0
+    When I down the containers with "tl"
+    Then the exit status should be 0
+    When I up the containers with "tl"
+    Then the exit status should be 0
+    When I build the containers with "tl"
+    Then the exit status should be 0
+
+
+  Scenario: TestLab destroy
+    When I down the lab with "tl"
+    Then the exit status should be 0
+    When I destroy the lab with "tl"
+    Then the exit status should be 0

data/lib/commands/container.rb

@@ -24,25 +24,28 @@ desc 'Manage containers'
 arg_name 'Describe arguments to container here'
 command :container do |c|
 
-  c.desc 'Container ID or Name'
-  c.arg_name 'container'
+  c.desc 'Single or comma separated list of container IDs'
+  c.arg_name 'container[,container,...]'
   c.flag [:n, :name]
 
   # CONTAINER CREATE
   ###################
   c.desc 'Create a container'
   c.long_desc <<-EOF
-Create a container.  The container is created.
+Creates a container on the node the container belongs to.
 EOF
   c.command :create do |create|
     create.action do |global_options, options, args|
       if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
       else
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you screateplied!"
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-        container.create
+        containers.each do |container|
+          container.create
+        end
       end
     end
   end
@@ -51,17 +54,20 @@ EOF
   ####################
   c.desc 'Destroy a container'
   c.long_desc <<-EOF
-Destroy a container.  The container is stopped and destroyed.
+Destroys the container, force stopping it if necessary.  The containers file system is purged from disk.  This is a destructive operation, there is no way to recover from it.
 EOF
   c.command :destroy do |destroy|
     destroy.action do |global_options, options, args|
       if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
       else
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-        container.destroy
+        containers.each do |container|
+          container.destroy
+        end
       end
     end
   end
@@ -70,17 +76,20 @@ EOF
   ###############
   c.desc 'Up a container'
   c.long_desc <<-EOF
-Up a container.  The container is started and brought online.
+The container is started and brought online.
 EOF
   c.command :up do |up|
     up.action do |global_options, options, args|
       if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
       else
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-        container.up
+        containers.each do |container|
+          container.up
+        end
       end
     end
   end
@@ -89,17 +98,20 @@ EOF
   #################
   c.desc 'Down a container'
   c.long_desc <<-EOF
-Down a container.  The container is stopped taking it offline.
+The container is stopped taking it offline.
 EOF
   c.command :down do |down|
     down.action do |global_options, options, args|
       if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
       else
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-        container.down
+        containers.each do |container|
+          container.down
+        end
       end
     end
   end
@@ -108,17 +120,20 @@ EOF
   ####################
   c.desc 'Setup a container'
   c.long_desc <<-EOF
-Setup a container.  The container is created, started and provisioned.
+The container is provisioned.
 EOF
   c.command :setup do |setup|
     setup.action do |global_options, options, args|
       if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
       else
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-        container.setup
+        containers.each do |container|
+          container.setup
+        end
       end
     end
   end
@@ -127,17 +142,20 @@ EOF
   ####################
   c.desc 'Teardown a container'
   c.long_desc <<-EOF
-Teardown a container.  The container is offlined and destroyed.
+The container is deprovisioned.
 EOF
   c.command :teardown do |teardown|
     teardown.action do |global_options, options, args|
       if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
       else
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-        container.teardown
+        containers.each do |container|
+          container.teardown
+        end
       end
     end
   end
@@ -157,41 +175,47 @@ EOF
       if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
       else
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-        container.build
+        containers.each do |container|
+          container.build
+        end
       end
     end
   end
 
   # CONTAINER STATUS
   ###################
-  c.desc 'Display the status of container(s)'
+  c.desc 'Display the status of containers'
   c.long_desc <<-EOF
-Displays the status of all containers or a single container if supplied via the ID parameter.
+Displays the status of all containers or single/multiple containers if supplied via the ID parameter.
 EOF
   c.command :status do |status|
     status.action do |global_options, options, args|
+      containers = Array.new
+
       if options[:name].nil?
         # No ID supplied; show everything
-        containers = @testlab.containers.delete_if{ |c| c.node.dead? }
-        if containers.count == 0
-          @testlab.ui.stderr.puts("You either have no containers defined or dead nodes!".yellow)
-        else
-          ZTK::Report.new(:ui => @testlab.ui).list(containers, TestLab::Container::STATUS_KEYS) do |container|
-            OpenStruct.new(container.status)
-          end
-        end
+        containers = TestLab::Container.all
       else
-        # ID supplied; show just that item
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+        # ID supplied; show just those items
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
+      end
+
+      containers = containers.delete_if{ |container| container.node.dead? }
 
-        ZTK::Report.new(:ui => @testlab.ui).list(container, TestLab::Container::STATUS_KEYS) do |container|
+      if (containers.count == 0)
+        @testlab.ui.stderr.puts("You either have no containers defined or dead nodes!".yellow)
+      else
+        ZTK::Report.new(:ui => @testlab.ui).list(containers, TestLab::Container::STATUS_KEYS) do |container|
           OpenStruct.new(container.status)
         end
       end
+
     end
   end
 
@@ -231,12 +255,17 @@ EOF
   c.command :'ssh-config' do |ssh_config|
 
     ssh_config.action do |global_options, options, args|
-      help_now!('a name is required') if options[:name].nil?
-
-      container = @testlab.containers.select{ |n| n.id.to_sym == options[:name].to_sym }.first
-      container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+      if options[:name].nil?
+        help_now!('a name is required') if options[:name].nil?
+      else
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-      puts(container.ssh_config)
+        containers.each do |container|
+          puts(container.ssh_config)
+        end
+      end
     end
   end
 
@@ -255,16 +284,19 @@ EOF
       if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
       else
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
-
-        container.teardown
-        container.down
-        container.destroy
-
-        container.create
-        container.up
-        container.setup
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
+
+        containers.each do |container|
+          container.teardown
+          container.down
+          container.destroy
+
+          container.create
+          container.up
+          container.setup
+        end
       end
     end
   end
@@ -273,17 +305,20 @@ EOF
   ##################
   c.desc 'Clone a container'
   c.long_desc <<-EOF
-Clone a container.  The container is offlined and an ephemeral copy of it is started.
+An ephemeral copy of the container is started.  There is a small delay incured during the first clone operation.
 EOF
   c.command :clone do |clone|
     clone.action do |global_options, options, args|
       if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
       else
-        container = @testlab.containers.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-        container.clone
+        containers.each do |container|
+          container.clone
+        end
       end
     end
   end
@@ -304,12 +339,17 @@ EOF
     export.flag [:output]
 
     export.action do |global_options, options, args|
-      help_now!('a name is required') if options[:name].nil?
-
-      container = @testlab.containers.select{ |n| n.id.to_sym == options[:name].to_sym }.first
-      container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+      if options[:name].nil?
+        help_now!('a name is required') if options[:name].nil?
+      else
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-      container.export(options[:compression], options[:output])
+        containers.each do |container|
+          container.export(options[:compression], options[:output])
+        end
+      end
     end
   end
 
@@ -323,13 +363,18 @@ EOF
     import.flag [:input]
 
     import.action do |global_options, options, args|
-      help_now!('a name is required') if options[:name].nil?
-      help_now!('a filename is required') if options[:input].nil?
-
-      container = @testlab.containers.select{ |n| n.id.to_sym == options[:name].to_sym }.first
-      container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+      if (options[:name].nil? || options[:input].nil?)
+        help_now!('a name is required') if options[:name].nil?
+        help_now!('a filename is required') if options[:input].nil?
+      else
+        names = options[:name].split(',')
+        containers = TestLab::Container.find(names)
+        (containers.nil? || (containers.count == 0)) and raise TestLab::TestLabError, "We could not find any of the containers you supplied!"
 
-      container.import(options[:input])
+        containers.each do |container|
+          container.import(options[:input])
+        end
+      end
     end
   end
 

data/lib/commands/network.rb

@@ -167,30 +167,34 @@ EOF
 
   # NETWORK STATUS
   #################
-  c.desc 'Display the status of network(s)'
+  c.desc 'Display the status of networks'
   c.long_desc <<-EOF
-Displays the status of all networks or a single network if supplied via the ID parameter.
+Displays the status of all networks or single/multiple networks if supplied via the ID parameter.
 EOF
   c.command :status do |status|
     status.action do |global_options, options, args|
       if options[:name].nil?
-        # No ID supplied; show everything
-        networks = @testlab.networks.delete_if{|n| n.node.dead? }
-        if networks.count == 0
+        networks = Array.new
+
+        if options[:name].nil?
+          # No ID supplied; show everything
+          networks = TestLab::Network.all
+        else
+          # ID supplied; show just those items
+          names = options[:name].split(',')
+          networks = TestLab::Network.find(names)
+          (networks.nil? || (networks.count == 0)) and raise TestLab::TestLabError, "We could not find any of the networks you supplied!"
+        end
+
+        networks = networks.delete_if{ |network| network.node.dead? }
+
+        if (networks.count == 0)
           @testlab.ui.stderr.puts("You either have no networks defined or dead nodes!".yellow)
         else
           ZTK::Report.new(:ui => @testlab.ui).list(networks, TestLab::Network::STATUS_KEYS) do |network|
             OpenStruct.new(network.status)
           end
         end
-      else
-        # ID supplied; show just that item
-        network = @testlab.networks.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        network.nil? and raise TestLab::TestLabError, "We could not find the network you supplied!"
-
-        ZTK::Report.new(:ui => @testlab.ui).list(network, TestLab::Network::STATUS_KEYS) do |network|
-          OpenStruct.new(network.status)
-        end
       end
     end
   end

data/lib/testlab/container/actions.rb

@@ -12,6 +12,7 @@ class TestLab
       def create
         @ui.logger.debug { "Container Create: #{self.id} " }
 
+        (self.node.state == :not_created) and return false
         (self.lxc.state != :not_created) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
@@ -31,6 +32,7 @@ class TestLab
       def destroy
         @ui.logger.debug { "Container Destroy: #{self.id} " }
 
+        (self.node.state == :not_created) and return false
         (self.lxc.state == :not_created) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
@@ -49,6 +51,7 @@ class TestLab
       def up
         @ui.logger.debug { "Container Up: #{self.id} " }
 
+        (self.node.state != :running) and return false
         (self.lxc.state == :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
@@ -79,6 +82,7 @@ class TestLab
       def down
         @ui.logger.debug { "Container Down: #{self.id} " }
 
+        (self.node.state != :running) and return false
         (self.lxc.state != :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do

data/lib/testlab/container/lxc.rb

@@ -18,7 +18,11 @@ class TestLab
       #   execute.  This is generally a bash script of some sort for example.
       # @return [String] The output of *lxc-attach*.
       def bootstrap(content)
-        self.lxc.bootstrap(content)
+        if self.lxc_clone.exists?
+          self.ssh.bootstrap(content)
+        else
+          self.lxc.bootstrap(content)
+        end
       end
 
       # LXC::Container object

data/lib/testlab/network/actions.rb

@@ -7,6 +7,7 @@ class TestLab
       def create
         @ui.logger.debug { "Network Create: #{self.id} " }
 
+        (self.node.state == :not_created) and return false
         (self.state != :not_created) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
@@ -20,6 +21,7 @@ class TestLab
       def destroy
         @ui.logger.debug { "Network Destroy: #{self.id} " }
 
+        (self.node.state == :not_created) and return false
         (self.state == :not_created) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
@@ -33,6 +35,7 @@ class TestLab
       def up
         @ui.logger.debug { "Network Up: #{self.id} " }
 
+        (self.node.state != :running) and return false
         (self.state == :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
@@ -46,6 +49,7 @@ class TestLab
       def down
         @ui.logger.debug { "Network Down: #{self.id} " }
 
+        (self.node.state != :running) and return false
         (self.state != :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do

data/lib/testlab/utility/logger.rb

@@ -27,7 +27,8 @@ class TestLab
           "repo_dir" => testlab.repo_dir.inspect,
           "labfile_path" => testlab.labfile_path.inspect,
           "logdev" => testlab.ui.logger.logdev.inspect,
-          "version" => TestLab::VERSION
+          "version" => TestLab::VERSION.inspect,
+          "argv" => ARGV.inspect
         }
       end
 

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -108,13 +108,18 @@ class TestLab
     self.ui          = (options[:ui] || ZTK::UI.new)
     self.class.ui    = self.ui
 
-    @config_dir      = (options[:config_dir] || File.join(Dir.pwd, ".testlab-#{TestLab.hostname}"))
-    @repo_dir        = (options[:repo_dir]   || Dir.pwd)
+    @repo_dir        = File.expand_path(options[:repo_dir]   || Dir.pwd)
+
+    @config_dir      = File.expand_path(options[:config_dir] || File.join(@repo_dir, ".testlab-#{TestLab.hostname}"))
+    File.exists?(@config_dir) or FileUtils.mkdir_p(@config_dir)
+
+    labfile_path     = (options[:labfile_path] || File.join(@repo_dir, 'Labfile'))
+    @labfile_path    = File.expand_path(ZTK::Locator.find(labfile_path))
 
-    labfile          = (options[:labfile] || File.join(Dir.pwd, 'Labfile'))
-    @labfile_path    = ZTK::Locator.find(labfile)
     @labfile         = TestLab::Labfile.load(labfile_path)
     @labfile.testlab = self
+
+    Dir.chdir(@repo_dir)
   end
 
   # Test Lab Nodes

data/spec/container_spec.rb

@@ -23,7 +23,7 @@ describe TestLab::Container do
 
   subject {
     @ui = ZTK::UI.new(:stdout => StringIO.new, :stderr => StringIO.new)
-    @testlab = TestLab.new(:labfile => LABFILE, :ui => @ui)
+    @testlab = TestLab.new(:labfile_path => LABFILE, :ui => @ui)
     @testlab.containers.first
   }
 
@@ -145,6 +145,7 @@ describe TestLab::Container do
 
     describe "#create" do
       it "should create the container" do
+        subject.node.stub(:state) { :running }
         subject.lxc.config.stub(:save) { true }
         subject.stub(:detect_arch) { "amd64" }
         subject.lxc.stub(:create) { true }
@@ -156,6 +157,7 @@ describe TestLab::Container do
 
     describe "#destroy" do
       it "should destroy the container" do
+        subject.node.stub(:state) { :running }
         subject.lxc.stub(:exists?) { true }
         subject.lxc.stub(:state) { :stopped }
         subject.lxc.stub(:destroy) { true }
@@ -166,6 +168,7 @@ describe TestLab::Container do
 
     describe "#up" do
       it "should up the container" do
+        subject.node.stub(:state) { :running }
         subject.lxc.stub(:exists?) { true }
         subject.lxc.stub(:start) { true }
         subject.lxc.stub(:wait) { true }
@@ -180,6 +183,7 @@ describe TestLab::Container do
 
     describe "#down" do
       it "should down the container" do
+        subject.node.stub(:state) { :running }
         subject.lxc.stub(:exists?) { true }
         subject.lxc.stub(:stop) { true }
         subject.lxc.stub(:wait) { true }

data/spec/network_spec.rb

@@ -23,7 +23,7 @@ describe TestLab::Network do
 
   subject {
     @ui = ZTK::UI.new(:stdout => StringIO.new, :stderr => StringIO.new)
-    @testlab = TestLab.new(:labfile => LABFILE, :ui => @ui)
+    @testlab = TestLab.new(:labfile_path => LABFILE, :ui => @ui)
     @testlab.networks.first
   }
 
@@ -108,6 +108,7 @@ describe TestLab::Network do
 
     describe "#create" do
       it "should create the network bridge" do
+        subject.node.stub(:state) { :running }
         subject.stub(:state) { :not_created }
         subject.node.ssh.stub(:exec) { true }
         subject.create
@@ -116,6 +117,7 @@ describe TestLab::Network do
 
     describe "#destroy" do
       it "should destroy the network bridge" do
+        subject.node.stub(:state) { :running }
         subject.stub(:state) { :stopped }
         subject.node.ssh.stub(:exec) { true }
         subject.destroy
@@ -124,6 +126,7 @@ describe TestLab::Network do
 
     describe "#up" do
       it "should online the network bridge" do
+        subject.node.stub(:state) { :running }
         subject.stub(:state) { :stopped }
         subject.node.ssh.stub(:exec) { true }
         subject.up
@@ -132,6 +135,7 @@ describe TestLab::Network do
 
     describe "#down" do
       it "should offline the network bridge" do
+        subject.node.stub(:state) { :running }
         subject.stub(:state) { :running }
         subject.node.ssh.stub(:exec) { true }
         subject.down

data/spec/node_spec.rb

@@ -23,7 +23,7 @@ describe TestLab::Node do
 
   subject {
     @ui = ZTK::UI.new(:stdout => StringIO.new, :stderr => StringIO.new)
-    @testlab = TestLab.new(:labfile => LABFILE, :ui => @ui)
+    @testlab = TestLab.new(:labfile_path => LABFILE, :ui => @ui)
     @testlab.nodes.first
   }
 

data/spec/provisioners/shell_spec.rb

@@ -23,7 +23,7 @@ describe TestLab::Provisioner::Shell do
 
   subject {
     @ui = ZTK::UI.new(:stdout => StringIO.new, :stderr => StringIO.new)
-    @testlab = TestLab.new(:labfile => LABFILE, :ui => @ui)
+    @testlab = TestLab.new(:labfile_path => LABFILE, :ui => @ui)
     TestLab::Container.first('server-shell')
   }
 
@@ -42,7 +42,9 @@ describe TestLab::Provisioner::Shell do
         it "should provision the container" do
           subject.node.ssh.stub(:file).and_yield(StringIO.new)
           subject.stub(:fs_root) { "/var/lib/lxc/#{subject.id}/rootfs" }
+          subject.ssh.stub(:bootstrap) { "" }
           subject.lxc.stub(:bootstrap) { "" }
+          subject.lxc_clone.stub(:exists?) { false }
 
           p = TestLab::Provisioner::Shell.new(subject.config, @ui)
           p.on_container_setup(subject)
@@ -53,7 +55,9 @@ describe TestLab::Provisioner::Shell do
         it "should raise an exception" do
           subject.node.ssh.stub(:file).and_yield(StringIO.new)
           subject.stub(:fs_root) { "/var/lib/lxc/#{subject.id}/rootfs" }
+          subject.ssh.stub(:bootstrap) { "" }
           subject.lxc.stub(:bootstrap) { "" }
+          subject.lxc_clone.stub(:exists?) { false }
 
           p = TestLab::Provisioner::Shell.new(Hash.new, @ui)
           lambda{ p.on_container_setup(subject) }.should raise_error TestLab::Provisioner::ShellError

data/spec/testlab_spec.rb

@@ -23,7 +23,7 @@ describe TestLab do
 
   subject {
     @ui = ZTK::UI.new(:stdout => StringIO.new, :stderr => StringIO.new)
-    @testlab = TestLab.new(:labfile => LABFILE, :ui => @ui)
+    @testlab = TestLab.new(:labfile_path => LABFILE, :ui => @ui)
   }
 
   describe "class" do

data/testlab.gemspec

@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("pry")
   spec.add_development_dependency("rake")
   spec.add_development_dependency("redcarpet")
+  spec.add_development_dependency("aruba")
   spec.add_development_dependency("rspec")
   spec.add_development_dependency("yard")
   spec.add_development_dependency("coveralls")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +222,13 @@ files:
 - README.md
 - Rakefile
 - bin/tl
+- features/step_definitions/container_steps.rb
+- features/step_definitions/network_steps.rb
+- features/step_definitions/node_steps.rb
+- features/step_definitions/testlab_steps.rb
+- features/support/Labfile
+- features/support/env.rb
+- features/testlab.feature
 - lib/commands/container.rb
 - lib/commands/network.rb
 - lib/commands/node.rb
@@ -303,7 +326,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2914304308752783600
+      hash: -1054202206124374407
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -312,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2914304308752783600
+      hash: -1054202206124374407
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -320,6 +343,13 @@ signing_key:
 specification_version: 3
 summary: A toolkit for building virtual computer labs
 test_files:
+- features/step_definitions/container_steps.rb
+- features/step_definitions/network_steps.rb
+- features/step_definitions/node_steps.rb
+- features/step_definitions/testlab_steps.rb
+- features/support/Labfile
+- features/support/env.rb
+- features/testlab.feature
 - spec/container_spec.rb
 - spec/network_spec.rb
 - spec/node_spec.rb