From 6be770e0464257f2e51a2060d60affb5d5430231 Mon Sep 17 00:00:00 2001
From: Decklin Foster <decklin@red-bean.com>
Date: Tue, 28 Feb 2012 16:28:45 -0500
Subject: [PATCH] [ibm] Rename ibm_user_id -> ibm_username

---
 lib/fog/ibm/compute.rb       | 14 +++++++-------
 lib/fog/ibm/storage.rb       | 14 +++++++-------
 tests/helpers/mock_helper.rb |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/fog/ibm/compute.rb b/lib/fog/ibm/compute.rb
index cb9f6dae4..2e2dea12d 100644
--- a/lib/fog/ibm/compute.rb
+++ b/lib/fog/ibm/compute.rb
@@ -5,7 +5,7 @@ module Fog
   module Compute
     class IBM < Fog::Service
 
-      requires :ibm_user_id, :ibm_password
+      requires :ibm_username, :ibm_password
       recognizes :location
 
       model_path 'fog/ibm/models/compute'
@@ -60,7 +60,7 @@ module Fog
 
       class Real
         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
 
         private
@@ -99,18 +99,18 @@ module Fog
         end
 
         def data
-          self.class.data[@ibm_user_id]
+          self.class.data[@ibm_username]
         end
 
         def reset_data
-          self.class.data.delete(@ibm_user_id)
-          @data = self.class.data[@ibm_user_id]
+          self.class.data.delete(@ibm_username)
+          @data = self.class.data[@ibm_username]
         end
 
         def initialize(options={})
-          @ibm_user_id  = options[:ibm_user_id]
+          @ibm_username = options[:ibm_username]
           @ibm_password = options[:ibm_password]
-          @data = self.class.data[@ibm_user_id]
+          @data = self.class.data[@ibm_username]
         end
 
         def self.populate_images
diff --git a/lib/fog/ibm/storage.rb b/lib/fog/ibm/storage.rb
index 92e9ce7f2..d7b889398 100644
--- a/lib/fog/ibm/storage.rb
+++ b/lib/fog/ibm/storage.rb
@@ -5,7 +5,7 @@ module Fog
   module Storage
     class IBM < Fog::Service
 
-      requires :ibm_user_id, :ibm_password
+      requires :ibm_username, :ibm_password
       recognizes :location
 
       model_path 'fog/ibm/models/storage'
@@ -26,7 +26,7 @@ module Fog
 
       class Real
         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
 
         private
@@ -61,18 +61,18 @@ module Fog
         end
 
         def data
-          self.class.data[@ibm_user_id]
+          self.class.data[@ibm_username]
         end
 
         def reset_data
-          self.class.data.delete(@ibm_user_id)
-          @data = self.class.data[@ibm_user_id]
+          self.class.data.delete(@ibm_username)
+          @data = self.class.data[@ibm_username]
         end
 
         def initialize(options={})
-          @ibm_user_id  = options[:ibm_user_id]
+          @ibm_username = options[:ibm_username]
           @ibm_password = options[:ibm_password]
-          @data = self.class.data[@ibm_user_id]
+          @data = self.class.data[@ibm_username]
         end
 
       end
diff --git a/tests/helpers/mock_helper.rb b/tests/helpers/mock_helper.rb
index a2274ae4e..468a6f77a 100644
--- a/tests/helpers/mock_helper.rb
+++ b/tests/helpers/mock_helper.rb
@@ -30,7 +30,7 @@ if Fog.mock?
     :go_grid_shared_secret            => 'go_grid_shared_secret',
     :google_storage_access_key_id     => 'google_storage_access_key_id',
     :google_storage_secret_access_key => 'google_storage_secret_access_key',
-    :ibm_user_id                      => 'ibm_user_id',
+    :ibm_username                     => 'ibm_username',
     :ibm_password                     => 'ibm_password',
     :joyent_username                  => "joyentuser",
     :joyent_password                  => "joyentpass",