testlab 0.7.6 → 0.8.0

data/README.md

@@ -26,7 +26,7 @@ The TestLab command-line program `tl` follows in the style of git:
         tl [global options] command [command options] [arguments...]
 
     VERSION
-        0.7.5
+        0.7.6
 
     GLOBAL OPTIONS
         -l, --labfile=path/to/file     - Path to Labfile: ${REPO}/Labfile (default: none)
@@ -49,6 +49,7 @@ The TestLab command-line program `tl` follows in the style of git:
         setup     - Setup the test lab infrastructure
         teardown  - Teardown the test lab infrastructure
         build     - Build the test lab infrastructure
+        demolish  - Demolish the test lab infrastructure
         status    - Display information on the status of the test lab
 
 You stand up your lab with the following command:

data/bin/tl

@@ -22,6 +22,7 @@ require 'gli'
 require 'testlab'
 
 include GLI::App
+include TestLab::Utility::GLI
 include TestLab::Utility::Misc
 
 version TestLab::VERSION
@@ -71,6 +72,10 @@ pre do |global,command,options,args|
     :quiet   => global[:quiet]
   )
 
+  @ui.logger.debug { "global(#{global.inspect})" }
+  @ui.logger.debug { "options(#{options.inspect})" }
+  @ui.logger.debug { "args(#{args.inspect})" }
+
   @testlab = TestLab.new(
     :ui => @ui,
     :labfile_path => global[:labfile],
@@ -78,15 +83,14 @@ pre do |global,command,options,args|
     :repo_dir     => global[:repo]
   )
 
-  @ui.logger.debug { "global(#{global.inspect})" }
-  @ui.logger.debug { "options(#{options.inspect})" }
-  @ui.logger.debug { "args(#{args.inspect})" }
-
   TestLab::Utility.log_header(@testlab).each { |line| @logger.info { line } }
 
+  @testlab.boot
+
   if !@ui.quiet?
     message = format_message("TestLab v#{TestLab::VERSION} Loaded".black.bold)
     @testlab.ui.stdout.puts(message)
+    @testlab.ui.logger.info { message.uncolor }
   end
 
   true

data/features/step_definitions/testlab_steps.rb

@@ -10,6 +10,10 @@ When /^I build the lab with "([^"]*)"$/ do |app_name|
   testlab_cmd(app_name, %W(build))
 end
 
+When /^I demolish the lab with "([^"]*)"$/ do |app_name|
+  testlab_cmd(app_name, %W(demolish))
+end
+
 When /^I up the lab with "([^"]*)"$/ do |app_name|
   testlab_cmd(app_name, %W(up))
 end
@@ -24,5 +28,5 @@ end
 
 def testlab_cmd(app_name, *args)
   args = args.join(' ')
-  step %(I run `#{app_name} --repo=#{TEST_REPO} #{args}`)
+  step %(I run `#{app_name} --repo=#{TEST_REPO} --labfile=#{TEST_LABFILE} #{args}`)
 end

data/features/support/Labfile.local

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
+node 'vagrant' do
+
+  provider      TestLab::Provider::Local
+
+  provisioners  [TestLab::Provisioner::Raring]
+
+  config      ({
+    :bind => {
+      :domain => "default.zone"
+    }
+  })
+
+  network 'labnet' do
+    address       '10.128.0.1/16'
+    bridge        :br_test
+  end
+
+  container "test-server" do
+    distro        "ubuntu"
+    release       "precise"
+
+    provisioners   [
+      TestLab::Provisioner::AptCacherNG,
+      TestLab::Provisioner::Apt
+    ]
+
+    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
+
+    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/Labfile.vagrant

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
+node 'vagrant' do
+
+  provider      TestLab::Provider::Vagrant
+
+  provisioners  [
+    TestLab::Provisioner::Raring,
+    TestLab::Provisioner::Bind
+  ]
+
+  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"
+    }
+  })
+
+  network 'labnet' do
+    address       '10.128.0.1/16'
+    bridge        :br0
+  end
+
+  container "test-server" do
+    distro        "ubuntu"
+    release       "precise"
+
+    provisioners   [
+      TestLab::Provisioner::Resolv,
+      TestLab::Provisioner::AptCacherNG,
+      TestLab::Provisioner::Apt
+    ]
+
+    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
+
+    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

@@ -2,8 +2,16 @@ 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__)
 
+if ENV['USER'] == 'vagrant'
+  TEST_LABFILE = File.join(TEST_REPO, 'Labfile.local')
+else
+  TEST_LABFILE = File.join(TEST_REPO, 'Labfile.vagrant')
+end
+
+
 Before do
   # Using "announce" causes massive warnings on 1.9.2
   @aruba_timeout_seconds = 3600

data/features/testlab.feature

@@ -11,6 +11,8 @@ Feature: TestLab command-line
     Then the exit status should be 0
     When I get the containers ssh-config with "tl"
     Then the exit status should be 0
+    When I demolish the lab with "tl"
+    Then the exit status should be 0
 
 
   Scenario: TestLab help
@@ -26,8 +28,6 @@ Feature: TestLab command-line
 
 
   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"
@@ -37,8 +37,6 @@ Feature: TestLab command-line
 
 
   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"
@@ -57,8 +55,6 @@ Feature: TestLab command-line
     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"
+  Scenario: TestLab Demolish
+    When I demolish the lab with "tl"
     Then the exit status should be 0

data/lib/commands/container.rb

@@ -20,193 +20,17 @@
 
 # CONTAINERS
 #############
-desc 'Manage containers'
-arg_name 'Describe arguments to container here'
-command :container do |c|
-
-  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
-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
-        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.create
-        end
-      end
-    end
-  end
-
-  # CONTAINER DESTROY
-  ####################
-  c.desc 'Destroy a container'
-  c.long_desc <<-EOF
-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
-        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.destroy
-        end
-      end
-    end
-  end
-
-  # CONTAINER UP
-  ###############
-  c.desc 'Up a container'
-  c.long_desc <<-EOF
-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
-        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.up
-        end
-      end
-    end
-  end
-
-  # CONTAINER DOWN
-  #################
-  c.desc 'Down a container'
-  c.long_desc <<-EOF
-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
-        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.down
-        end
-      end
-    end
-  end
-
-  # CONTAINER SETUP
-  ####################
-  c.desc 'Setup a container'
-  c.long_desc <<-EOF
-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
-        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.setup
-        end
-      end
-    end
-  end
-
-  # CONTAINER TEARDOWN
-  ####################
-  c.desc 'Teardown a container'
-  c.long_desc <<-EOF
-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
-        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
-        end
-      end
-    end
-  end
-
-  # CONTAINER BUILD
-  ##################
-  c.desc 'Build a container'
-  c.long_desc <<-EOF
-Attempts to build up the container.  TestLab will attempt to create, online and provision the container.
-
-The container is taken through the following phases:
-
-  Create -> Up -> Setup
-EOF
-  c.command :build do |build|
-    build.action do |global_options, options, args|
-      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!"
-
-        containers.each do |container|
-          container.build
-        end
-      end
-    end
-  end
+build_lab_commands(:container, TestLab::Container) do |c|
 
   # CONTAINER STATUS
   ###################
-  c.desc 'Display the status of containers'
+  c.desc 'Display containers status'
   c.long_desc <<-EOF
 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::Container.all
-      else
-        # 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? }
+      containers = iterate_objects_by_name(options[:name], TestLab::Container).delete_if{ |container| container.node.dead? }
 
       if (containers.count == 0)
         @testlab.ui.stderr.puts("You either have no containers defined or dead nodes!".yellow)
@@ -215,13 +39,12 @@ EOF
           OpenStruct.new(container.status)
         end
       end
-
     end
   end
 
   # CONTAINER SSH
   ################
-  c.desc 'Open an SSH console to a container'
+  c.desc 'Container SSH console'
   c.command :ssh do |ssh|
 
     ssh.desc 'Specify an SSH Username to use'
@@ -248,30 +71,22 @@ EOF
 
   # CONTAINER SSH-CONFIG
   #######################
-  c.desc 'Display the SSH configuration for a container'
+  c.desc 'Container SSH configuration'
   c.long_desc <<-EOF
-Displays the SSH configuration for the supplied container name.
+Displays a containers SSH configuration.
 EOF
   c.command :'ssh-config' do |ssh_config|
 
     ssh_config.action do |global_options, options, args|
-      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!"
-
-        containers.each do |container|
-          puts(container.ssh_config)
-        end
+      iterate_objects_by_name(options[:name], TestLab::Container) do |container|
+        puts(container.ssh_config)
       end
     end
   end
 
   # CONTAINER RECYCLE
   ####################
-  c.desc 'Recycles a container'
+  c.desc 'Recycle containers'
   c.long_desc <<-EOF
 Recycles a container.  The container is taken through a series of state changes to ensure it is pristine.
 
@@ -281,51 +96,37 @@ Teardown -> Down -> Destroy -> Create -> Up -> Setup
 EOF
   c.command :recycle do |recycle|
     recycle.action do |global_options, options, args|
-      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!"
-
-        containers.each do |container|
-          container.teardown
-          container.down
-          container.destroy
-
-          container.create
-          container.up
-          container.setup
-        end
+      iterate_objects_by_name(options[:name], TestLab::Container) do |container|
+        container.teardown
+        container.down
+        container.destroy
+
+        container.create
+        container.up
+        container.setup
       end
     end
   end
 
   # CONTAINER CLONE
   ##################
-  c.desc 'Clone a container'
+  c.desc 'Clone containers'
   c.long_desc <<-EOF
-An ephemeral copy of the container is started.  There is a small delay incured during the first clone operation.
+An ephemeral copy of the container is started.
+
+NOTE: 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
-        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.clone
-        end
+      iterate_objects_by_name(options[:name], TestLab::Container) do |container|
+        container.clone
       end
     end
   end
 
   # CONTAINER EXPORT
   ###################
-  c.desc 'Export a container to a shipping container (file)'
+  c.desc 'Export containers'
   c.command :export do |export|
 
     export.desc 'Specify the level of bzip2 compression to use (1-9)'
@@ -334,28 +135,19 @@ EOF
     export.flag [:c, :compression]
 
     export.desc 'Specify the shipping container file to export to.'
-    # export.default_value nil
     export.arg_name 'filename'
     export.flag [:output]
 
     export.action do |global_options, options, args|
-      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!"
-
-        containers.each do |container|
-          container.export(options[:compression], options[:output])
-        end
+      iterate_objects_by_name(options[:name], TestLab::Container) do |container|
+        container.export(options[:compression], options[:output])
       end
     end
   end
 
   # CONTAINER IMPORT
   ###################
-  c.desc 'Import a shipping container (file)'
+  c.desc 'Import containers'
   c.command :import do |import|
 
     import.desc 'Specify the shipping container file to import from.'
@@ -367,11 +159,7 @@ EOF
         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!"
-
-        containers.each do |container|
+        iterate_objects_by_name(options[:name], TestLab::Container) do |container|
           container.import(options[:input])
         end
       end