tenant_id -> project_id

3 files changed, 9 insertions, 8 deletions

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index ca6c1b5f1..df8e0c564 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -72,12 +72,12 @@ class TenantMapper(routes.Mapper):
 
     def resource(self, member_name, collection_name, **kwargs):
         if not ('parent_resource' in kwargs):
-            kwargs['path_prefix'] = '{tenant_id}/'
+            kwargs['path_prefix'] = '{project_id}/'
         else:
             parent_resource = kwargs['parent_resource']
             p_collection = parent_resource['collection_name']
             p_member = parent_resource['member_name']
-            kwargs['path_prefix'] = '{tenant_id}/%s/:%s_id' % (p_collection,
+            kwargs['path_prefix'] = '{project_id}/%s/:%s_id' % (p_collection,
                                                                p_member)
         routes.Mapper.resource(self, member_name,
                                      collection_name,
@@ -203,7 +203,7 @@ class APIRouterV11(APIRouter):
                         parent_resource=dict(member_name='image',
                         collection_name='images'))
 
-        mapper.connect("metadata", "/{tenant_id}/images/{image_id}/metadata",
+        mapper.connect("metadata", "/{project_id}/images/{image_id}/metadata",
                        controller=image_metadata_controller,
                        action='update_all',
                        conditions={"method": ['PUT']})
@@ -215,7 +215,8 @@ class APIRouterV11(APIRouter):
                         parent_resource=dict(member_name='server',
                         collection_name='servers'))
 
-        mapper.connect("metadata", "/{tenant_id}/servers/{server_id}/metadata",
+        mapper.connect("metadata",
+                       "/{project_id}/servers/{server_id}/metadata",
                        controller=server_metadata_controller,
                        action='update_all',
                        conditions={"method": ['PUT']})
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index f733b2d95..530972bec 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -221,12 +221,12 @@ class ExtensionMiddleware(base_wsgi.Middleware):
         for action in ext_mgr.get_actions():
             if not action.collection in action_resources.keys():
                 resource = ActionExtensionResource(application)
-                mapper.connect("/:(tenant_id)/%s/:(id)/action.:(format)" %
+                mapper.connect("/:(project_id)/%s/:(id)/action.:(format)" %
                                 action.collection,
                                 action='action',
                                 controller=resource,
                                 conditions=dict(method=['POST']))
-                mapper.connect("/:(tenant_id)/%s/:(id)/action" %
+                mapper.connect("/:(project_id)/%s/:(id)/action" %
                                 action.collection,
                                 action='action',
                                 controller=resource,
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 34c31260b..82fef6df8 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -486,8 +486,8 @@ class Resource(wsgi.Application):
             msg = _("Malformed request body")
             return faults.Fault(webob.exc.HTTPBadRequest(explanation=msg))
 
-        if 'tenant_id' in args:
-            args.pop("tenant_id")
+        if "project_id" in args:
+            project_id = args.pop("project_id")
 
         try:
             action_result = self.dispatch(request, action, args)