git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2bd5b41
)
use hashlib instead of md5 library
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 14 Jun 2013 22:16:10 +0000
(18:16 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 14 Jun 2013 22:16:10 +0000
(18:16 -0400)
planetstack/openstack/manager.py
patch
|
blob
|
history
diff --git
a/planetstack/openstack/manager.py
b/planetstack/openstack/manager.py
index
ed2769d
..
a5d3f4a
100644
(file)
--- a/
planetstack/openstack/manager.py
+++ b/
planetstack/openstack/manager.py
@@
-2,7
+2,7
@@
import os
#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
import string
import random
#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
import string
import random
-import
md5
+import
hashlib
from netaddr import IPAddress, IPNetwork
from planetstack import settings
from netaddr import IPAddress, IPNetwork
from planetstack import settings
@@
-57,7
+57,7
@@
class OpenStackManager:
@require_enabled
def init_caller(self, caller, tenant):
auth = {'username': caller.email,
@require_enabled
def init_caller(self, caller, tenant):
auth = {'username': caller.email,
- 'password':
md5.new
(caller.password).hexdigest()[:6],
+ 'password':
hashlib.md5
(caller.password).hexdigest()[:6],
'tenant': tenant}
self.client = OpenStackClient(**auth)
self.driver = OpenStackDriver(client=self.client)
'tenant': tenant}
self.client = OpenStackClient(**auth)
self.driver = OpenStackDriver(client=self.client)
@@
-98,7
+98,7
@@
class OpenStackManager:
name = user.email[:user.email.find('@')]
user_fields = {'name': name,
'email': user.email,
name = user.email[:user.email.find('@')]
user_fields = {'name': name,
'email': user.email,
- 'password':
md5.new
(user.password).hexdigest()[:6],
+ 'password':
hashlib.md5
(user.password).hexdigest()[:6],
'enabled': True}
if not user.kuser_id:
keystone_user = self.driver.create_user(**user_fields)
'enabled': True}
if not user.kuser_id:
keystone_user = self.driver.create_user(**user_fields)