Move APIRequestContext into its own file

2 files changed, 33 insertions, 12 deletions

diff --git a/nova/api/ec2/apirequestcontext.py b/nova/api/ec2/apirequestcontext.py
new file mode 100644
index 000000000..fb3118020
--- /dev/null
+++ b/nova/api/ec2/apirequestcontext.py
@@ -0,0 +1,33 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+APIRequestContext
+"""
+
+import random
+
+class APIRequestContext(object):
+    def __init__(self, handler, user, project):
+        self.handler = handler
+        self.user = user
+        self.project = project
+        self.request_id = ''.join(
+                [random.choice('ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-')
+                 for x in xrange(20)]
+                )
diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py
index 5a4e496a0..311fb1880 100755
--- a/nova/endpoint/api.py
+++ b/nova/endpoint/api.py
@@ -22,7 +22,6 @@ Most calls are proxied into the responsible controller.
 """
 
 import multiprocessing
-import random
 import re
 import urllib
 
@@ -38,17 +37,6 @@ FLAGS = flags.FLAGS
 flags.DEFINE_integer('cc_port', 8773, 'cloud controller port')
 
 
-class APIRequestContext(object):
-    def __init__(self, handler, user, project):
-        self.handler = handler
-        self.user = user
-        self.project = project
-        self.request_id = ''.join(
-                [random.choice('ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-')
-                 for x in xrange(20)]
-                )
-
-
 class RootRequestHandler(tornado.web.RequestHandler):
     def get(self):
         # available api versions