change names for consistency with existing db api

4 files changed, 24 insertions, 24 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 1fbaa399d..825b50e48 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -651,15 +651,15 @@ class API(base.Base):
 
     def get_instance_metadata(self, context, instance_id):
         """Get all metadata associated with an instance."""
-        rv = self.db.get_instance_metadata(context, instance_id)
+        rv = self.db.instance_metadata_get(context, instance_id)
         return dict(rv.iteritems())
 
     def delete_instance_metadata(self, context, instance_id, key):
         """Delete the given metadata item"""
-        self.db.delete_instance_metadata(context, instance_id, key)
+        self.db.instance_metadata_delete(context, instance_id, key)
 
     def update_or_create_instance_metadata(self, context, instance_id,
                                             metadata):
         """Updates or creates instance metadata"""
-        self.db.update_or_create_instance_metadata(context, instance_id,
+        self.db.instance_metadata_update_or_create(context, instance_id,
                                                     metadata)
diff --git a/nova/db/api.py b/nova/db/api.py
index 1856e6bcb..300723c62 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1176,16 +1176,16 @@ def zone_get_all(context):
 ####################
 
 
-def get_instance_metadata(context, instance_id):
+def instance_metadata_get(context, instance_id):
     """Get all metadata for an instance"""
-    return IMPL.get_instance_metadata(context, instance_id)
+    return IMPL.instance_metadata_get(context, instance_id)
 
 
-def delete_instance_metadata(context, instance_id, key):
+def instance_metadata_delete(context, instance_id, key):
     """Delete the given metadata item"""
-    IMPL.delete_instance_metadata(context, instance_id, key)
+    IMPL.instance_metadata_delete(context, instance_id, key)
 
 
-def update_or_create_instance_metadata(context, instance_id, metadata):
-    """Creates or updates instance metadata"""
-    IMPL.update_or_create_instance_metadata(context, instance_id, metadata)
+def instance_metadata_update_or_create(context, instance_id, metadata):
+    """Create or update instance metadata"""
+    IMPL.instance_metadata_update_or_create(context, instance_id, metadata)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 5fe18b65c..57c05623b 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2467,7 +2467,7 @@ def zone_get_all(context):
 ####################
 
 @require_context
-def get_instance_metadata(context, instance_id):
+def instance_metadata_get(context, instance_id):
     session = get_session()
 
     meta_results = session.query(models.InstanceMetadata).\
@@ -2482,7 +2482,7 @@ def get_instance_metadata(context, instance_id):
 
 
 @require_context
-def delete_instance_metadata(context, instance_id, key):
+def instance_metadata_delete(context, instance_id, key):
     session = get_session()
     session.query(models.InstanceMetadata).\
         filter_by(instance_id=instance_id).\
@@ -2494,7 +2494,7 @@ def delete_instance_metadata(context, instance_id, key):
 
 
 @require_context
-def get_instance_metadata_item(context, instance_id, key):
+def instance_metadata_get_item(context, instance_id, key):
     session = get_session()
 
     meta_result = session.query(models.InstanceMetadata).\
@@ -2510,12 +2510,12 @@ def get_instance_metadata_item(context, instance_id, key):
 
 
 @require_context
-def update_or_create_instance_metadata(context, instance_id, metadata):
+def instance_metadata_update_or_create(context, instance_id, metadata):
     session = get_session()
     meta_ref = None
     for key, value in metadata.iteritems():
         try:
-            meta_ref = get_instance_metadata_item(context, instance_id, key,
+            meta_ref = instance_metadata_get_item(context, instance_id, key,
                                                         session)
         except:
             meta_ref = models.InstanceMetadata()
diff --git a/nova/tests/api/openstack/test_server_metadata.py b/nova/tests/api/openstack/test_server_metadata.py
index 97cb57ebd..c8d456472 100644
--- a/nova/tests/api/openstack/test_server_metadata.py
+++ b/nova/tests/api/openstack/test_server_metadata.py
@@ -68,7 +68,7 @@ class ServerMetaDataTest(unittest.TestCase):
         super(ServerMetaDataTest, self).tearDown()
 
     def test_index(self):
-        self.stubs.Set(nova.db.api, 'get_instance_metadata',
+        self.stubs.Set(nova.db.api, 'instance_metadata_get',
                         return_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta')
         req.environ['api.version'] = '1.1'
@@ -78,7 +78,7 @@ class ServerMetaDataTest(unittest.TestCase):
         self.assertEqual('value1', res_dict['metadata']['key1'])
 
     def test_index_no_data(self):
-        self.stubs.Set(nova.db.api, 'get_instance_metadata',
+        self.stubs.Set(nova.db.api, 'instance_metadata_get',
                         return_empty_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta')
         req.environ['api.version'] = '1.1'
@@ -88,7 +88,7 @@ class ServerMetaDataTest(unittest.TestCase):
         self.assertEqual(0, len(res_dict['metadata']))
 
     def test_show(self):
-        self.stubs.Set(nova.db.api, 'get_instance_metadata',
+        self.stubs.Set(nova.db.api, 'instance_metadata_get',
                         return_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key5')
         req.environ['api.version'] = '1.1'
@@ -98,7 +98,7 @@ class ServerMetaDataTest(unittest.TestCase):
         self.assertEqual('value5', res_dict['key5'])
 
     def test_show_meta_not_found(self):
-        self.stubs.Set(nova.db.api, 'get_instance_metadata',
+        self.stubs.Set(nova.db.api, 'instance_metadata_get',
                         return_empty_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key6')
         req.environ['api.version'] = '1.1'
@@ -107,7 +107,7 @@ class ServerMetaDataTest(unittest.TestCase):
         self.assertEqual(404, res.status_int)
 
     def test_delete(self):
-        self.stubs.Set(nova.db.api, 'delete_instance_metadata',
+        self.stubs.Set(nova.db.api, 'instance_metadata_delete',
                         delete_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key5')
         req.environ['api.version'] = '1.1'
@@ -116,7 +116,7 @@ class ServerMetaDataTest(unittest.TestCase):
         self.assertEqual(200, res.status_int)
 
     def test_create(self):
-        self.stubs.Set(nova.db.api, 'update_or_create_instance_metadata',
+        self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
                         return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta')
         req.environ['api.version'] = '1.1'
@@ -129,7 +129,7 @@ class ServerMetaDataTest(unittest.TestCase):
         self.assertEqual('value1', res_dict['metadata']['key1'])
 
     def test_update_item(self):
-        self.stubs.Set(nova.db.api, 'update_or_create_instance_metadata',
+        self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
                         return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key1')
         req.environ['api.version'] = '1.1'
@@ -142,7 +142,7 @@ class ServerMetaDataTest(unittest.TestCase):
         self.assertEqual('value1', res_dict['key1'])
 
     def test_update_item_too_many_keys(self):
-        self.stubs.Set(nova.db.api, 'update_or_create_instance_metadata',
+        self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
                         return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key1')
         req.environ['api.version'] = '1.1'
@@ -153,7 +153,7 @@ class ServerMetaDataTest(unittest.TestCase):
         self.assertEqual(400, res.status_int)
 
     def test_update_item_body_uri_mismatch(self):
-        self.stubs.Set(nova.db.api, 'update_or_create_instance_metadata',
+        self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
                         return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/bad')
         req.environ['api.version'] = '1.1'