torpedo 1.0.0 → 1.0.1

data/CHANGELOG

@@ -0,0 +1,5 @@
+* Sat Oct 29 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.1
+  - Add config options to support custom flavor settings.
+
+* Fri Oct 28 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.0
+  - Initial release.

data/README.md

@@ -24,6 +24,10 @@ Installation
 	#image_name:
 	#image_ref:
 
+	# FLAVORS (Set one of the following)
+	#flavor_name: 
+	flavor_ref: 4
+
 	# TIMEOUTS
 	#ping_timeout: 60
 	#ssh_timeout: 30

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/torpedo/compute/helper.rb

@@ -17,8 +17,8 @@ module Helper
 
   def self.get_image_ref(conn)
 
-    image_ref = ENV['IMAGE_REF']
-    image_name = ENV['IMAGE_NAME']
+    image_ref = IMAGE_REF
+    image_name = IMAGE_NAME
 
     if image_name and not image_name.empty? then
       images = conn.images.each do |image|
@@ -36,6 +36,48 @@ module Helper
 
   end
 
+  def self.get_flavor_ref(conn)
+
+    flavor_ref = FLAVOR_REF
+    flavor_name = FLAVOR_NAME
+
+    if flavor_name and not flavor_name.empty? then
+      flavors = conn.flavors.each do |flavor|
+        if flavor[:name] == flavor_name then
+          flavor_ref = flavor[:id]
+        end
+      end
+    elsif not flavor_ref or flavor_ref.to_s.empty? then
+      # default to 2 (m1.small) if FLAVOR_REF and or FLAVOR_NAME aren't set
+      flavor_ref = 2
+    end
+
+    flavor_ref.to_s
+
+  end
+
+  #flavor ref used for resize
+  def self.get_flavor_ref_resize(conn)
+
+    flavor_ref_resize = FLAVOR_REF_RESIZE
+    flavor_name_resize = FLAVOR_NAME_RESIZE
+
+    if flavor_name_resize and not flavor_name_resize.empty? then
+      flavors = conn.flavors.each do |flavor|
+        if flavor[:name] == flavor_name_resize then
+          flavor_ref_resize = flavor[:id]
+        end
+      end
+    elsif not flavor_ref_resize or flavor_ref_resize.to_s.empty? then
+      # if no flavor ref is specified for resize add one to it
+      flavor_ref = Helper.get_flavor_ref(conn)
+      flavor_ref_resize = flavor_ref.to_is + 1
+    end
+
+    flavor_ref_resize.to_s
+
+  end
+
 end
 end
 end

data/lib/torpedo/compute/servers.rb

@@ -8,6 +8,7 @@ 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)
   @@server = nil #ref to last created server
 
   def setup
@@ -72,7 +73,7 @@ class Servers < Test::Unit::TestCase
   def check_server(server, image_ref, flavor_ref, check_status="ACTIVE")
 
     assert_not_nil(server.hostId)
-    assert_equal(flavor_ref.to_s, server.flavor['id'])
+    assert_equal(flavor_ref, server.flavor['id'])
     assert_equal(image_ref.to_s, server.image['id'])
     assert_equal('test1', server.name)
     server = @conn.server(server.id)
@@ -108,7 +109,7 @@ class Servers < Test::Unit::TestCase
     # limitations
     personalities={SSH_PUBLIC_KEY => "/root/.ssh/authorized_keys"}
     metadata={ "key1" => "value1", "key2" => "value2" }
-    options = {:name => "test1", :imageRef => @@image_ref, :flavorRef => 2, :personality => personalities, :metadata => metadata}
+    options = {:name => "test1", :imageRef => @@image_ref, :flavorRef => @@flavor_ref, :personality => personalities, :metadata => metadata}
     if KEYNAME and not KEYNAME.empty? then
       options[:key_name] = KEYNAME
     end
@@ -116,7 +117,7 @@ class Servers < Test::Unit::TestCase
     assert_not_nil(@@server.adminPass)
 
     #boot an instance and check it
-    check_server(server, @@image_ref, 2)
+    check_server(server, @@image_ref, @@flavor_ref)
 
     assert_equal "value1", @@server.metadata['key1']
     assert_equal "value2", @@server.metadata['key2']
@@ -303,13 +304,15 @@ class Servers < Test::Unit::TestCase
     @@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, 2)
+    check_server(server, @@image_ref, @@flavor_ref)
 
   end if TEST_REBUILD_SERVER == "true"
 
   def test_040_resize_instance
 
-    @@server.resize!(3)
+    flavor_ref_resize = Helper::get_flavor_ref_resize(@conn)
+
+    @@server.resize!(flavor_ref_resize)
     server = @conn.server(@@server.id)
     assert_equal('RESIZE', @@server.status)
 
@@ -327,13 +330,13 @@ class Servers < Test::Unit::TestCase
       fail('Timeout resizing server.')
     end
  
-    check_server(server, @@image_ref, 3, 'VERIFY_RESIZE')
+    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, 3)
+    check_server(server, @@image_ref, flavor_ref_resize)
 
   end if TEST_RESIZE_SERVER == "true"
 

data/lib/torpedo.rb

@@ -17,6 +17,12 @@ KEYNAME=configs['keyname']
 IMAGE_REF=configs['image_ref']
 IMAGE_NAME=configs['image_name']
 
+FLAVOR_REF=configs['flavor_ref']
+FLAVOR_NAME=configs['flavor_name']
+
+FLAVOR_REF_RESIZE=configs['flavor_ref_resize']
+FLAVOR_NAME_RESIZE=configs['flavor_name_resize']
+
 OPENSTACK_COMPUTE_VERSION=configs['openstack_compute_version'] || '1.1.4'
 
 USERNAME=ENV['NOVA_USERNAME']

data/torpedo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{torpedo}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Prince"]
-  s.date = %q{2011-10-28}
+  s.date = %q{2011-10-29}
   s.default_executable = %q{torpedo}
   s.description = %q{CLI to run functional smoke tests for OpenStack.}
   s.email = %q{dan.prince@rackspace.com}
@@ -20,7 +20,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    "CHANGELOG",
     "Gemfile",
+    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torpedo
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 -04:00
+date: 2011-10-29 00:00:00 -04:00
 default_executable: torpedo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt