Merge "Implement quota classes."

1 files changed, 5 insertions, 2 deletions

diff --git a/nova/context.py b/nova/context.py
index cab8b2d4b..78dca3ffc 100644
--- a/nova/context.py
+++ b/nova/context.py
@@ -42,7 +42,8 @@ class RequestContext(object):
 
     def __init__(self, user_id, project_id, is_admin=None, read_deleted="no",
                  roles=None, remote_address=None, timestamp=None,
-                 request_id=None, auth_token=None, overwrite=True, **kwargs):
+                 request_id=None, auth_token=None, overwrite=True,
+                 quota_class=None, **kwargs):
         """
         :param read_deleted: 'no' indicates deleted records are hidden, 'yes'
             indicates deleted records are visible, 'only' indicates that
@@ -80,6 +81,7 @@ class RequestContext(object):
             request_id = generate_request_id()
         self.request_id = request_id
         self.auth_token = auth_token
+        self.quota_class = quota_class
         if overwrite or not hasattr(local.store, 'context'):
             self.update_store()
 
@@ -95,7 +97,8 @@ class RequestContext(object):
                 'remote_address': self.remote_address,
                 'timestamp': utils.strtime(self.timestamp),
                 'request_id': self.request_id,
-                'auth_token': self.auth_token}
+                'auth_token': self.auth_token,
+                'quota_class': self.quota_class}
 
     @classmethod
     def from_dict(cls, values):