testlab 0.7.6 → 0.8.0

data/lib/commands/network.rb

@@ -20,150 +20,7 @@
 
 # NETWORKS
 ###########
-desc 'Manage networks'
-arg_name 'Describe arguments to network here'
-command :network do |c|
-
-  c.desc 'Network ID or Name'
-  c.arg_name 'network'
-  c.flag [:n, :name]
-
-  # NETWORK CREATE
-  #################
-  c.desc 'Create a network'
-  c.long_desc <<-EOF
-Create a network.  The network is created.
-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
-        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 screateplied!"
-
-        network.create
-      end
-    end
-  end
-
-  # NETWORK DESTROY
-  #################
-  c.desc 'Destroy a network'
-  c.long_desc <<-EOF
-Destroy a network.  The network is destroyed.
-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
-        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!"
-
-        network.destroy
-      end
-    end
-  end
-
-  # NETWORK UP
-  #############
-  c.desc 'Up a network'
-  c.long_desc <<-EOF
-Up a network.  The network 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
-        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!"
-
-        network.up
-      end
-    end
-  end
-
-  # NETWORK DOWN
-  ###############
-  c.desc 'Down a network'
-  c.long_desc <<-EOF
-Down a network.  The network 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
-        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!"
-
-        network.down
-      end
-    end
-  end
-
-  # NETWORK SETUP
-  ################
-  c.desc 'Setup a network'
-  c.long_desc <<-EOF
-Setup a network.  The network is created, started and 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
-        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!"
-
-        network.setup
-      end
-    end
-  end
-
-  # NETWORK TEARDOWN
-  ###################
-  c.desc 'Teardown a network'
-  c.long_desc <<-EOF
-Teardown a network.  The network is offlined and destroyed.
-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
-        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!"
-
-        network.teardown
-      end
-    end
-  end
-
-  # NETWORK BUILD
-  ################
-  c.desc 'Build a network'
-  c.long_desc <<-EOF
-Attempts to build up the network.  TestLab will attempt to create, online and provision the network.
-
-The network 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
-        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!"
-
-        network.build
-      end
-    end
-  end
+build_lab_commands(:network, TestLab::Network) do |c|
 
   # NETWORK STATUS
   #################
@@ -173,27 +30,13 @@ Displays the status of all networks or single/multiple networks if supplied via
 EOF
   c.command :status do |status|
     status.action do |global_options, options, args|
-      if options[:name].nil?
-        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? }
+      networks = iterate_objects_by_name(options[:name], TestLab::Network).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
+      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
     end
@@ -209,15 +52,12 @@ EOF
     route.desc 'Add routes to lab networks'
     route.command :add do |add|
       add.action do |global_options,options,args|
-        help_now!('a name is required') if options[:name].nil?
-
-        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!"
-
-        p = TestLab::Provisioner::Route.new({}, @ui)
-        p.on_network_setup(network)
-        @testlab.ui.stdout.puts("Added routes successfully!".green.bold)
-        @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
+        iterate_objects_by_name(options[:name], TestLab::Network) do |network|
+          p = TestLab::Provisioner::Route.new({}, @ui)
+          p.on_network_setup(network)
+          @testlab.ui.stdout.puts("Added routes successfully!".green.bold)
+          @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
+        end
       end
     end
 
@@ -226,15 +66,12 @@ EOF
     route.desc 'Delete routes to lab networks'
     route.command :del do |del|
       del.action do |global_options,options,args|
-        help_now!('a name is required') if options[:name].nil?
-
-        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!"
-
-        p = TestLab::Provisioner::Route.new({}, @ui)
-        p.on_network_teardown(network)
-        @testlab.ui.stdout.puts("Deleted routes successfully!".red.bold)
-        @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
+        iterate_objects_by_name(options[:name], TestLab::Network) do |network|
+          p = TestLab::Provisioner::Route.new({}, @ui)
+          p.on_network_teardown(network)
+          @testlab.ui.stdout.puts("Deleted routes successfully!".red.bold)
+          @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
+        end
       end
     end
 
@@ -243,17 +80,14 @@ EOF
     route.desc 'Show routes to lab networks'
     route.command :show do |show|
       show.action do |global_options,options,args|
-        help_now!('a name is required') if options[:name].nil?
-
-        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!"
-
-        @testlab.ui.stdout.puts("TestLab routes:".green.bold)
-        case RUBY_PLATFORM
-        when /darwin/ then
-          @testlab.ui.stdout.puts %x(netstat -nrf inet | grep '#{network.node.ip}').strip
-        when /linux/ then
-          @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
+        iterate_objects_by_name(options[:name], TestLab::Network) do |network|
+          @testlab.ui.stdout.puts("TestLab routes:".green.bold)
+          case RUBY_PLATFORM
+          when /darwin/ then
+            @testlab.ui.stdout.puts %x(netstat -nrf inet | grep '#{network.node.ip}').strip
+          when /linux/ then
+            @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
+          end
         end
       end
     end

data/lib/commands/node.rb

@@ -20,168 +20,20 @@
 
 # NODES
 ########
-desc 'Manage nodes'
-arg_name 'Describe arguments to node here'
-command :node do |c|
-
-  c.desc 'Node ID or Name'
-  c.arg_name 'node'
-  c.flag [:n, :name]
-
-  # NODE CREATE
-  ##############
-  c.desc 'Create a node'
-  c.long_desc <<-EOF
-Create a node.  The node is created.
-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
-        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        node.nil? and raise TestLab::TestLabError, "We could not find the node you screateplied!"
-
-        node.create
-      end
-    end
-  end
-
-  # NODE DESTROY
-  ############
-  c.desc 'Destroy a node'
-  c.long_desc <<-EOF
-Destroy a node.  The node is stopped and destroyed.
-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
-        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
-
-        node.destroy
-      end
-    end
-  end
-
-  # NODE UP
-  ##########
-  c.desc 'Up a node'
-  c.long_desc <<-EOF
-Up a node.  The node 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
-        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
-
-        node.up
-      end
-    end
-  end
-
-  # NODE DOWN
-  ############
-  c.desc 'Down a node'
-  c.long_desc <<-EOF
-Down a node.  The node 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
-        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
-
-        node.down
-      end
-    end
-  end
-
-  # NODE SETUP
-  #############
-  c.desc 'Setup a node'
-  c.long_desc <<-EOF
-Setup a node.  The node is created, started and 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
-        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
-
-        node.setup
-      end
-    end
-  end
-
-  # NODE TEARDOWN
-  ################
-  c.desc 'Teardown a node'
-  c.long_desc <<-EOF
-Teardown a node.  The node is offlined and destroyed.
-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
-        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
-
-        node.teardown
-      end
-    end
-  end
-
-  # NODE BUILD
-  #############
-  c.desc 'Build a node'
-  c.long_desc <<-EOF
-Attempts to build up the node.  TestLab will attempt to create, online and provision the node.
-
-The node 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
-        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
-
-        node.build
-      end
-    end
-  end
+build_lab_commands(:node, TestLab::Node) do |c|
 
   # NODE STATUS
   ##############
-  c.desc 'Display the status of node(s)'
+  c.desc 'Display nodes status'
   c.long_desc 'Displays the status of all nodes or a single node if supplied via the ID parameter.'
   c.command :status do |status|
     status.action do |global_options, options, args|
-      if options[:name].nil?
-        # No ID supplied; show everything
-        ZTK::Report.new(:ui => @testlab.ui).list(@testlab.nodes, TestLab::Node::STATUS_KEYS) do |node|
-          OpenStruct.new(node.status)
-        end
-      else
-        # ID supplied; show just that item
-        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:name].to_sym }.first
-        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
+      nodes = iterate_objects_by_name(options[:name], TestLab::Node)
 
-        ZTK::Report.new(:ui => @testlab.ui).list(node, TestLab::Node::STATUS_KEYS) do |node|
+      if (nodes.count == 0)
+        @testlab.ui.stderr.puts("You either have no nodes defined or dead nodes!".yellow)
+      else
+        ZTK::Report.new(:ui => @testlab.ui).list(nodes, TestLab::Node::STATUS_KEYS) do |node|
           OpenStruct.new(node.status)
         end
       end
@@ -190,13 +42,10 @@ EOF
 
   # NODE SSH
   ###########
-  c.desc 'Open an SSH console to a node'
+  c.desc 'Node SSH console'
   c.command :ssh do |ssh|
     ssh.action do |global_options,options,args|
-      help_now!('a name is required') if options[:name].nil?
-
-      node = @testlab.nodes.select{ |n| n.id.to_sym == options[:name].to_sym }.first
-      node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
+      node = iterate_objects_by_name(options[:name], TestLab::Node).first
 
       node.ssh.console
     end

data/lib/commands/testlab.rb

@@ -20,7 +20,14 @@
 
 # LAB CREATE
 #############
-desc 'Create the test lab'
+desc 'Create the lab components'
+long_desc <<-EOF
+Attempts to create the defined lab components.
+
+The components are created in the following order:
+
+Nodes -> Networks -> Containers
+EOF
 command :create do |create|
   create.action do |global_options,options,args|
     @testlab.create
@@ -29,7 +36,14 @@ end
 
 # LAB DESTROY
 ##############
-desc 'Destroy the test lab'
+desc 'Destroy the lab components'
+long_desc <<-EOF
+Attempts to destroy the defined lab components.
+
+The components are destroyed in the following order:
+
+Nodes -> Networks -> Containers
+EOF
 command :destroy do |destroy|
   destroy.action do |global_options,options,args|
     @testlab.destroy
@@ -38,7 +52,14 @@ end
 
 # LAB ONLINE
 #############
-desc 'Online the test lab'
+desc 'On-line the lab components'
+long_desc <<-EOF
+Attempts to online the defined lab components.
+
+The components are onlined in the following order:
+
+Nodes -> Networks -> Containers
+EOF
 command :up do |up|
   up.action do |global_options,options,args|
     @testlab.up
@@ -47,7 +68,14 @@ end
 
 # LAB OFFLINE
 ##############
-desc 'Offline the test lab'
+desc 'Off-line the lab components'
+long_desc <<-EOF
+Attempts to offline the defined lab components.
+
+The components are offlined in the following order:
+
+Containers -> Networks -> Nodes
+EOF
 command :down do |down|
   down.action do |global_options,options,args|
     @testlab.down
@@ -56,7 +84,14 @@ end
 
 # LAB SETUP
 ############
-desc 'Setup the test lab infrastructure'
+desc 'Provision the lab components'
+long_desc <<-EOF
+Attempts to setup the defined lab components.
+
+The components are set up in the following order:
+
+Nodes -> Networks -> Containers
+EOF
 command :setup do |setup|
   setup.action do |global_options,options,args|
     @testlab.setup
@@ -65,7 +100,14 @@ end
 
 # LAB TEARDOWN
 ###############
-desc 'Teardown the test lab infrastructure'
+desc 'De-provision the lab components'
+long_desc <<-EOF
+Attempts to teardown the defined lab components.
+
+The components are torndown in the following order:
+
+Containers -> Networks -> Nodes
+EOF
 command :teardown do |teardown|
   teardown.action do |global_options,options,args|
     @testlab.teardown
@@ -74,15 +116,15 @@ end
 
 # LAB BUILD
 ############
-desc 'Build the test lab infrastructure'
+desc 'Build the lab'
 long_desc <<-EOF
-Attempts to build the defined test lab.  TestLab will attempt to create, online and provision the lab components.
+Attempts to build the defined lab.  TestLab will attempt to create, online and provision the lab components.
 
 The components are built in the following order:
 
 Nodes -> Networks -> Containers
 
-TestLab will then attempt to build the componenets executing the following tasks for each:
+TestLab will then attempt to build the components, executing the following tasks for each:
 
 Create -> Up -> Setup
 EOF
@@ -92,9 +134,29 @@ command :build do |build|
   end
 end
 
+# LAB DEMOLISH
+###############
+desc 'Demolish the lab'
+long_desc <<-EOF
+Attempts to demolish the defined lab.  TestLab will attempt to deprovision, offline and destroy the lab components.
+
+The components are demolished in the following order:
+
+Containers -> Networks -> Nodes
+
+TestLab will then attempt to demolish the components, executing the following tasks for each:
+
+Teardown -> Down -> Destroy
+EOF
+command :demolish do |demolish|
+  demolish.action do |global_options,options,args|
+    @testlab.demolish
+  end
+end
+
 # LAB STATUS
 #############
-desc 'Display information on the status of the test lab'
+desc 'Display the lab status'
 command :status do |status|
   status.action do |global_options,options,args|
     @testlab.ui.stdout.puts("\nNODES:".green.bold)

data/lib/testlab/container/actions.rb

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

data/lib/testlab/container/io.rb

@@ -2,6 +2,7 @@ class TestLab
   class Container
 
     module IO
+      require 'tempfile'
       PBZIP2_MEMORY = 256
 
       # Export the container
@@ -14,8 +15,12 @@ class TestLab
 
         self.down
 
-        sc_file      = %(/tmp/#{self.id}.sc)
-        local_file ||= File.join(Dir.pwd, File.basename(sc_file))
+        export_tempfile = Tempfile.new('export')
+        remote_filename = File.basename(export_tempfile.path.dup)
+        export_tempfile.close!
+
+        remote_file = File.join("", "tmp", remote_filename)
+        local_file ||= File.join(Dir.pwd, File.basename(remote_file))
         local_file   = File.expand_path(local_file)
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
@@ -24,15 +29,15 @@ set -x
 set -e
 
 du -sh #{self.lxc.container_root}
-find #{self.lxc.container_root} -print0 -depth | cpio -o0 | pbzip2 -#{compression} -vfczm#{PBZIP2_MEMORY} > #{sc_file}
-chown ${SUDO_USER}:${SUDO_USER} #{sc_file}
-ls -lah #{sc_file}
+find #{self.lxc.container_root} -print0 -depth | cpio -o0 | pbzip2 -#{compression} -vfczm#{PBZIP2_MEMORY} > #{remote_file}
+chown ${SUDO_USER}:${SUDO_USER} #{remote_file}
+ls -lah #{remote_file}
 EOF
         end
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Export', :cyan)) do
           File.exists?(local_file) and FileUtils.rm_f(local_file)
-          self.node.ssh.download(sc_file, local_file)
+          self.node.ssh.download(remote_file, local_file)
         end
 
         puts("Your shipping container is now exported and available at '#{local_file}'!")
@@ -49,12 +54,16 @@ EOF
         self.down
         self.destroy
 
-        sc_file    = %(/tmp/#{self.id}.sc)
-        local_file = File.expand_path(local_file)
+        import_tempfile = Tempfile.new('import')
+        remote_filename = File.basename(import_tempfile.path.dup)
+        import_tempfile.close!
+
+        remote_file = File.join("", "tmp", remote_filename)
+        local_file  = File.expand_path(local_file)
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Import', :cyan)) do
-          self.node.ssh.exec(%(sudo rm -fv #{sc_file}), :silence => true, :ignore_exit_status => true)
-          self.node.ssh.upload(local_file, sc_file)
+          self.node.ssh.exec(%(sudo rm -fv #{remote_file}), :silence => true, :ignore_exit_status => true)
+          self.node.ssh.upload(local_file, remote_file)
         end
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Expand', :cyan)) do
@@ -62,8 +71,8 @@ EOF
 set -x
 set -e
 
-ls -lah #{sc_file}
-pbzip2 -vdcm#{PBZIP2_MEMORY} #{sc_file} | cpio -uid && rm -fv #{sc_file}
+ls -lah #{remote_file}
+pbzip2 -vdcm#{PBZIP2_MEMORY} #{remote_file} | cpio -uid && rm -fv #{remote_file}
 du -sh #{self.lxc.container_root}
 EOF
         end