Rename keypairs to keypair to be more consistent

TerryHowe · TerryHowe · commit 8a3afe63e748 · 2014-11-13T06:10:26.000-07:00
Change-Id: I429c83c421aa6b04e4bb4379bfedbc7feeb2d8f0
diff --git a/openstack/compute/v2/keypair.py b/openstack/compute/v2/keypair.py
@@ -15,7 +15,7 @@
 from openstack import resource
 
 
-class Keypairs(resource.Resource):
+class Keypair(resource.Resource):
     id_attribute = 'name'
     name_attribute = 'fingerprint'
     resource_key = 'keypair'
@@ -40,7 +40,7 @@ def __init__(self, attrs=None, loaded=False):
         if attrs is not None:
             if 'keypair' in attrs:
                 attrs = attrs['keypair']
-        super(Keypairs, self).__init__(attrs, loaded)
+        super(Keypair, self).__init__(attrs, loaded)
 
     def create(self, session):
         """Create a new keypair from this instance.
diff --git a/openstack/tests/compute/v2/test_keypair.py b/openstack/tests/compute/v2/test_keypair.py
@@ -13,7 +13,7 @@
 import mock
 import testtools
 
-from openstack.compute.v2 import keypairs
+from openstack.compute.v2 import keypair
 from openstack import exceptions
 
 EXAMPLE = {
@@ -25,10 +25,10 @@
 }
 
 
-class TestKeypairs(testtools.TestCase):
+class TestKeypair(testtools.TestCase):
 
     def test_basic(self):
-        sot = keypairs.Keypairs()
+        sot = keypair.Keypair()
         self.assertEqual('keypair', sot.resource_key)
         self.assertEqual('keypairs', sot.resources_key)
         self.assertEqual('/os-keypairs', sot.base_path)
@@ -40,7 +40,7 @@ def test_basic(self):
         self.assertTrue(sot.allow_list)
 
     def test_make_it(self):
-        sot = keypairs.Keypairs(EXAMPLE)
+        sot = keypair.Keypair(EXAMPLE)
         self.assertEqual(EXAMPLE['keypair']['fingerprint'], sot.fingerprint)
         self.assertEqual(EXAMPLE['keypair']['name'], sot.name)
         self.assertEqual(EXAMPLE['keypair']['public_key'], sot.public_key)
@@ -51,7 +51,7 @@ def test_find(self):
         sess = mock.Mock()
         sess.get = mock.MagicMock()
         sess.get.return_value = resp
-        sot = keypairs.Keypairs()
+        sot = keypair.Keypair()
         result = sot.find(sess, "kato")
         url = 'os-keypairs/kato'
         sess.get.assert_called_with(url, service=sot.service)
@@ -63,5 +63,5 @@ def test_find_not_found(self):
         sess = mock.Mock()
         sess.get = mock.MagicMock()
         sess.get.side_effect = exceptions.HttpException("404")
-        sot = keypairs.Keypairs()
+        sot = keypair.Keypair()
         self.assertRaises(exceptions.ResourceNotFound, sot.find, sess, "kato")
