torpedo 1.0.10 → 1.0.11

data/CHANGELOG

@@ -1,3 +1,9 @@
+* Wed Dec 14 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.11
+  -Set paranoid to false for ssh connection tests. (net-ssh)
+  -Add options to disable server and image cleanup.
+  -Remove sort on image id (we now use UUID's)
+  -Add setup test to initialize image and flavor refs.
+
 * Wed Dec 7 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.10
   -Add admin password and change password tests.
   -Add revert resize test.

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

data/lib/torpedo/compute/helper.rb

@@ -39,7 +39,8 @@ module Helper
       end
     elsif image_ref.nil? or image_ref.empty? then
       #take the last image if IMAGE_REF and or IMAGE_NAME aren't set
-      images = conn.images.sort{|x,y| x[:id] <=> y[:id]}
+      images = conn.images
+      raise "Image list is empty." if images.empty?
       image_ref = images.last[:id].to_s
     end
 

data/lib/torpedo/compute/servers.rb

@@ -8,9 +8,9 @@ class Servers < Test::Unit::TestCase
 
   @@servers = []
   @@images = []
-  @@image_ref = Helper::get_image_ref(Helper::get_connection)
-  @@flavor_ref = Helper::get_flavor_ref(Helper::get_connection)
-  @@flavor_ref_resize = Helper::get_flavor_ref_resize(@conn)
+  @@image_ref = nil
+  @@flavor_ref = nil
+  @@flavor_ref_resize = nil
   @@server = nil #ref to last created server
   @@hostname = "torpedo"
 
@@ -48,7 +48,7 @@ class Servers < Test::Unit::TestCase
 
   def ssh_test(ip_addr, test_cmd="hostname", test_output=@@hostname, admin_pass=@@admin_pass)
 
-    ssh_opts = {}
+    ssh_opts = {:paranoid => false}
     if TEST_ADMIN_PASSWORD then
       ssh_opts.store(:password, admin_pass)
     else
@@ -135,6 +135,24 @@ class Servers < Test::Unit::TestCase
 
   end
 
+  def test_000_setup
+    begin
+      @@image_ref = Helper::get_image_ref(Helper::get_connection)
+    rescue Exception => e
+      fail("Failed get image ref: #{e.message}")
+    end
+    begin
+      @@flavor_ref = Helper::get_flavor_ref(Helper::get_connection)
+    rescue Exception => e
+      fail("Failed get flavor ref: #{e.message}")
+    end
+    begin
+      @@flavor_ref_resize = Helper::get_flavor_ref_resize(@conn)
+    rescue Exception => e
+      fail("Failed get flavor ref resize: #{e.message}")
+    end
+  end
+
   def test_001_create_server
 
     metadata={ "key1" => "value1", "key2" => "value2" }
@@ -448,11 +466,15 @@ class Servers < Test::Unit::TestCase
   end if TEST_CREATE_IMAGE
 
   def test_999_teardown
-    @@servers.each do |server|
-      assert_equal(true, server.delete!)
+    if CLEAN_UP_SERVERS
+      @@servers.each do |server|
+        assert_equal(true, server.delete!)
+      end
     end
-    @@images.each do |image|
-      assert_equal(true, image.delete!)
+    if CLEAN_UP_IMAGES
+      @@images.each do |image|
+        assert_equal(true, image.delete!)
+      end
     end
   end
 

data/lib/torpedo.rb

@@ -4,9 +4,9 @@ require 'torpedo/config'
 configs = Torpedo::Config.load_configs
 
 SSH_TIMEOUT=(configs['ssh_timeout'] || 30).to_i
-TEST_SSH=configs['test_ssh'] || true
+TEST_SSH=configs.fetch('test_ssh', true)
 PING_TIMEOUT=(configs['ping_timeout'] || 60).to_i
-TEST_PING=configs['test_ping'] || true
+TEST_PING=configs.fetch('test_ping', true)
 SERVER_BUILD_TIMEOUT=(configs['server_build_timeout'] || 60).to_i
 SSH_PRIVATE_KEY=configs['ssh_private_key'] || ENV['HOME'] + "/.ssh/id_rsa"
 SSH_PUBLIC_KEY=configs['ssh_public_key'] || ENV['HOME'] + "/.ssh/id_rsa.pub"
@@ -18,6 +18,8 @@ TEST_RESIZE_SERVER=configs['test_resize_server'] || false
 TEST_REVERT_RESIZE_SERVER=configs['test_revert_resize_server'] || false
 TEST_ADMIN_PASSWORD=configs['test_admin_password'] || false
 TEST_HOSTID_ON_RESIZE=configs['test_hostid_on_resize'] || false
+CLEAN_UP_SERVERS=configs.fetch('clean_up_servers', true)
+CLEAN_UP_IMAGES=configs.fetch('clean_up_images', true)
 KEYPAIR=configs['keypair']
 KEYNAME=configs['keyname']
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torpedo
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-07 00:00:00 -05:00
+date: 2011-12-14 00:00:00 -05:00
 default_executable: torpedo
 dependencies: 
 - !ruby/object:Gem::Dependency