kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[ibm] Mark volume attach/detach pending, won't create instance

Browse source
This commit is contained in:
Decklin Foster 2012-03-13 19:53:59 -04:00
parent e1d6cbfa79
commit d257bcae45
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/ibm/requests/compute/image_tests.rb
View file

@ -94,10 +94,14 @@ Shindo.tests('Fog::Compute[:ibm] | image requests', ['ibm']) do
end
tests('#delete_image') do
pending
returns(true) { Fog::Compute[:ibm].delete_image(@id).body['success'] }
returns(true) { Fog::Compute[:ibm].delete_image(@cloned_id).body['success'] }
end
@server = Fog::Compute[:ibm].servers.get(@instance_id)
@server.wait_for(Fog::IBM::TIMEOUT) { ready? }
@server.destroy
@key.wait_for(Fog::IBM::TIMEOUT) { instance_ids.empty? }
@key.destroy

31
tests/ibm/requests/storage/volume_tests.rb
View file

@ -42,8 +42,9 @@ Shindo.tests('Fog::Storage[:ibm] | volume requests', ['ibm']) do
@image_id = "20010001"
@instance_type = "BRZ32.1/2048/60*175"
@key_name = "fog-test-key-" + Time.now.to_i.to_s(32)
@key = Fog::Compute[:ibm].keys.create(:name => @key_name)
# Instance-using tests are pending, so don't create the key now
# @key_name = "fog-test-key-" + Time.now.to_i.to_s(32)
# @key = Fog::Compute[:ibm].keys.create(:name => @key_name)
tests("#create_volume('#{@name}', '#{@offering_id}', '#{@format}', '#{@location_id}', '#{@size}')").formats(@volume_format) do
data = Fog::Storage[:ibm].create_volume(@name, @offering_id, @format, @location_id, @size).body
@ -59,19 +60,23 @@ Shindo.tests('Fog::Storage[:ibm] | volume requests', ['ibm']) do
Fog::Storage[:ibm].get_volume(@volume_id).body
end
# Tests which use this instance are pending
# @instance_id = Fog::Compute[:ibm].create_instance(
# 'fog-test-volume-instance-' + Time.now.to_i.to_s(32),
# @image_id,
# @instance_type,
# @location_id,
# :key_name => @key_name
# ).body['instances'][0]['id']
tests("#attach_volume('#{@instance_id}','#{@volume_id}')") do
@instance_id = Fog::Compute[:ibm].create_instance(
'fog-test-volume-instance-' + Time.now.to_i.to_s(32),
@image_id,
@instance_type,
@location_id,
:key_name => @key_name
).body['instances'][0]['id']
pending
# TODO: Add assertions for this whenever it is properly supported
Fog::Compute[:ibm].modify_instance(@instance_id, 'type' => 'attach', 'volume_id' => @volume_id)
end
tests("#detach_volume('#{@instance_id}','#{@volume_id}')") do
pending
# TODO: Add assertions for this whenever it is properly supported
Fog::Compute[:ibm].modify_instance(@instance_id, 'type' => 'attach', 'volume_id' => @volume_id)
Fog::Compute[:ibm].delete_instance(@instance_id)
@ -83,8 +88,12 @@ Shindo.tests('Fog::Storage[:ibm] | volume requests', ['ibm']) do
returns(true) { Fog::Storage[:ibm].delete_volume(@volume_id).body['success'] }
end
@key.wait_for(Fog::IBM::TIMEOUT) { instance_ids.empty? }
@key.destroy
# See above
# @server = Fog::Compute[:ibm].servers.get(@instance_id)
# @server.wait_for(Fog::IBM::TIMEOUT) { ready? }
# @server.destroy
# @key.wait_for(Fog::IBM::TIMEOUT) { instance_ids.empty? }
# @key.destroy
end