mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Updated compute model tests to take a provider parameter; Updated tests to run tests for Rackspace Compute V1. I will add V2 when the mocks are complete.
This commit is contained in:
parent
bc4143ad9f
commit
7988712aa9
4 changed files with 10 additions and 3 deletions
|
@ -82,6 +82,7 @@ def compute_providers
|
||||||
:mocked => false
|
:mocked => false
|
||||||
},
|
},
|
||||||
:rackspace => {
|
:rackspace => {
|
||||||
|
:provider_attributes => { :version => :v1 },
|
||||||
:server_attributes => {
|
:server_attributes => {
|
||||||
:image_id => 49, # image 49 = Ubuntu 10.04 LTS (lucid)
|
:image_id => 49, # image 49 = Ubuntu 10.04 LTS (lucid)
|
||||||
:name => "fog_#{Time.now.to_i}"
|
:name => "fog_#{Time.now.to_i}"
|
||||||
|
|
|
@ -4,7 +4,9 @@ for provider, config in compute_providers
|
||||||
|
|
||||||
Shindo.tests("Fog::Compute[:#{provider}] | flavors", [provider.to_s]) do
|
Shindo.tests("Fog::Compute[:#{provider}] | flavors", [provider.to_s]) do
|
||||||
|
|
||||||
flavors_tests(Fog::Compute[provider], (config[:flavors_attributes] || {}), config[:mocked])
|
provider_attributes = config[:provider_attributes] || {}
|
||||||
|
provider_attributes.merge!(:provider => provider)
|
||||||
|
flavors_tests(Fog::Compute.new(provider_attributes), (config[:flavors_attributes] || {}), config[:mocked])
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,9 @@ for provider, config in compute_providers
|
||||||
|
|
||||||
Shindo.tests("Fog::Compute[:#{provider}] | server", [provider.to_s]) do
|
Shindo.tests("Fog::Compute[:#{provider}] | server", [provider.to_s]) do
|
||||||
|
|
||||||
server_tests(Fog::Compute[provider], (config[:server_attributes] || {}), config[:mocked]) do
|
provider_attributes = config[:provider_attributes] || {}
|
||||||
|
provider_attributes.merge!(:provider => provider)
|
||||||
|
server_tests(Fog::Compute.new(provider_attributes), (config[:server_attributes] || {}), config[:mocked]) do
|
||||||
|
|
||||||
if Fog.mocking? && !config[:mocked]
|
if Fog.mocking? && !config[:mocked]
|
||||||
pending
|
pending
|
||||||
|
|
|
@ -3,7 +3,9 @@ for provider, config in compute_providers
|
||||||
|
|
||||||
Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider.to_s]) do
|
Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider.to_s]) do
|
||||||
|
|
||||||
servers_tests(Fog::Compute[provider], (config[:server_attributes] || {}), config[:mocked])
|
provider_attributes = config[:provider_attributes] || {}
|
||||||
|
provider_attributes.merge!(:provider => provider)
|
||||||
|
servers_tests(Fog::Compute.new(provider_attributes), (config[:server_attributes] || {}), config[:mocked])
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue