From 5e3da5864825a12da5a1ea1102a6efb6cebe204b Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Fri, 1 Oct 2010 05:57:17 -0700
Subject: Fix the deprecation warnings for passing no context.

Moved RequestContext out of nova.api, because it is used by everything

Context is passed through the queue.

Added some helper methods for converting to admin context.

Added a few more fields to request context.
---
 nova/auth/manager.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'nova/auth')

diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index 0bc12c80f..9d0c5c95c 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -28,6 +28,7 @@ import tempfile
 import uuid
 import zipfile
 
+from nova import context
 from nova import crypto
 from nova import db
 from nova import exception
@@ -454,7 +455,7 @@ class AuthManager(object):
             return [Project(**project_dict) for project_dict in project_list]
 
     def create_project(self, name, manager_user, description=None,
-                       member_users=None, context=None):
+                       member_users=None):
         """Create a project
 
         @type name: str
@@ -485,7 +486,8 @@ class AuthManager(object):
             if project_dict:
                 project = Project(**project_dict)
                 try:
-                    self.network_manager.allocate_network(context,
+                    ctxt = context.get_admin_context()
+                    self.network_manager.allocate_network(ctxt,
                                                           project.id)
                 except:
                     drv.delete_project(project.id)
@@ -537,7 +539,7 @@ class AuthManager(object):
                                             Project.safe_id(project))
 
     @staticmethod
-    def get_project_vpn_data(project, context=None):
+    def get_project_vpn_data(project):
         """Gets vpn ip and port for project
 
         @type project: Project or project_id
@@ -548,7 +550,7 @@ class AuthManager(object):
         not been allocated for user.
         """
 
-        network_ref = db.project_get_network(context,
+        network_ref = db.project_get_network(context.get_admin_context(),
                                              Project.safe_id(project))
 
         if not network_ref['vpn_public_port']:
@@ -556,12 +558,13 @@ class AuthManager(object):
         return (network_ref['vpn_public_address'],
                 network_ref['vpn_public_port'])
 
-    def delete_project(self, project, context=None):
+    def delete_project(self, project):
         """Deletes a project"""
         try:
-            network_ref = db.project_get_network(context,
+            ctxt = context.get_admin_context()
+            network_ref = db.project_get_network(ctxt,
                                                  Project.safe_id(project))
-            db.network_destroy(context, network_ref['id'])
+            db.network_destroy(ctxt, network_ref['id'])
         except:
             logging.exception('Could not destroy network for %s',
                               project)
@@ -626,7 +629,8 @@ class AuthManager(object):
 
         Additionally deletes all users key_pairs"""
         uid = User.safe_id(user)
-        db.key_pair_destroy_all_by_user(None, uid)
+        db.key_pair_destroy_all_by_user(context.get_admin_context(),
+                                        uid)
         with self.driver() as drv:
             drv.delete_user(uid)
 
-- 
cgit