torpedo 1.0.19 → 2.1.0

data/lib/torpedo/compute/images.rb

@@ -1,35 +1,35 @@
 require File.dirname(__FILE__) + '/helper'
 
 module Torpedo
-module Compute
-class Images < Test::Unit::TestCase
+  module Compute
+    class Images < Test::Unit::TestCase
 
-  def setup
-    @conn=Helper::get_connection
-    @image_id = Helper::get_image_ref(@conn)
-  end
+      def setup
+        @conn=Helper::get_connection
+        @image_id = Helper::get_image_ref(@conn)
+      end
 
-  def test_list
+      def test_list
 
-    @conn.images.each do |image|
-      assert_not_nil(image[:id])
-      assert_not_nil(image[:name])
-      assert_not_nil(image[:status])
-    end
+        @conn.images.each do |image|
+          assert_not_nil(image.id)
+          assert_not_nil(image.name)
+          assert_not_nil(image.status)
+        end
 
-  end
+      end
 
-  def test_get
+      def test_get
 
-    image=@conn.image(@image_id)
-    assert_equal(@image_id, image.id.to_s)
-    assert_not_nil(image.name)
-    assert_not_nil(image.updated)
-    assert_not_nil(image.created)
-    assert_not_nil(image.status)
+        image=@conn.images.get(@image_id)
+        assert_equal(@image_id, image.id.to_s)
+        assert_not_nil(image.name)
+        assert_not_nil(image.updated_at)
+        assert_not_nil(image.created_at)
+        assert_not_nil(image.status)
 
-  end
+      end
 
-end
-end
+    end
+  end
 end

data/lib/torpedo/compute/keypairs.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/helper'
+
+module Torpedo
+  module Compute
+    class Keypairs < Test::Unit::TestCase
+
+      @@key_pairs = []
+      @@key_pair = nil #ref to last created key_pair
+      @@key_pair_name = 'torpedo' #ref to last created key_pair
+
+      # public access to the key_pair ref
+      def self.key_pair
+        @@key_pair
+      end
+
+      def setup
+        @conn=Helper::get_connection
+      end
+
+      def create_key_pair(options)
+        @@key_pair = @conn.key_pairs.create(options)
+        @@key_pairs << @@key_pair
+        @@key_pair
+      end
+
+      def test_001_create_key_pair
+        public_key = IO.read(SSH_PUBLIC_KEY)
+        options = {:public_key => public_key, :name => @@key_pair_name}
+        key_pair = create_key_pair(options)
+        assert_equal(@@key_pair_name, key_pair.name)
+        assert_equal(public_key, key_pair.public_key)
+      end
+
+    end
+  end
+end

data/lib/torpedo/compute/limits.rb

@@ -1,19 +1,24 @@
 require File.dirname(__FILE__) + '/helper'
 
 module Torpedo
-module Compute
-class Limits < Test::Unit::TestCase
+  module Compute
 
-  def setup
-    @conn=Helper::get_connection
-  end
+    class Limits < Test::Unit::TestCase
 
-  def test_list
+      def setup
+        @conn=Helper::get_connection
+      end
 
-    assert_not_nil @conn.limits
+      def test_list
 
-  end
+        limits = @conn.get_limits.body['limits']
+        assert_not_nil limits
+        assert_not_nil limits['rate']
+        assert_not_nil limits['absolute']
 
-end if TEST_LIMITS
-end
+      end if TEST_LIMITS
+
+    end
+
+  end
 end

data/lib/torpedo/compute/servers.rb

@@ -1,492 +1,568 @@
 require 'torpedo/compute/helper'
+require 'torpedo/compute/keypairs'
+require 'torpedo/volume/helper'
+require 'torpedo/net_util'
 require 'tempfile'
-require 'net/ssh'
 
 module Torpedo
-module Compute
-class Servers < Test::Unit::TestCase
-
-  @@servers = []
-  @@images = []
-  @@image_ref = nil
-  @@flavor_ref = nil
-  @@flavor_ref_resize = nil
-  @@server = nil #ref to last created server
-  @@hostname = "torpedo"
-  @@host_id = nil
-
-  def setup
-    @conn=Helper::get_connection
-  end
-
-  def create_server(server_opts)
-    @@server = @conn.create_server(server_opts)
-    @@servers << @@server
-    @@admin_pass = @@server.adminPass #original admin_pass
-    @@server
-  end
-
-  def create_image(server, image_opts)
-    image = server.create_image(image_opts)
-    @@images << image
-    @@image_ref = image.id
-    image
-  end
+  module Compute
+    class Servers < Test::Unit::TestCase
+
+      @@servers = []
+      @@images = []
+      @@image_ref = nil
+      @@flavor_ref = nil
+      @@flavor_ref_resize = nil
+      @@server = nil #ref to last created server
+      @@hostname = "torpedo"
+      @@host_id = nil
+
+      # public access to the server ref
+      def self.server
+        @@server
+      end
 
-  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
+      # public access to the image ref
+      def self.image_ref
+        @@image_ref
+      end
 
-  def ssh_test(ip_addr, test_cmd="hostname", test_output=@@hostname, admin_pass=@@admin_pass)
+      # public access to the flavor ref
+      def self.flavor_ref
+        @@flavor_ref
+      end
 
-    ssh_opts = {:paranoid => false}
-    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
+      def setup
+        @conn=Helper::get_connection
+        if VOLUME_ENABLED then
+          @volume_conn=Torpedo::Volume::Helper::get_connection
+        end
       end
-      ssh_opts.store(:keys, ssh_identity)
-    end
 
-    begin
-      Timeout::timeout(SSH_TIMEOUT) do
-        while(1) do
-          begin
-            Net::SSH.start(ip_addr, 'root', ssh_opts) do |ssh|
-                return ssh.exec!(test_cmd) == test_output
+      def create_server(options)
+        if ORCHESTRATION_ENABLED then
+          #if heat is enabled we re-use the server from the stack
+          @conn.servers.each do |server|
+            if server.name == 'torpedo'
+              @@server = @conn.servers.get(server.id)
             end
-          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET, Net::SSH::Exception
-            next
+            #NOTE: When using Heat we use keypairs... so just stub this out
+            @@admin_pass = 'Not Available'
           end
+        else
+          @@server = @conn.servers.create(options)
+          @@servers << @@server
+          @@admin_pass = @@server.password #original admin_pass
+          assert_not_nil(@@admin_pass)
         end
+        @@server
       end
-    rescue Timeout::Error => te
-      fail("Timeout trying to ssh to server: #{ip_addr}")
-    end
 
-    return false
+      def create_image(server, name, metadata)
+        image_raw = @conn.create_image(server.id, name, metadata).body['image']
+        image_raw[:service] = @conn
+        image = Fog::Compute::OpenStack::Image.new(image_raw)
+        @@images << image
+        @@image_ref = image_raw['id']
+        image
+      end
 
-  end
+      def get_personalities
+        if TEST_ADMIN_PASSWORD or Keypairs.key_pair then
+          [{'contents' => 'yo', 'path' => '/tmp/foo.bar'}]
+        else
+          # NOTE: if admin_pass and keypairs are disabled we inject the public
+          # key so we can still login.
+          [{'contents' => IO.read(SSH_PUBLIC_KEY), 'path' => '/root/.ssh/authorized_keys'}]
+        end
+      end
 
-  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
-          return true if system(ping_command)
+      def find_ip(server)
+        # lookup the first public IP address and use that for verification
+        if server.addresses[NETWORK_LABEL].nil?
+          fail("No address found for network label #{NETWORK_LABEL}. Addresses: #{server.addresses}")
+        end
+        addresses = server.addresses[NETWORK_LABEL].select {|a| a['version'] == TEST_IP_TYPE}
+        address = addresses[0]['addr']
+        if address.nil? or address.empty? then
+          fail("No address found for network label #{NETWORK_LABEL}. Addresses: #{server.addresses}")
         end
+        address
       end
-    rescue Timeout::Error => te
-      fail("Timeout pinging server: #{ping_command}")
-    end
 
-    return false
+      def check_server(server, image_ref, flavor_ref, check_status="ACTIVE")
 
-  end
+        server_flavor = server.flavor_ref || server.flavor['id']
+        server_image = server.image_ref || server.image['id']
+
+        assert_equal(flavor_ref, server_flavor)
+        assert_equal(image_ref.to_s, server_image)
+        assert_equal(@@hostname, server.name)
+        server = @conn.servers.get(server.id)
 
-  def check_server(server, image_ref, flavor_ref, check_status="ACTIVE")
+        begin
+          timeout(SERVER_BUILD_TIMEOUT) do
+            until server.state == check_status do
+              if server.state == "ERROR" then
+                fail('Server ERROR state detected when booting server!')
+              end
+              server = @conn.servers.get(server.id)
+              sleep 1
+            end
+          end
+        rescue Timeout::Error => te
+          fail('Timeout creating server.')
+        end
 
-    assert_not_nil(server.hostId)
-    assert_equal(flavor_ref, server.flavor['id'])
-    assert_equal(image_ref.to_s, server.image['id'])
-    assert_equal(@@hostname, server.name)
-    server = @conn.server(server.id)
+        assert_not_nil(server.host_id)
 
-    begin
-      timeout(SERVER_BUILD_TIMEOUT) do
-        until server.status == check_status do
-          if server.status == "ERROR" then
-            fail('Server ERROR state detected when booting server!')
+        address = find_ip(server)
+        Torpedo::NetUtil.ping_test(address, NETWORK_NAMESPACE) if TEST_PING
+        if TEST_SSH
+          if TEST_ADMIN_PASSWORD or Keypairs.key_pair then
+            Torpedo::NetUtil.ssh_test(address, NETWORK_NAMESPACE, "cat /tmp/foo.bar", "yo", @@admin_pass)
+          else
+            Torpedo::NetUtil.ssh_test(address, NETWORK_NAMESPACE, "hostname", @@hostname, @@admin_pass)
           end
-          server = @conn.server(server.id)
-          sleep 1
         end
+
+        server
+
       end
-    rescue Timeout::Error => te
-      fail('Timeout creating server.')
-    end
 
-    # lookup the first public IP address and use that for verification
-    addresses = server.addresses[NETWORK_LABEL.to_sym].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(address, "cat /tmp/foo/bar", "yo")
-      else
-        ssh_test(address)
+      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
-    end
 
-    server
+      def test_001_create_server
 
-  end
+        metadata={ "key1" => "value1", "key2" => "value2" }
+        options = {:name => @@hostname, :image_ref => @@image_ref, :flavor_ref => @@flavor_ref, :personality => get_personalities, :metadata => metadata}
+        if Keypairs.key_pair then
+          options['key_name'] = Keypairs.key_pair.name
+        end
+        server = create_server(options)
 
-  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
+        #boot a server and check it
+        check_server(server, @@image_ref, @@flavor_ref)
 
-  def test_001_create_server
+        assert_equal "value1", @@server.metadata.get('key1').value
+        assert_equal "value2", @@server.metadata.get('key2').value
+        assert_equal 2, @@server.metadata.size
 
-    metadata={ "key1" => "value1", "key2" => "value2" }
-    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)
+      end
 
-    #boot a server and check it
-    check_server(server, @@image_ref, @@flavor_ref)
+      def test_002_delete_server_metadata_items
 
-    assert_equal "value1", @@server.metadata['key1']
-    assert_equal "value2", @@server.metadata['key2']
-    assert_equal 2, @@server.metadata.size
+        @@metadata = Fog::Compute::OpenStack::Metadata.new({
+          :service => @conn,
+          :parent => @@server
+        })
+        assert_equal 2, @@metadata.size
 
-  end
+        @@metadata.each do |meta|
+          assert meta.destroy
+        end
 
-  def test_002_delete_server_metadata_items
+        #refresh the metadata
+        @@metadata = Fog::Compute::OpenStack::Metadata.new({
+          :service => @conn,
+          :parent => @@server
+        })
+        assert_equal 0, @@metadata.size
 
-    metadata = @@server.metadata
-    metadata.each_pair do |key, value|
-      assert metadata.delete!(key)
-    end
- 
-    metadata.refresh
+      end
 
-    assert_equal 0, metadata.size
+      def test_003_update_one_server_metadata_item
 
-  end
+        datum = Fog::Compute::OpenStack::Metadatum.new({
+          :service => @conn,
+          :parent => @@server
+        })
+        datum.key = 'foo0'
+        datum.value = 'bar0'
+        datum.save
 
-  def test_003_update_one_server_metadata_item
+        #refresh the metadata
+        @@metadata = Fog::Compute::OpenStack::Metadata.new({
+          :service => @conn,
+          :parent => @@server
+        })
+        assert_equal 1, @@metadata.size
 
-    metadata = @@server.metadata
-    metadata['foo0'] = 'bar0'
-    assert metadata.update('foo0')
+        datum = @@metadata[0]
+        assert_equal 'foo0', datum.key
+        assert_equal 'bar0', datum.value
 
-    metadata.refresh
+      end
 
-    assert_equal 'bar0', metadata['foo0']
 
-    assert_equal 1, metadata.size
- 
-  end
+      def test_004_update_some_server_metadata_items
 
-  def test_004_update_some_server_metadata_items
+        metadata = {}
+        metadata['foo1'] = 'bar1'
+        metadata['foo2'] = 'bar2'
+        @conn.update_metadata('servers', @@server.id, metadata)
 
-    metadata = @@server.metadata
-    metadata.clear
-    metadata['foo1'] = 'bar1'
-    metadata['foo2'] = 'bar2'
-    assert metadata.update()
+        metadata = @conn.list_metadata('servers', @@server.id).body['metadata']
 
-    metadata.refresh
+        assert_equal 3, metadata.size
 
-    assert_equal 'bar0', metadata['foo0']
-    assert_equal 'bar1', metadata['foo1']
-    assert_equal 'bar2', metadata['foo2']
+        assert_equal 'bar0', metadata['foo0']
+        assert_equal 'bar1', metadata['foo1']
+        assert_equal 'bar2', metadata['foo2']
 
-    assert_equal 3, metadata.size
- 
-  end
+      end
 
-  def test_005_set_server_metadata_items
 
-    metadata = @@server.metadata
-    metadata.clear
-    metadata['foo1'] = 'better'
-    metadata['foo2'] = 'watch'
-    metadata['foo3'] = 'out!'
-    assert metadata.save
+      def test_005_set_server_metadata_items
 
-    metadata.refresh
+        metadata = {}
+        metadata['foo1'] = 'better'
+        metadata['foo2'] = 'watch'
+        metadata['foo3'] = 'out!'
+        metadata['foo4'] = 'DELETE FROM instance_metadata;'
+        @conn.set_metadata('servers', @@server.id, metadata)
 
-    assert_equal 'better', metadata['foo1']
-    assert_equal 'watch', metadata['foo2']
-    assert_equal 'out!', metadata['foo3']
+        metadata = @conn.list_metadata('servers', @@server.id).body['metadata']
 
-    assert_equal 3, metadata.size
- 
-  end
+        assert_equal 'better', metadata['foo1']
+        assert_equal 'watch', metadata['foo2']
+        assert_equal 'out!', metadata['foo3']
+        assert_equal 'DELETE FROM instance_metadata;', metadata['foo4']
 
-  def test_006_clear_server_metadata
+        assert_equal 4, metadata.size
+ 
+      end
 
-    metadata = @@server.metadata
-    assert metadata.clear!
+      def test_006_clear_server_metadata
 
-    metadata.refresh
+        metadata = {}
+        @conn.set_metadata('servers', @@server.id, metadata)
 
-    assert_equal 0, metadata.size
+        metadata = @conn.list_metadata('servers', @@server.id).body['metadata']
+        assert_equal 0, metadata.size
  
-  end
-
-  def test_020_create_image
-
-    #snapshot the image
-    image = create_image(@@server, :name => "torpedo", :metadata => {"key1" => "value1"})
-    assert_equal('SAVING', image.status)
-    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'])
-    assert_not_nil(image.created)
-    assert_not_nil(image.id)
-    assert_equal('value1', image.metadata['key1'])
-
-    begin
-      timeout(SERVER_BUILD_TIMEOUT) do
-        until image.status == 'ACTIVE' do
-          image = @conn.image(image.id)
-          sleep 1
-        end
       end
-    rescue Timeout::Error => te
-      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
-
-  end if TEST_CREATE_IMAGE
-
-  def test_030_rebuild
-    # 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_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
+      def test_020_create_image
 
-    # before resizing obtain host_id
-    server = @conn.server(@@server.id)
-    @@host_id = server.hostId #original host ID
+        #snapshot the image
+        image = create_image(@@server, "torpedo", {"key1" => "value1"})
 
-    @@server.resize!(@@flavor_ref_resize)
-    server = @conn.server(@@server.id)
-    assert_equal('RESIZE', server.status)
+        assert_equal('SAVING', image.status)
+        assert_equal('torpedo', image.name)
+        assert_equal(25, image.progress)
+        #FIXME: server id should be a uuid string
+        assert_equal(@@server.id, image.server['id'])
+        assert_not_nil(image.created_at)
+        assert_not_nil(image.id)
+        assert_equal "value1", image.metadata.get('key1').value
 
-    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!')
+        begin
+          timeout(SERVER_BUILD_TIMEOUT) do
+            until image.status == 'ACTIVE' do
+              image = @conn.images.get(image.id)
+              sleep 1
+            end
           end
-          server = @conn.server(server.id)
-          sleep 1
+        rescue Timeout::Error => te
+          fail('Timeout creating image snapshot.')
         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(@@host_id, server.hostId)
+        sleep SLEEP_AFTER_IMAGE_CREATE
+
+        # Overwrite image_ref to make all subsequent tests use this snapshot
+        @@image_ref = image.id.to_s
 
-  end if TEST_REVERT_RESIZE_SERVER
+      end if TEST_CREATE_IMAGE
 
-  def test_041_resize
 
-    # before resizing obtain host_id
-    server = @conn.server(@@server.id)
-    @@host_id = server.hostId #original host ID
+      def test_030_rebuild
+        # NOTE: this will use the snapshot if TEST_CREATE_IMAGE is enabled
+        metadata={ "dr." => "evil", "big" => "boy" }
+        @conn.rebuild_server(@@server.id, @@image_ref, "torpedo", admin_pass=@@admin_pass, metadata=metadata, personality=get_personalities)
 
-    @@server.resize!(@@flavor_ref_resize)
-    server = @conn.server(@@server.id)
-    assert_equal('RESIZE', server.status)
+        server = @conn.servers.get(@@server.id)
+        assert_equal('REBUILD', server.state)
 
-    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!')
+        check_server(server, @@image_ref, @@flavor_ref)
+
+      end if TEST_REBUILD_SERVER
+
+      def test_035_soft_reboot
+        # make sure our snapshot boots
+        @@server.reboot(type='SOFT')
+        server = @conn.servers.get(@@server.id)
+        assert_equal('REBOOT', server.state)
+        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.servers.get(@@server.id)
+        assert_equal('HARD_REBOOT', server.state)
+        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.servers.get(@@server.id)
+        begin
+          timeout(60) do
+            until server.state == 'ACTIVE' do
+              server = @conn.servers.get(@@server.id)
+              sleep 1
+            end
           end
-          server = @conn.server(server.id)
-          sleep 1
+        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
+
+        # before resizing obtain host_id
+        server = @conn.servers.get(@@server.id)
+        @@host_id = server.host_id #original host ID
+
+        @@server.resize(@@flavor_ref_resize)
+        server = @conn.servers.get(@@server.id)
+        assert_equal('RESIZE', server.state)
+
+        begin
+          timeout(SERVER_BUILD_TIMEOUT) do
+            until server.state == 'VERIFY_RESIZE' do
+              if server.state == "ERROR" then
+                fail('Server ERROR state detected when resizing server!')
+              end
+              server = @conn.servers.get(@@server.id)
+              sleep 1
+            end
+          end
+        rescue Timeout::Error => te
+          fail('Timeout resizing server.')
         end
-      end
-    rescue Timeout::Error => te
-      fail('Timeout resizing server.')
-    end
  
-    check_server(server, @@image_ref, @@flavor_ref_resize, 'VERIFY_RESIZE')
-    assert_not_equal(@@host_id, server.hostId) if TEST_HOSTID_ON_RESIZE
-
-  end if TEST_RESIZE_SERVER
+        check_server(server, @@image_ref, @@flavor_ref_resize, 'VERIFY_RESIZE')
+
+        @@server.revert_resize
+        server = @conn.servers.get(@@server.id)
+        begin
+          timeout(60) do
+            until server.state == 'ACTIVE' do
+              server = @conn.servers.get(@@server.id)
+              sleep 1
+            end
+          end
+        rescue Timeout::Error => te
+          fail('Timeout waiting for revert resize.')
+        end
 
-  def test_042_resize_confirm
+        check_server(server, @@image_ref, @@flavor_ref)
+        assert_equal(@@host_id, server.host_id)
 
-    @@server.confirm_resize!
-    server = @conn.server(@@server.id)
-    assert_equal('ACTIVE', server.status)
+      end if TEST_REVERT_RESIZE_SERVER
 
-    check_server(server, @@image_ref, @@flavor_ref_resize)
+      def test_041_resize
 
-  end if TEST_RESIZE_SERVER
+        # before resizing obtain host_id
+        server = @conn.servers.get(@@server.id)
+        @@host_id = server.host_id #original host ID
 
-  def test_051_delete_image_metadata_items
+        @@server.resize(@@flavor_ref_resize)
+        server = @conn.servers.get(@@server.id)
+        assert_equal('RESIZE', server.state)
 
-    metadata = @conn.image(@@image_ref).metadata
-    metadata.each_pair do |key, value|
-      assert metadata.delete!(key)
-    end
+        begin
+          timeout(SERVER_BUILD_TIMEOUT) do
+            until server.state == 'VERIFY_RESIZE' do
+              if server.state == "ERROR" then
+                fail('Server ERROR state detected when resizing server!')
+              end
+              server = @conn.servers.get(@@server.id)
+              sleep 1
+            end
+          end
+        rescue Timeout::Error => te
+          fail('Timeout resizing server.')
+        end
  
-    metadata.refresh
+        check_server(server, @@image_ref, @@flavor_ref_resize, 'VERIFY_RESIZE')
+        assert_not_equal(@@host_id, server.host_id) if TEST_HOSTID_ON_RESIZE
+
+      end if TEST_RESIZE_SERVER
+
+      def test_042_resize_confirm
 
-    assert_equal 0, metadata.size
+        @@server.confirm_resize
+        server = @conn.servers.get(@@server.id)
+        begin
+          timeout(60) do
+            until server.state == 'ACTIVE' do
+              server = @conn.servers.get(@@server.id)
+              sleep 1
+            end
+          end
+        rescue Timeout::Error => te
+          fail('Timeout waiting for ACTIVE state after resize confirm.')
+        end
 
-  end if TEST_CREATE_IMAGE
+        check_server(server, @@image_ref, @@flavor_ref_resize)
 
-  def test_052_update_one_image_metadata_item
+      end if TEST_RESIZE_SERVER
 
-    metadata = @conn.image(@@image_ref).metadata
-    metadata['foo1'] = 'bar1'
-    assert metadata.update('foo1')
+      def test_051_delete_image_metadata_items
 
-    metadata.refresh
+        #refresh the metadata
+        metadata = Fog::Compute::OpenStack::Metadata.new({
+          :service => @conn,
+          :parent => @@images.last
+        })
 
-    assert_equal 'bar1', metadata['foo1']
+        metadata.each do |meta|
+          assert meta.destroy
+        end
 
-    assert_equal 1, metadata.size
+        #refresh the metadata
+        metadata = Fog::Compute::OpenStack::Metadata.new({
+          :service => @conn,
+          :parent => @@images.last
+        })
+        assert_equal 0, metadata.size
+
+      end if TEST_CREATE_IMAGE
+
+      def test_052_update_one_image_metadata_item
+        datum = Fog::Compute::OpenStack::Metadatum.new({
+          :service => @conn,
+          :parent => @@images.last
+        })
+        datum.key = 'foo0'
+        datum.value = 'bar0'
+        datum.save
+
+        #refresh the metadata
+        metadata = Fog::Compute::OpenStack::Metadata.new({
+          :service => @conn,
+          :parent => @@images.last
+        })
+        assert_equal 1, metadata.size
+
+        datum = metadata[0]
+        assert_equal 'foo0', datum.key
+        assert_equal 'bar0', datum.value
+      end if TEST_CREATE_IMAGE
+
+      def test_053_update_some_image_metadata_items
+
+        metadata = {}
+        metadata['foo0'] = 'barz'
+        metadata['foo1'] = 'bar1'
+        metadata['foo2'] = 'bar2'
+        @conn.update_metadata('images', @@images.last.id, metadata)
+
+        metadata = @conn.list_metadata('images', @@images.last.id).body['metadata']
+
+        assert_equal 3, metadata.size
+
+        assert_equal 'barz', metadata['foo0']
+        assert_equal 'bar1', metadata['foo1']
+        assert_equal 'bar2', metadata['foo2']
  
-  end if TEST_CREATE_IMAGE
+      end if TEST_CREATE_IMAGE
 
-  def test_053_update_some_image_metadata_items
+      def test_054_set_image_metadata_items
 
-    metadata = @conn.image(@@image_ref).metadata
-    metadata['foo1'] = 'bar1'
-    metadata['foo2'] = 'bar2'
-    assert metadata.update(['foo1','foo2'])
+        metadata = {}
+        metadata['foo1'] = 'that'
+        metadata['foo2'] = 'silly'
+        metadata['foo3'] = 'rabbit'
+        metadata['foo4'] = 'DELETE FROM images;'
+        @conn.set_metadata('images', @@images.last.id, metadata)
 
-    metadata.refresh
+        metadata = @conn.list_metadata('images', @@images.last.id).body['metadata']
 
-    assert_equal 'bar1', metadata['foo1']
-    assert_equal 'bar2', metadata['foo2']
+        assert_equal 'that', metadata['foo1']
+        assert_equal 'silly', metadata['foo2']
+        assert_equal 'rabbit', metadata['foo3']
+        assert_equal 'DELETE FROM images;', metadata['foo4']
 
-    assert_equal 2, metadata.size
+        assert_equal 4, metadata.size
  
-  end if TEST_CREATE_IMAGE
+      end if TEST_CREATE_IMAGE
 
-  def test_054_set_image_metadata_items
+      def test_055_clear_image_metadata
 
-    metadata = @conn.image(@@image_ref).metadata
-    metadata['foo1'] = 'that'
-    metadata['foo2'] = 'silly'
-    metadata['foo3'] = 'rabbit'
-    assert metadata.save
+        metadata = {}
+        @conn.set_metadata('images', @@images.last.id, metadata)
 
-    metadata.refresh
-
-    assert_equal 'that', metadata['foo1']
-    assert_equal 'silly', metadata['foo2']
-    assert_equal 'rabbit', metadata['foo3']
-
-    assert_equal 3, metadata.size
+        metadata = @conn.list_metadata('images', @@images.last.id).body['metadata']
+        assert_equal 0, metadata.size
  
-  end if TEST_CREATE_IMAGE
+      end if TEST_CREATE_IMAGE
+
+      def test_060_attach_volume
+        volume = Torpedo::Volume::Volumes.volume
+        assert(@@server.attach_volume(volume.id, "/dev/vdb"))
+
+        begin
+          timeout(VOLUME_BUILD_TIMEOUT) do
+            until volume.status == 'in-use' do
+              if volume.status == "error" then
+                fail('ERROR status detected when attaching volume!')
+              end
+              volume = @volume_conn.volumes.get(volume.id)
+              sleep 1
+            end
+          end
+        rescue Timeout::Error => te
+          fail('Timeout attaching volume.')
+        end
 
-  def test_055_clear_image_metadata
+      end if VOLUME_ENABLED
 
-    metadata = @conn.image(@@image_ref).metadata
-    assert metadata.clear!
+      def test_061_detach_volume
 
-    metadata.refresh
+        volume = Torpedo::Volume::Volumes.volume
+        assert(@@server.detach_volume(volume.id))
 
-    assert_equal 0, metadata.size
- 
-  end if TEST_CREATE_IMAGE
+        volume = @volume_conn.volumes.get(volume.id)
+        begin
+          timeout(VOLUME_BUILD_TIMEOUT) do
+            until volume.status == 'available' do
+              if volume.status == "error" then
+                fail('ERROR status detected when detaching volume!')
+              end
+              volume = @volume_conn.volumes.get(volume.id)
+              sleep 1
+            end
+          end
+        rescue Timeout::Error => te
+          fail('Timeout detaching volume.')
+        end
+
+      end if VOLUME_ENABLED
 
-  def test_999_teardown
-    if CLEAN_UP_SERVERS
-      @@servers.each do |server|
-        assert_equal(true, server.delete!)
-      end
-    end
-    if CLEAN_UP_IMAGES
-      @@images.each do |image|
-        assert_equal(true, image.delete!)
-      end
     end
   end
-
-end
-end
 end