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

fixes for cloudstack mock tests

Browse source 
see #1090
This commit is contained in:
geemus 2012-08-16 11:43:07 -05:00
parent 3a19598730
commit ffdee0185f
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/cloudstack/requests/volume_tests.rb
View file

@ -45,4 +45,4 @@ Shindo.tests('Fog::Compute[:cloudstack] | volume requests', ['cloudstack']) do
end end
end end

12
tests/compute/helper.rb
View file

@ -33,12 +33,18 @@ def compute_providers
}, },
:server_attributes => {}.tap do |hash| :server_attributes => {}.tap do |hash|
[:zone_id, :network_ids, :template_id, :service_offering_id].each do |k| [:zone_id, :network_ids, :template_id, :service_offering_id].each do |k|
hash[k]= Fog.credentials["cloudstack_#{k}".to_sym] key = "cloudstack_#{k}".to_sym
if Fog.credentials[key]
hash[k]= Fog.credentials[key]
end
end end
end, end,
:volume_attributes => {:name => "somevolume"}.tap do |hash| :volume_attributes => {:name => "somevolume"}.tap do |hash|
[:zone_id, :disk_offering_id].each do |k| [:zone_id, :disk_offering_id].each do |k|
hash[k]= Fog.credentials["cloudstack_#{k}".to_sym] key = "cloudstack_#{k}".to_sym
if Fog.credentials[key]
hash[k]= Fog.credentials[key]
end
end end
end, end,
:security_group_attributes => {:name => "cloudstack.sg.#{Time.now.to_i}"}, :security_group_attributes => {:name => "cloudstack.sg.#{Time.now.to_i}"},
@ -53,7 +59,7 @@ def compute_providers
:glesys => { :glesys => {
:server_attributes => { :server_attributes => {
:rootpassword => "secret_password_#{Time.now.to_i}", :rootpassword => "secret_password_#{Time.now.to_i}",
:hostname => "fog.example#{Time.now.to_i}.com" :hostname => "fog.example#{Time.now.to_i}.com"
}, },
:mocked => false :mocked => false
}, },

4
tests/helpers/mock_helper.rb
View file

@ -15,8 +15,10 @@ if Fog.mock?
:bluebox_customer_id => 'bluebox_customer_id', :bluebox_customer_id => 'bluebox_customer_id',
:brightbox_client_id => 'brightbox_client_id', :brightbox_client_id => 'brightbox_client_id',
:brightbox_secret => 'brightbox_secret', :brightbox_secret => 'brightbox_secret',
:cloudstack_disk_offering_id => '',
:cloudstack_host => 'http://cloudstack.example.org', :cloudstack_host => 'http://cloudstack.example.org',
:cloudstack_service_offering_id => '4437ac6c-9fe3-477a-57ec-60a5a45896a4', :cloudstack_network_ids => '',
:cloudstack_service_offering_id => '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
:cloudstack_template_id => '8a31cf9c-f248-0588-256e-9dbf58785216', :cloudstack_template_id => '8a31cf9c-f248-0588-256e-9dbf58785216',
:cloudstack_zone_id => 'c554c592-e09c-9df5-7688-4a32754a4305', :cloudstack_zone_id => 'c554c592-e09c-9df5-7688-4a32754a4305',
:clodo_api_key => 'clodo_api_key', :clodo_api_key => 'clodo_api_key',