torpedo 1.0.9 → 1.0.10

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Wed Dec 7 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.10
+  -Add admin password and change password tests.
+  -Add revert resize test.
+  -Add hard and soft reboot tests.
+
 * Wed Nov 16 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.9
   -Add options to disable ssh and ping tests.
 

data/README.md

@@ -28,6 +28,10 @@ Installation
 	test_create_image: false
 	test_rebuild_server: false
 	test_resize_server: false
+	test_revert_resize_server: false
+	test_admin_password: false
+	test_soft_reboot_server: false
+	test_hard_reboot_server: false
 
 	# IMAGES (Set one of the following)
 	image_name: Ubuntu Natty (11.04)
@@ -45,7 +49,7 @@ Installation
 	#ssh_private_key: <your home dir>/.ssh/id_rsa
 	#ssh_public_key: <your home dir>/.ssh/id_rsa.pub
 
-	# KEYPAIRS (used to verify AMI style images)
+	# KEYPAIRS (used to verify images that support keypairs)
 	#keypair: test.pem
 	#keyname: test
 	EOF_CAT
@@ -83,7 +87,7 @@ Payload
 * list images
 * get image
 * list limits
-* create server (ping and ssh test)
+* create server (ping and ssh test w/ admin password and personality)
 * delete server metadata items
 * update one server metadata item
 * update multiple server metadata items
@@ -93,6 +97,9 @@ Payload
 * rebuild server (ping and ssh test)
 * resize server (ping and ssh test)
 * resize confirm (ping and ssh test)
+* resize revert (ping and ssh test)
+* soft reboot (ping and ssh test)
+* hard reboot (ping and ssh test)
 * delete image metadata
 * update one image metadata item
 * update multiple image metadata items

data/Rakefile

@@ -18,13 +18,14 @@ Jeweler::Tasks.new do |gem|
   gem.executables = "torpedo"
   gem.homepage = "http://github.com/dprince/torpedo"
   gem.license = "MIT"
-  gem.summary = %Q{Sink bad code! Ruby Smoke Tests for OpenStack.}
-  gem.description = %Q{CLI to run functional smoke tests for OpenStack.}
+  gem.summary = %Q{Fire when ready. Fast Ruby integration tests for OpenStack.}
+  gem.description = %Q{Fast integration tests OpenStack Compute.}
   gem.email = "dan.prince@rackspace.com"
   gem.authors = ["Dan Prince"]
   # dependencies defined in Gemfile
-  gem.add_dependency 'thor'
-  gem.add_dependency 'openstack-compute', '>= 1.1.4'
+  gem.add_dependency 'thor', '~>0.14.6'
+  gem.add_dependency 'openstack-compute', '~>1.1.5'
+  gem.add_dependency('net-ssh', '~>2.2.1')
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.10

data/lib/torpedo/compute/servers.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 require 'tempfile'
+require 'net/ssh'
 
 module Torpedo
 module Compute
@@ -11,6 +12,7 @@ class Servers < Test::Unit::TestCase
   @@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
+  @@hostname = "torpedo"
 
   def setup
     @conn=Helper::get_connection
@@ -19,6 +21,8 @@ class Servers < Test::Unit::TestCase
   def create_server(server_opts)
     @@server = @conn.create_server(server_opts)
     @@servers << @@server
+    @@admin_pass = @@server.adminPass #original admin_pass
+    @@host_id = @@server.hostId #original host ID
     @@server
   end
 
@@ -29,20 +33,43 @@ class Servers < Test::Unit::TestCase
     image
   end
 
-  def ssh_test(ip_addr)
+  def get_personalities
+    if TEST_ADMIN_PASSWORD then
+      tmp_file=Tempfile.new "server_tests"
+      tmp_file.write("yo")
+      tmp_file.flush
+      {tmp_file.path => "/tmp/foo/bar"}
+    else
+      # NOTE: if admin_pass is disabled we inject the public key so we still
+      # can still login. This would only matter if KEYPAIR was disabled as well.
+      {SSH_PUBLIC_KEY => "/root/.ssh/authorized_keys"}
+    end
+  end
+
+  def ssh_test(ip_addr, test_cmd="hostname", test_output=@@hostname, admin_pass=@@admin_pass)
+
+    ssh_opts = {}
+    if TEST_ADMIN_PASSWORD then
+      ssh_opts.store(:password, admin_pass)
+    else
+      ssh_identity=SSH_PRIVATE_KEY
+      if KEYPAIR and not KEYPAIR.empty? then
+        ssh_identity=KEYPAIR
+      end
+      ssh_opts.store(:keys, ssh_identity)
+    end
+
     begin
       Timeout::timeout(SSH_TIMEOUT) do
-
         while(1) do
-          ssh_identity=SSH_PRIVATE_KEY
-          if KEYPAIR and not KEYPAIR.empty? then
-              ssh_identity=KEYPAIR
-          end
-          if system("ssh -o StrictHostKeyChecking=no -i #{ssh_identity} root@#{ip_addr} /bin/true > /dev/null 2>&1") then
-            return true
+          begin
+            Net::SSH.start(ip_addr, 'root', ssh_opts) do |ssh|
+                return ssh.exec!(test_cmd) == test_output
+            end
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::SSH::Exception
+            next
           end
         end
-
       end
     rescue Timeout::Error => te
       fail("Timeout trying to ssh to server: #{ip_addr}")
@@ -76,7 +103,7 @@ class Servers < Test::Unit::TestCase
     assert_not_nil(server.hostId)
     assert_equal(flavor_ref, server.flavor['id'])
     assert_equal(image_ref.to_s, server.image['id'])
-    assert_equal('test1', server.name)
+    assert_equal(@@hostname, server.name)
     server = @conn.server(server.id)
 
     begin
@@ -96,7 +123,13 @@ class Servers < Test::Unit::TestCase
     # 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
-    ssh_test(v4_addresses[0].address) if TEST_SSH
+    if TEST_SSH
+      if TEST_ADMIN_PASSWORD
+        ssh_test(v4_addresses[0].address, "cat /tmp/foo/bar", "yo")
+      else
+        ssh_test(v4_addresses[0].address)
+      end
+    end
 
     server
 
@@ -104,18 +137,13 @@ class Servers < Test::Unit::TestCase
 
   def test_001_create_server
 
-    # NOTE: When using AMI style images we rely on keypairs for SSH access.
-    
-    # NOTE: injecting two or more files doesn't work for now due to XenStore
-    # limitations
-    personalities={SSH_PUBLIC_KEY => "/root/.ssh/authorized_keys"}
     metadata={ "key1" => "value1", "key2" => "value2" }
-    options = {:name => "test1", :imageRef => @@image_ref, :flavorRef => @@flavor_ref, :personality => personalities, :metadata => metadata}
+    options = {:name => @@hostname, :imageRef => @@image_ref, :flavorRef => @@flavor_ref, :personality => get_personalities, :metadata => metadata}
     if KEYNAME and not KEYNAME.empty? then
       options[:key_name] = KEYNAME
     end
     server = create_server(options)
-    assert_not_nil(@@server.adminPass)
+    assert_not_nil(server.adminPass)
 
     #boot a server and check it
     check_server(server, @@image_ref, @@flavor_ref)
@@ -230,18 +258,89 @@ class Servers < Test::Unit::TestCase
 
   end if TEST_CREATE_IMAGE
 
- 
   def test_030_rebuild
-    # make sure our snapshot boots
-    personalities={SSH_PUBLIC_KEY => "/root/.ssh/authorized_keys"}
-    @@server.rebuild!(:imageRef => @@image_ref, :personality => personalities)
+    # NOTE: this will use the snapshot if TEST_CREATE_IMAGE is enabled
+    @@server.rebuild!(:adminPass => @@admin_pass, :imageRef => @@image_ref, :personality => get_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
+  def test_035_soft_reboot
+    # make sure our snapshot boots
+    @@server.reboot(type='SOFT')
+    server = @conn.server(@@server.id)
+    assert_equal('REBOOT', server.status)
+    check_server(server, @@image_ref, @@flavor_ref)
+  end if TEST_SOFT_REBOOT_SERVER
+
+  def test_036_hard_reboot
+    # make sure our snapshot boots
+    @@server.reboot(type='HARD')
+    server = @conn.server(@@server.id)
+    assert_equal('HARD_REBOOT', server.status)
+    check_server(server, @@image_ref, @@flavor_ref)
+  end if TEST_HARD_REBOOT_SERVER
+
+  def test_037_change_password
+    @@admin_pass = "AnGrYbIrD$"
+    @@server.change_password!(@@admin_pass)
+    server = @conn.server(@@server.id)
+    begin
+      timeout(60) do
+        until server.status == 'ACTIVE' do
+          server = @conn.server(server.id)
+          sleep 1
+        end
+      end
+    rescue Timeout::Error => te
+      fail('Timeout changing server password.')
+    end
+    check_server(server, @@image_ref, @@flavor_ref)
+  end if TEST_ADMIN_PASSWORD
+
+  def test_040_resize_revert
+
+    @@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')
+
+    @@server.revert_resize!
+    server = @conn.server(@@server.id)
+    begin
+      timeout(60) do
+        until server.status == 'ACTIVE' do
+          server = @conn.server(server.id)
+          sleep 1
+        end
+      end
+    rescue Timeout::Error => te
+      fail('Timeout waiting for revert resize.')
+    end
+
+    check_server(server, @@image_ref, @@flavor_ref)
+    assert_equal(server.hostId, @@host_id)
+
+  end if TEST_REVERT_RESIZE_SERVER
+
+  def test_041_resize
 
     @@server.resize!(@@flavor_ref_resize)
     server = @conn.server(@@server.id)
@@ -262,10 +361,11 @@ class Servers < Test::Unit::TestCase
     end
  
     check_server(server, @@image_ref, @@flavor_ref_resize, 'VERIFY_RESIZE')
+    assert_not_equal(server.hostId, @@host_id) if TEST_HOSTID_ON_RESIZE
 
   end if TEST_RESIZE_SERVER
 
-  def test_041_resize_confirm
+  def test_042_resize_confirm
 
     @@server.confirm_resize!
     server = @conn.server(@@server.id)

data/lib/torpedo.rb

@@ -12,7 +12,12 @@ 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
 TEST_REBUILD_SERVER=configs['test_rebuild_server'] || false
+TEST_SOFT_REBOOT_SERVER=configs['test_soft_reboot_server'] || false
+TEST_HARD_REBOOT_SERVER=configs['test_hard_reboot_server'] || false
 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
 KEYPAIR=configs['keypair']
 KEYNAME=configs['keyname']
 

data/torpedo.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{torpedo}
-  s.version = "1.0.7"
+  s.version = "1.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Prince"]
-  s.date = %q{2011-11-02}
+  s.date = %q{2011-12-07}
   s.default_executable = %q{torpedo}
-  s.description = %q{CLI to run functional smoke tests for OpenStack.}
+  s.description = %q{Fast integration tests OpenStack Compute.}
   s.email = %q{dan.prince@rackspace.com}
   s.executables = ["torpedo"]
   s.extra_rdoc_files = [
@@ -36,14 +36,13 @@ Gem::Specification.new do |s|
     "lib/torpedo/compute/servers.rb",
     "lib/torpedo/config.rb",
     "test/helper.rb",
-    "test/test_torpedo.rb",
     "torpedo.gemspec"
   ]
   s.homepage = %q{http://github.com/dprince/torpedo}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Sink bad code! Ruby Smoke Tests for OpenStack.}
+  s.summary = %q{Fire when ready. Fast Ruby integration tests for OpenStack.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -52,19 +51,22 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
-      s.add_runtime_dependency(%q<openstack-compute>, [">= 1.1.4"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.14.6"])
+      s.add_runtime_dependency(%q<openstack-compute>, ["~> 1.1.5"])
+      s.add_runtime_dependency(%q<net-ssh>, ["~> 2.2.1"])
     else
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<openstack-compute>, [">= 1.1.4"])
+      s.add_dependency(%q<thor>, ["~> 0.14.6"])
+      s.add_dependency(%q<openstack-compute>, ["~> 1.1.5"])
+      s.add_dependency(%q<net-ssh>, ["~> 2.2.1"])
     end
   else
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<openstack-compute>, [">= 1.1.4"])
+    s.add_dependency(%q<thor>, ["~> 0.14.6"])
+    s.add_dependency(%q<openstack-compute>, ["~> 1.1.5"])
+    s.add_dependency(%q<net-ssh>, ["~> 2.2.1"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torpedo
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 -05:00
+date: 2011-12-07 00:00:00 -05:00
 default_executable: torpedo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,12 +56,14 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 43
         segments: 
         - 0
-        version: "0"
+        - 14
+        - 6
+        version: 0.14.6
   requirement: *id003
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -70,17 +72,33 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 1
         - 1
-        - 4
-        version: 1.1.4
+        - 5
+        version: 1.1.5
   requirement: *id004
   type: :runtime
-description: CLI to run functional smoke tests for OpenStack.
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: net-ssh
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 2
+        - 1
+        version: 2.2.1
+  requirement: *id005
+  type: :runtime
+description: Fast integration tests OpenStack Compute.
 email: dan.prince@rackspace.com
 executables: 
 - torpedo
@@ -107,7 +125,6 @@ files:
 - lib/torpedo/compute/servers.rb
 - lib/torpedo/config.rb
 - test/helper.rb
-- test/test_torpedo.rb
 - torpedo.gemspec
 has_rdoc: true
 homepage: http://github.com/dprince/torpedo
@@ -142,6 +159,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Sink bad code! Ruby Smoke Tests for OpenStack.
+summary: Fire when ready. Fast Ruby integration tests for OpenStack.
 test_files: []
 

data/test/test_torpedo.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestTorpedo < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end