From ae52c807f78cb607c31bc61705cd2250f2c9b10d Mon Sep 17 00:00:00 2001
From: Kyle Rames <kyle.rames@rackspace.com>
Date: Wed, 31 Jul 2013 14:12:43 -0500
Subject: [PATCH] [rackspace|compute_v2] renaming keypairs to key_pairs to
 match other compute implementations

---
 lib/fog/rackspace/compute_v2.rb                |  4 ++--
 .../compute_v2/{keypair.rb => key_pair.rb}     |  2 +-
 .../compute_v2/{keypairs.rb => key_pairs.rb}   |  6 +++---
 .../models/compute_v2/keypairs_tests.rb        | 18 +++++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename lib/fog/rackspace/models/compute_v2/{keypair.rb => key_pair.rb} (98%)
 rename lib/fog/rackspace/models/compute_v2/{keypairs.rb => key_pairs.rb} (90%)

diff --git a/lib/fog/rackspace/compute_v2.rb b/lib/fog/rackspace/compute_v2.rb
index 79df7b6ef..96c657c2d 100644
--- a/lib/fog/rackspace/compute_v2.rb
+++ b/lib/fog/rackspace/compute_v2.rb
@@ -54,8 +54,8 @@ module Fog
       collection :attachments
       model :network
       collection :networks
-      model :keypair
-      collection :keypairs
+      model :key_pair
+      collection :key_pairs
 
       request_path 'fog/rackspace/requests/compute_v2'
       request :list_servers
diff --git a/lib/fog/rackspace/models/compute_v2/keypair.rb b/lib/fog/rackspace/models/compute_v2/key_pair.rb
similarity index 98%
rename from lib/fog/rackspace/models/compute_v2/keypair.rb
rename to lib/fog/rackspace/models/compute_v2/key_pair.rb
index ae4f7a606..28b5c9a54 100644
--- a/lib/fog/rackspace/models/compute_v2/keypair.rb
+++ b/lib/fog/rackspace/models/compute_v2/key_pair.rb
@@ -3,7 +3,7 @@ require 'fog/core/model'
 module Fog
   module Compute
     class RackspaceV2
-      class Keypair < Fog::Model
+      class KeyPair < Fog::Model
 
         # @!attribute [rw] name
         # @return [String] the keypair name
diff --git a/lib/fog/rackspace/models/compute_v2/keypairs.rb b/lib/fog/rackspace/models/compute_v2/key_pairs.rb
similarity index 90%
rename from lib/fog/rackspace/models/compute_v2/keypairs.rb
rename to lib/fog/rackspace/models/compute_v2/key_pairs.rb
index 94bab546d..41a060fc3 100644
--- a/lib/fog/rackspace/models/compute_v2/keypairs.rb
+++ b/lib/fog/rackspace/models/compute_v2/key_pairs.rb
@@ -1,13 +1,13 @@
 require 'fog/core/collection'
-require 'fog/rackspace/models/compute_v2/keypair'
+require 'fog/rackspace/models/compute_v2/key_pair'
 
 module Fog
   module Compute
     class RackspaceV2
 
-      class Keypairs < Fog::Collection
+      class KeyPairs < Fog::Collection
 
-        model Fog::Compute::RackspaceV2::Keypair
+        model Fog::Compute::RackspaceV2::KeyPair
 
         # Fetch the list of known keypairs
         # @return [Fog::Compute::RackspaceV2::Keypairs] the retreived keypairs
diff --git a/tests/rackspace/models/compute_v2/keypairs_tests.rb b/tests/rackspace/models/compute_v2/keypairs_tests.rb
index 1c2c943a0..a9ac0f1d6 100644
--- a/tests/rackspace/models/compute_v2/keypairs_tests.rb
+++ b/tests/rackspace/models/compute_v2/keypairs_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute::RackspaceV2 | keypairs', ['rackspace']) do
+Shindo.tests('Fog::Compute::RackspaceV2 | key_pairs', ['rackspace']) do
   service = Fog::Compute::RackspaceV2.new
 
   name  = Fog::Mock.random_letters(32)
@@ -7,36 +7,36 @@ Shindo.tests('Fog::Compute::RackspaceV2 | keypairs', ['rackspace']) do
   tests("API access") do
     begin
         tests("create").succeeds do
-          key = service.keypairs.create({:name => name})
+          key = service.key_pairs.create({:name => name})
         end
 
         tests("list all").succeeds do
-          service.keypairs.all
+          service.key_pairs.all
         end
 
         tests("get").succeeds do
-          service.keypairs.get(name)
+          service.key_pairs.get(name)
         end
 
         tests("delete").succeeds do
-          key = nil if service.keypairs.destroy(name)
+          key = nil if service.key_pairs.destroy(name)
           key == nil
         end
 
         tests("get unknown").returns(nil) do
-          service.keypairs.get(Fog::Mock.random_letters(32))
+          service.key_pairs.get(Fog::Mock.random_letters(32))
         end
 
         tests("delete unknown").raises(Fog::Compute::RackspaceV2::NotFound) do
-            service.keypairs.destroy(Fog::Mock.random_letters(32))
+            service.key_pairs.destroy(Fog::Mock.random_letters(32))
         end
 
         tests("create again after delete").succeeds do
-          key = service.keypairs.create({:name => name})
+          key = service.key_pairs.create({:name => name})
         end
 
         tests("create already existing").raises(Fog::Compute::RackspaceV2::ServiceError) do
-          service.keypairs.create({:name => name})
+          service.key_pairs.create({:name => name})
         end
 
     ensure