testlab 0.4.1 → 0.4.2

data/bin/tl

@@ -161,6 +161,45 @@ command :network do |c|
   c.arg_name 'network'
   c.flag [:i, :id]
 
+
+  # ROUTES
+  #########
+  c.desc 'Manage routes'
+  c.command :route do |route|
+
+    # ROUTE ADD
+    ############
+    route.desc 'Add routes to lab networks'
+    route.command :add do |add|
+      add.action do |global_options,options,args|
+        help_now!('id is required') if options[:id].nil?
+
+        network = @testlab.networks.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        network.nil? and raise TestLab::TestLabError, "We could not find the network you supplied!"
+
+        network.manage_route(:add)
+        @testlab.ui.stdout.puts("Added routes successfully!".green.bold)
+        @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
+      end
+    end
+
+    # ROUTE DEL
+    ############
+    route.desc 'Delete routes to lab networks'
+    route.command :del do |del|
+      del.action do |global_options,options,args|
+        help_now!('id is required') if options[:id].nil?
+
+        network = @testlab.networks.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        network.nil? and raise TestLab::TestLabError, "We could not find the network you supplied!"
+
+        network.manage_route(:del)
+        @testlab.ui.stdout.puts("Deleted routes successfully!".red.bold)
+        @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
+      end
+    end
+  end
+
   # NETWORK STATUS
   #################
   c.desc 'Display the status of network(s)'
@@ -309,38 +348,6 @@ EOF
 
 end
 
-# ROUTES
-#########
-desc 'Manage routes'
-command :route do |c|
-
-  # ROUTE ADD
-  ############
-  c.desc 'Add routes to lab networks'
-  c.command :add do |add|
-    add.action do |global_options,options,args|
-      @testlab.nodes.each do |node|
-        node.route_setup(:add)
-        @testlab.ui.stdout.puts("Added routes successfully!".green.bold)
-        @testlab.ui.stdout.puts %x(netstat -nr | grep '#{node.ip}').strip
-      end
-    end
-  end
-
-  # ROUTE DEL
-  ############
-  c.desc 'Delete routes to lab networks'
-  c.command :del do |del|
-    del.action do |global_options,options,args|
-      @testlab.nodes.each do |node|
-        node.route_setup(:del)
-        @testlab.ui.stdout.puts("Deleted routes successfully!".red.bold)
-        @testlab.ui.stdout.puts %x(netstat -nr | grep '#{node.ip}').strip
-      end
-    end
-  end
-end
-
 pre do |global,command,options,args|
   # Pre logic here
   # Return true to proceed; false to abort and not call the

data/lib/testlab/network/lifecycle.rb

@@ -9,28 +9,27 @@ class TestLab
 
         self.create
         self.up
-        self.route and route(:add)
+        self.route and manage_route(:add)
       end
 
       # Network Teardown
       def teardown
         @ui.logger.debug { "Network Teardown: #{self.id} " }
 
-        self.route and route(:del)
+        self.route and manage_route(:del)
         self.down
         self.destroy
       end
 
-      def route(action)
-        self.networks.each do |network|
-          command = ZTK::Command.new(:ui => @ui, :silence => true, :ignore_exit_status => true)
+      def manage_route(action)
+        command = ZTK::Command.new(:ui => @ui, :silence => true, :ignore_exit_status => true)
 
-          case RUBY_PLATFORM
-          when /darwin/ then
-            command.exec(%(sudo route #{action} -net #{TestLab::Utility.network(network.address)} #{network.node.ip} #{TestLab::Utility.netmask(network.address)}))
-          when /linux/ then
-            command.exec(%(sudo route #{action} -net #{TestLab::Utility.network(network.address)} netmask #{TestLab::Utility.netmask(network.address)} gw #{network.node.ip}))
-          end
+        case RUBY_PLATFORM
+        when /darwin/ then
+          action = ((action == :del) ? :delete : :add)
+          command.exec(%(sudo route #{action} -net #{TestLab::Utility.network(self.address)} #{self.node.ip} #{TestLab::Utility.netmask(self.address)}))
+        when /linux/ then
+          command.exec(%(sudo route #{action} -net #{TestLab::Utility.network(self.address)} netmask #{TestLab::Utility.netmask(self.address)} gw #{self.node.ip}))
         end
       end
 

data/lib/testlab/providers/vagrant.rb

@@ -38,8 +38,6 @@ class TestLab
 
         # ensure our vagrant key is there
         @config[:vagrant] ||= Hash.new
-
-        render_vagrantfile
       end
 
 ################################################################################
@@ -174,6 +172,7 @@ class TestLab
         command = TestLab.build_command_line("vagrant", *args)
         @ui.logger.debug { "command == #{command.inspect}" }
 
+        render_vagrantfile
         ZTK::Command.new(:ui => @ui, :silence => true).exec(command)
       end
 

data/lib/testlab/provisioners/omnibus.rb

@@ -16,6 +16,8 @@ class TestLab
 
         @config[:version]     ||= %(latest)
         @config[:omnibus_url] ||= %(https://www.opscode.com/chef/install.sh)
+
+        @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
       # OmniBus Provisioner Container Setup

data/lib/testlab/provisioners/omnitruck.rb

@@ -18,6 +18,8 @@ class TestLab
         @config[:version]     ||= "latest"
         @config[:prereleases] ||= false
         @config[:nightlies]   ||= false
+
+        @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
       # OmniTruck Provisioner Container Setup

data/lib/testlab/provisioners/templates/chef/omnibus.erb

@@ -3,4 +3,4 @@ cd /tmp
 apt-get -y install wget || yum -y install wget
 rm -fv /tmp/install.sh
 wget -v --no-check-certificate <%= @omnibus_url %> -O /tmp/install.sh
-/bin/bash /tmp/install.sh -v <%= @version -%>
+/bin/bash /tmp/install.sh -v <%= @version %>

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -281,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3337879606359400445
+      hash: 3482118721192015302
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3337879606359400445
+      hash: 3482118721192015302
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25