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

[rackspace|compute] tweaked server model tests; updated ready? method to support different ready states as well as checking for error states

Browse source
This commit is contained in:
Kyle Rames 2013-01-11 16:36:07 -06:00
parent a839747733
commit f496ece518
3 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/fog/rackspace/models/compute_v2/server.rb
View file

@ -145,8 +145,12 @@ module Fog
ipv4_address
end
def ready?
state == ACTIVE
def ready?(ready_state = ACTIVE, error_states=[ERROR])
if error_states
error_states = Array(error_states)
raise "ERROR: Server is in error State '#{state}'" if error_states.include?(state)
end
state == ready_state
end
def reboot(type = 'SOFT')

24
tests/rackspace/models/compute_v2/server_tests.rb
View file

@ -10,13 +10,14 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
}
model_tests(service.servers, options, false) do
@instance.wait_for { ready? }
@instance.wait_for(timeout=1500) { ready? }
tests('#update').succeeds do
@instance.name = "fog_server_update"
@instance.access_ipv4_address= "10.10.0.1"
@instance.access_ipv6_address= "0:0:0:0:0:0:0:1"
@instance.save
sleep 60
@instance.reload
returns("10.10.0.1") { @instance.access_ipv4_address }
returns("0:0:0:0:0:0:0:1") { @instance.access_ipv6_address }
@ -34,33 +35,39 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
returns('HARD_REBOOT') { @instance.state }
end
@instance.wait_for(timeout=1500) { ready? }
sleep 30
@instance.wait_for(timeout=1500) { ready? }
sleep 60
tests('#rebuild').succeeds do
@instance.rebuild('5cebb13a-f783-4f8c-8058-c4182c724ccd')
returns('REBUILD') { @instance.state }
end
sleep 30
@instance.wait_for(timeout=1500) { ready? }
sleep 60
tests('#resize').succeeds do
@instance.resize(3)
returns('RESIZE') { @instance.state }
end
@instance.wait_for(timeout=1500) do
raise "ERROR: Server is in ACTIVE state and it should be in VERIFY_RESIZE" if state == 'ACTIVE'
state == 'VERIFY_RESIZE'
end
sleep 30
@instance.wait_for(timeout=1500) { ready?('VERIFY_RESIZE', ['ACTIVE', 'ERROR']) }
sleep 60
tests('#confirm_resize').succeeds do
@instance.confirm_resize
end
sleep 30
@instance.wait_for(timeout=1500) { ready? }
sleep 60
tests('#resize').succeeds do
@instance.resize(2)
returns('RESIZE') { @instance.state }
end
@instance.wait_for(timeout=1500) { state == 'VERIFY_RESIZE' }
@instance.wait_for(timeout=1500) { ready?('VERIFY_RESIZE') }
sleep 60
tests('#revert_resize').succeeds do
@instance.revert_resize
end
@ -83,7 +90,8 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
returns('RESIZE') { @instance.state }
end
@instance.wait_for(timeout=1500) { state == 'VERIFY_RESIZE' }
@instance.wait_for(timeout=1500) { ready?('VERIFY_RESIZE') }
sleep 60
tests('#revert_resize').succeeds do
@instance.revert_resize
end

1
tests/rackspace/requests/compute_v2/server_tests.rb
View file

@ -98,6 +98,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
service.rebuild_server(server_id, rebuild_image_id)
end
wait_for_server_state(service, server_id, 'ACTIVE', 'ERROR')
sleep 60
tests('#resize_server').succeeds do
resize_flavor_id = 3 # 1GB