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] Rename ibm_user_id -> ibm_username

Browse source
This commit is contained in:
Decklin Foster 2012-02-28 16:28:45 -05:00
parent ab49331330
commit 6be770e046
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/fog/ibm/compute.rb
View file

@ -5,7 +5,7 @@ module Fog
module Compute module Compute
class IBM < Fog::Service class IBM < Fog::Service
requires :ibm_user_id, :ibm_password requires :ibm_username, :ibm_password
recognizes :location recognizes :location
model_path 'fog/ibm/models/compute' model_path 'fog/ibm/models/compute'
@ -60,7 +60,7 @@ module Fog
class Real class Real
def initialize(options={}) def initialize(options={})
@connection = Fog::IBM::Connection.new(options[:ibm_user_id], options[:ibm_password]) @connection = Fog::IBM::Connection.new(options[:ibm_username], options[:ibm_password])
end end
private private
@ -99,18 +99,18 @@ module Fog
end end
def data def data
self.class.data[@ibm_user_id] self.class.data[@ibm_username]
end end
def reset_data def reset_data
self.class.data.delete(@ibm_user_id) self.class.data.delete(@ibm_username)
@data = self.class.data[@ibm_user_id] @data = self.class.data[@ibm_username]
end end
def initialize(options={}) def initialize(options={})
@ibm_user_id = options[:ibm_user_id] @ibm_username = options[:ibm_username]
@ibm_password = options[:ibm_password] @ibm_password = options[:ibm_password]
@data = self.class.data[@ibm_user_id] @data = self.class.data[@ibm_username]
end end
def self.populate_images def self.populate_images

14
lib/fog/ibm/storage.rb
View file

@ -5,7 +5,7 @@ module Fog
module Storage module Storage
class IBM < Fog::Service class IBM < Fog::Service
requires :ibm_user_id, :ibm_password requires :ibm_username, :ibm_password
recognizes :location recognizes :location
model_path 'fog/ibm/models/storage' model_path 'fog/ibm/models/storage'
@ -26,7 +26,7 @@ module Fog
class Real class Real
def initialize(options={}) def initialize(options={})
@connection = Fog::IBM::Connection.new(options[:ibm_user_id], options[:ibm_password]) @connection = Fog::IBM::Connection.new(options[:ibm_username], options[:ibm_password])
end end
private private
@ -61,18 +61,18 @@ module Fog
end end
def data def data
self.class.data[@ibm_user_id] self.class.data[@ibm_username]
end end
def reset_data def reset_data
self.class.data.delete(@ibm_user_id) self.class.data.delete(@ibm_username)
@data = self.class.data[@ibm_user_id] @data = self.class.data[@ibm_username]
end end
def initialize(options={}) def initialize(options={})
@ibm_user_id = options[:ibm_user_id] @ibm_username = options[:ibm_username]
@ibm_password = options[:ibm_password] @ibm_password = options[:ibm_password]
@data = self.class.data[@ibm_user_id] @data = self.class.data[@ibm_username]
end end
end end

2
tests/helpers/mock_helper.rb
View file

@ -30,7 +30,7 @@ if Fog.mock?
:go_grid_shared_secret => 'go_grid_shared_secret', :go_grid_shared_secret => 'go_grid_shared_secret',
:google_storage_access_key_id => 'google_storage_access_key_id', :google_storage_access_key_id => 'google_storage_access_key_id',
:google_storage_secret_access_key => 'google_storage_secret_access_key', :google_storage_secret_access_key => 'google_storage_secret_access_key',
:ibm_user_id => 'ibm_user_id', :ibm_username => 'ibm_username',
:ibm_password => 'ibm_password', :ibm_password => 'ibm_password',
:joyent_username => "joyentuser", :joyent_username => "joyentuser",
:joyent_password => "joyentpass", :joyent_password => "joyentpass",