change names for consistency with existing db api

2 files changed, 12 insertions, 12 deletions

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()