torpedo 1.0.16 → 1.0.17

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Mon Apr 9 2012 Dan Prince <dprince@redhat.com> - 1.0.17
+  -Adding SLEEP_AFTER_IMAGE_CREATE env option.
+  -Added 'test_limits' option.
+  -Added 'test_ip_type' Set to '4' (for IPv4) or '6' (for IPv6).
+
 * Mon Apr 2 2012 Dan Prince <dprince@redhat.com> - 1.0.16
   -Add NOVA_SERVICE_NAME env setting (defaults is nil)
   -Add NOVA_SERVICE_TYPE env setting (default is 'compute')

data/README.md

@@ -108,4 +108,4 @@ Payload
 
 License
 -------
-Copyright (c) 2011 Dan Prince. See LICENSE.txt for further details.
+Copyright (c) 2011-2012 Dan Prince. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-1.0.16
+1.0.17

data/bin/torpedo

@@ -5,6 +5,7 @@ require "thor"
 
 # uncomment this for local testing
 #$:.unshift File.dirname(__FILE__) + "/../lib"
+STDOUT.sync = true
 
 require "torpedo"
 

data/lib/torpedo.rb

@@ -8,6 +8,7 @@ TEST_SSH=configs.fetch('test_ssh', true)
 PING_TIMEOUT=(configs['ping_timeout'] || 60).to_i
 TEST_PING=configs.fetch('test_ping', true)
 SERVER_BUILD_TIMEOUT=(configs['server_build_timeout'] || 60).to_i
+SLEEP_AFTER_IMAGE_CREATE=(configs['sleep_after_image_create'] || 0).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"
 TEST_CREATE_IMAGE=configs['test_create_image'] || false
@@ -18,6 +19,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
+TEST_IP_TYPE=configs['test_ip_type'] || 4
+TEST_LIMITS=configs.fetch('test_limits', true)
 CLEAN_UP_SERVERS=configs.fetch('clean_up_servers', true)
 CLEAN_UP_IMAGES=configs.fetch('clean_up_images', true)
 KEYPAIR=configs['keypair']

data/lib/torpedo/compute/limits.rb

@@ -14,6 +14,6 @@ class Limits < Test::Unit::TestCase
 
   end
 
-end
+end if TEST_LIMITS
 end
 end

data/lib/torpedo/compute/servers.rb

@@ -81,17 +81,15 @@ class Servers < Test::Unit::TestCase
 
   def ping_test(ip_addr)
     begin
+      ping = TEST_IP_TYPE == 6 ? 'ping6' : 'ping'
+      ping_command = "#{ping} -c 1 #{ip_addr} > /dev/null 2>&1"
       Timeout::timeout(PING_TIMEOUT) do
-
         while(1) do
-          if system("ping -c 1 #{ip_addr} > /dev/null 2>&1") then
-            return true
-          end
+          return true if system(ping_command)
         end
-
       end
     rescue Timeout::Error => te
-      fail("Timeout pinging server: #{ip_addr}")
+      fail("Timeout pinging server: #{ping_command}")
     end
 
     return false
@@ -120,14 +118,15 @@ class Servers < Test::Unit::TestCase
       fail('Timeout creating server.')
     end
 
-    # lookup the first IPv4 address and use that for verification
-    v4_addresses = server.addresses[:public].reject {|addr| addr.version != 4}
-    ping_test(v4_addresses[0].address) if TEST_PING
+    # lookup the first public IP address and use that for verification
+    addresses = server.addresses[:public].select {|a| a.version == TEST_IP_TYPE}
+    address = addresses[0].address
+    ping_test(address) if TEST_PING
     if TEST_SSH
       if TEST_ADMIN_PASSWORD
-        ssh_test(v4_addresses[0].address, "cat /tmp/foo/bar", "yo")
+        ssh_test(address, "cat /tmp/foo/bar", "yo")
       else
-        ssh_test(v4_addresses[0].address)
+        ssh_test(address)
       end
     end
 
@@ -250,9 +249,9 @@ class Servers < Test::Unit::TestCase
   def test_020_create_image
 
     #snapshot the image
-    image = create_image(@@server, :name => "My Backup", :metadata => {"key1" => "value1"})
+    image = create_image(@@server, :name => "torpedo", :metadata => {"key1" => "value1"})
     assert_equal('SAVING', image.status)
-    assert_equal('My Backup', image.name)
+    assert_equal('torpedo', image.name)
     assert_equal(25, image.progress)
     #FIXME: server id should be a uuid string
     assert_equal(@@server.id.to_s, image.server['id'])
@@ -271,6 +270,8 @@ class Servers < Test::Unit::TestCase
       fail('Timeout creating image snapshot.')
     end
 
+    sleep SLEEP_AFTER_IMAGE_CREATE
+
     # Overwrite image_ref to make all subsequent tests use this snapshot
     @@image_ref = image.id.to_s
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torpedo
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 1
   - 0
-  - 16
-  version: 1.0.16
+  - 17
+  version: 1.0.17
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-02 00:00:00 Z
+date: 2012-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement