Merge pull request #52 from aababilov/master

Fix keystone compatibility issues, hide password on login
This commit is contained in:
Devin Carlen 2011-07-12 10:01:54 -07:00
commit 1937e9a3a9
3 changed files with 5 additions and 5 deletions

View File

@ -247,10 +247,10 @@ def account_api(request):
LOG.debug('account_api connection created using token "%s"'
' and url "%s"' %
(request.session['token'],
url_for(request, 'keystone', True)))
url_for(request, 'identity', True)))
return openstackx.extras.Account(
auth_token=request.session['token'],
management_url=url_for(request, 'keystone', True))
management_url=url_for(request, 'identity', True))
def glance_api(request):

View File

@ -34,7 +34,7 @@ LOG = logging.getLogger('django_openstack.auth')
class Login(forms.SelfHandlingForm):
username = forms.CharField(max_length="20", label="User Name")
password = forms.CharField(max_length="20", label="Password")
password = forms.CharField(max_length="20", label="Password", widget=forms.PasswordInput(render_value=False))
def handle(self, request, data):
try:

View File

@ -443,9 +443,9 @@ class AccountApiTests(test.TestCase):
self.mox.StubOutWithMock(api, 'url_for')
api.url_for(
IsA(http.HttpRequest), 'keystone', True).AndReturn(TEST_URL)
IsA(http.HttpRequest), 'identity', True).AndReturn(TEST_URL)
api.url_for(
IsA(http.HttpRequest), 'keystone', True).AndReturn(TEST_URL)
IsA(http.HttpRequest), 'identity', True).AndReturn(TEST_URL)
self.mox.ReplayAll()