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

Merge pull request #2192 from reynders/fix_2187

Browse source 
Fix issue #2187
This commit is contained in:
Kyle Rames 2013-10-01 06:21:40 -07:00
commit 4578aecd53
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -198,17 +198,18 @@ module Fog
# * BUILD -> ERROR (on error)
def create(options)
requires :name, :image_id, :flavor_id
modified_options = Marshal.load(Marshal.dump(options))
options[:networks] ||= attributes[:networks]
options[:disk_config] = disk_config unless disk_config.nil?
options[:metadata] = metadata.to_hash unless @metadata.nil?
options[:personality] = personality unless personality.nil?
options[:keypair] ||= attributes[:keypair]
modified_options[:networks] ||= attributes[:networks]
modified_options[:disk_config] = disk_config unless disk_config.nil?
modified_options[:metadata] = metadata.to_hash unless @metadata.nil?
modified_options[:personality] = personality unless personality.nil?
modified_options[:keypair] ||= attributes[:keypair]
if options[:networks]
options[:networks].map! { |id| { :uuid => id } }
if modified_options[:networks]
modified_options[:networks].map! { |id| { :uuid => id } }
end
data = service.create_server(name, image_id, flavor_id, 1, 1, options)
data = service.create_server(name, image_id, flavor_id, 1, 1, modified_options)
merge_attributes(data.body['server'])
true
end

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

@ -9,7 +9,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
options = {
:name => "fog_server_#{Time.now.to_i.to_s}",
:flavor_id => rackspace_test_flavor_id(service),
:image_id => rackspace_test_image_id(service),
:image_id => rackspace_test_image_id(service),
:metadata => { 'fog_test' => 'true' },
:networks => [@network.id]
}
@ -76,6 +76,13 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
@instance.addresses.keys.include?(@network.label)
end
tests('#create').succeeds do
pending unless Fog.mocking?
original_options = Marshal.load(Marshal.dump(options))
@instance.create(options)
returns(true) { original_options == options }
end
tests('#update').succeeds do
new_name = "fog_server_update#{Time.now.to_i.to_s}"
@instance.name = new_name