From 0e1602a6cdb46ea664688ddd48d77b460d820a68 Mon Sep 17 00:00:00 2001
From: Yogeshwar Srikrishnan <yoga80@yahoo.com>
Date: Thu, 9 Jun 2011 00:27:42 -0500
Subject: Code cleanup.

---
 bin/keystone                               |  5 -----
 keystone/frontends/legacy_auth_frontend.py | 18 ++++--------------
 keystone/logic/types/auth.py               |  2 +-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/bin/keystone b/bin/keystone
index f120bbed..decdfc51 100755
--- a/bin/keystone
+++ b/bin/keystone
@@ -52,11 +52,6 @@ if __name__ == '__main__':
                      help="specifies port for Admin API to listen"
                             "on (default is 8081)")
 
-    common_group.add_option('-r', '--rackspace-legacy-port', default=8082,
-                            dest="rackspace_legacy_port", metavar="PORT",
-                     help="specifies port for Rackspace Legacy API to listen"
-                            "on (default is 8082)")
-
     # Parse arguments and load config
     (options, args) = config.parse_options(parser)
 
diff --git a/keystone/frontends/legacy_auth_frontend.py b/keystone/frontends/legacy_auth_frontend.py
index 9ca4e84e..dcd03477 100755
--- a/keystone/frontends/legacy_auth_frontend.py
+++ b/keystone/frontends/legacy_auth_frontend.py
@@ -60,6 +60,9 @@ class AuthProtocol(object):
         self.conf = conf
         self.app = app
 
+    """Handle 1.0 and 1.1 calls via middleware.
+    Right now Iam treating every call of 1.0 and 1.1 as call
+    to authenticate"""
     def __call__(self, env, start_response):
         """ Handle incoming request. Transform. And send downstream. """
         self.start_response = start_response
@@ -67,11 +70,10 @@ class AuthProtocol(object):
         self.request = Request(env)
         if self.request.path.startswith('/v1.0'
                 ) or self.request.path.startswith('/v1.1'):
-            #Handle 1.0 and 1.1 calls via wrapper.
             params = {"passwordCredentials":
                 {"username": utils.get_auth_user(self.request),
                     "password": utils.get_auth_key(self.request)}}
-
+            #Make request to keystone        
             new_request = Request.blank('/v2.0/tokens')
             new_request.headers['Content-type'] = 'application/json'
             new_request.accept = 'text/json'
@@ -89,18 +91,6 @@ class AuthProtocol(object):
             # Other calls pass to downstream WSGI component
             return self.app(self.env, self.start_response)
 
-    def get_auth_user(self):
-        auth_user = None
-        if "X-Auth-User" in self.request.headers:
-            auth_user = self.request.headers["X-Auth-User"]
-        return auth_user
-
-    def get_auth_key(self):
-        auth_key = None
-        if "X-Auth-Key" in self.request.headers:
-            auth_key = self.request.headers["X-Auth-Key"]
-        return auth_key
-
     def transform_keystone_auth_to_legacy_headers(self, content):
         headers = {}
         if "auth" in content:
diff --git a/keystone/logic/types/auth.py b/keystone/logic/types/auth.py
index 4b90b8ca..6e534adf 100755
--- a/keystone/logic/types/auth.py
+++ b/keystone/logic/types/auth.py
@@ -129,7 +129,7 @@ class AuthData(object):
 
     def to_xml(self):
         dom = etree.Element("auth",
-                xmlns="http://docs.openstack.org/identity/api/v2.0")
+            xmlns="http://docs.openstack.org/identity/api/v2.0")
         token = etree.Element("token",
                              expires=self.token.expires.isoformat())
         token.set("id", self.token.token_id)
-- 
cgit