torpedo 1.0.3 → 1.0.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Sat Oct 29 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.4
+  -Run image metadata tests last because they make the snapshot un-bootable.
+  -Fixes to the resize tests.
+
 * Sat Oct 29 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.3
   - Fix issues boolean config file issue with test_create_image,
    test_rebuild_server, and test_resize_server config options.

data/README.md

@@ -9,16 +9,20 @@ Fire when ready. Fast Ruby integration tests for OpenStack.
 Installation
 ------------
 
+1. Install the Gem.
+2. Create the torpedo.conf file in your HOME directory.
+3. Source novarc for your OpenStack Compute account.
+
+```bash
 	gem install torpedo
 
-	#create the torpedo YAML config in your $HOME dir:
     cat > ~/.torpedo.conf <<"EOF_CAT"
 	# YAML config file for torpedo
 
 	# timeouts
-	server_build_timeout: 120
+	server_build_timeout: 420
 	ping_timeout: 60
-	ssh_timeout: 30
+	ssh_timeout: 60
 
 	# SERVER test settings
 	test_create_image: false
@@ -26,7 +30,7 @@ Installation
 	test_resize_server: false
 
 	# IMAGES (Set one of the following)
-	#image_name:
+	image_name: Ubuntu Natty (11.04)
 	#image_ref:
 
 	# FLAVORS (Set one of the following)
@@ -38,10 +42,12 @@ Installation
 	#ssh_public_key: 
 
 	# KEYPAIRS (used to verify AMI style images)
-	keypair: test.pem
-	keyname: test
+	#keypair: test.pem
+	#keyname: test
 	EOF_CAT
 
+	source novarc
+```
 
 Examples
 --------
@@ -69,6 +75,30 @@ Run all tests and output an Xunit style XML report:
 
 	torpedo fire --xml-report=FILE
 
+Payload
+--------
+
+* list flavors
+* get flavor
+* list images
+* get image
+* list limits
+* create server (ping and ssh test)
+* delete server metadata items
+* update one server metadata item
+* update multiple server metadata items
+* set server metadata items
+* clear server metadata
+* create image
+* rebuild server (ping and ssh test)
+* resize server (ping and ssh test)
+* resize confirm (ping and ssh test)
+* delete image metadata
+* update one image metadata item
+* update multiple image metadata items
+* set image metadata items
+* clear image metadata
+
 License
 -------
 Copyright (c) 2011 Dan Prince. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/bin/torpedo

@@ -4,7 +4,7 @@ require "rubygems"
 require "thor"
 
 # uncomment this for local testing
-$:.unshift File.dirname(__FILE__) + "/../lib"
+#$:.unshift File.dirname(__FILE__) + "/../lib"
 
 require "torpedo"
 

data/lib/torpedo/compute/servers.rb

@@ -9,6 +9,7 @@ class Servers < Test::Unit::TestCase
   @@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)
   @@server = nil #ref to last created server
 
   def setup
@@ -82,7 +83,7 @@ class Servers < Test::Unit::TestCase
       timeout(SERVER_BUILD_TIMEOUT) do
         until server.status == check_status do
           if server.status == "ERROR" then
-            fail('Server ERROR state detected when booting instance!')
+            fail('Server ERROR state detected when booting server!')
           end
           server = @conn.server(server.id)
           sleep 1
@@ -116,7 +117,7 @@ class Servers < Test::Unit::TestCase
     server = create_server(options)
     assert_not_nil(@@server.adminPass)
 
-    #boot an instance and check it
+    #boot a server and check it
     check_server(server, @@image_ref, @@flavor_ref)
 
     assert_equal "value1", @@server.metadata['key1']
@@ -226,7 +227,52 @@ class Servers < Test::Unit::TestCase
 
   end if TEST_CREATE_IMAGE
 
-  def test_021_delete_image_metadata_items
+ 
+  def test_030_rebuild
+    # make sure our snapshot boots
+    personalities={SSH_PUBLIC_KEY => "/root/.ssh/authorized_keys"}
+    @@server.rebuild!(:imageRef => @@image_ref, :personality => personalities)
+    server = @conn.server(@@server.id)
+    sleep 15 # sleep a couple seconds until rebuild starts
+    check_server(server, @@image_ref, @@flavor_ref)
+
+  end if TEST_REBUILD_SERVER
+
+  def test_040_resize
+
+    @@server.resize!(@@flavor_ref_resize)
+    server = @conn.server(@@server.id)
+    assert_equal('RESIZE', server.status)
+
+    begin
+      timeout(SERVER_BUILD_TIMEOUT) do
+        until server.status == 'VERIFY_RESIZE' do
+          if server.status == "ERROR" then
+            fail('Server ERROR state detected when resizing server!')
+          end
+          server = @conn.server(server.id)
+          sleep 1
+        end
+      end
+    rescue Timeout::Error => te
+      fail('Timeout resizing server.')
+    end
+ 
+    check_server(server, @@image_ref, @@flavor_ref_resize, 'VERIFY_RESIZE')
+
+  end if TEST_RESIZE_SERVER
+
+  def test_041_resize_confirm
+
+    @@server.confirm_resize!
+    server = @conn.server(@@server.id)
+    assert_equal('ACTIVE', server.status)
+
+    check_server(server, @@image_ref, @@flavor_ref_resize)
+
+  end if TEST_RESIZE_SERVER
+
+  def test_051_delete_image_metadata_items
 
     metadata = @conn.image(@@image_ref).metadata
     metadata.each_pair do |key, value|
@@ -239,7 +285,7 @@ class Servers < Test::Unit::TestCase
 
   end if TEST_CREATE_IMAGE
 
-  def test_022_update_one_image_metadata_item
+  def test_052_update_one_image_metadata_item
 
     metadata = @conn.image(@@image_ref).metadata
     metadata['foo1'] = 'bar1'
@@ -253,7 +299,7 @@ class Servers < Test::Unit::TestCase
  
   end if TEST_CREATE_IMAGE
 
-  def test_023_update_some_image_metadata_items
+  def test_053_update_some_image_metadata_items
 
     metadata = @conn.image(@@image_ref).metadata
     metadata['foo1'] = 'bar1'
@@ -269,7 +315,7 @@ class Servers < Test::Unit::TestCase
  
   end if TEST_CREATE_IMAGE
 
-  def test_024_set_image_metadata_items
+  def test_054_set_image_metadata_items
 
     metadata = @conn.image(@@image_ref).metadata
     metadata['foo1'] = 'that'
@@ -287,7 +333,7 @@ class Servers < Test::Unit::TestCase
  
   end if TEST_CREATE_IMAGE
 
-  def test_025_clear_image_metadata
+  def test_055_clear_image_metadata
 
     metadata = @conn.image(@@image_ref).metadata
     assert metadata.clear!
@@ -297,48 +343,6 @@ class Servers < Test::Unit::TestCase
     assert_equal 0, metadata.size
  
   end if TEST_CREATE_IMAGE
-  
-  def test_030_rebuild_instance
-    # make sure our snapshot boots
-    personalities={SSH_PUBLIC_KEY => "/root/.ssh/authorized_keys"}
-    @@server.rebuild!(:imageRef => @@image_ref, :personality => personalities)
-    server = @conn.server(@@server.id)
-    sleep 15 # sleep a couple seconds until rebuild starts
-    check_server(server, @@image_ref, @@flavor_ref)
-
-  end if TEST_REBUILD_SERVER
-
-  def test_040_resize_instance
-
-    flavor_ref_resize = Helper::get_flavor_ref_resize(@conn)
-
-    @@server.resize!(flavor_ref_resize)
-    server = @conn.server(@@server.id)
-    assert_equal('RESIZE', @@server.status)
-
-    begin
-      timeout(SERVER_BUILD_TIMEOUT) do
-        until server.status == 'VERIFY_RESIZE' do
-          if server.status == "ERROR" then
-            fail('Server ERROR state detected when resizing instance!')
-          end
-          server = @conn.server(@@server.id)
-          sleep 1
-        end
-      end
-    rescue Timeout::Error => te
-      fail('Timeout resizing server.')
-    end
- 
-    check_server(server, @@image_ref, flavor_ref_resize, 'VERIFY_RESIZE')
-
-    server.confirm_resize!
-    server = @conn.server(@@server.id)
-    assert_equal('ACTIVE', @@server.status)
-
-    check_server(server, @@image_ref, flavor_ref_resize)
-
-  end if TEST_RESIZE_SERVER
 
   def test_999_teardown
     @@servers.each do |server|

data/torpedo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{torpedo}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Prince"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torpedo
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Dan Prince