x/python-ganttclient
Code Issues Proposed changes

users.py cleanup for exception handling and typo

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-06-27 23:20:38 -07:00
parent 975ed888ab
commit 0d3eff0c9a
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nova/auth/users.py
View File

@@ -502,7 +502,9 @@ class LDAPWrapper(object):
def connect(self): def connect(self):
""" connect to ldap as admin user """ """ connect to ldap as admin user """
global ldap
if FLAGS.fake_users: if FLAGS.fake_users:
import fakeldap as ldap
self.conn = fakeldap.initialize(FLAGS.ldap_url) self.conn = fakeldap.initialize(FLAGS.ldap_url)
else: else:
assert(ldap.__name__ != 'fakeldap') assert(ldap.__name__ != 'fakeldap')
@@ -518,7 +520,7 @@ class LDAPWrapper(object):
def find_dns(self, dn, query=None): def find_dns(self, dn, query=None):
try: try:
res = self.conn.search_s(dn, ldap.SCOPE_SUBTREE, query) res = self.conn.search_s(dn, ldap.SCOPE_SUBTREE, query)
except Exception: except ldap.NO_SUCH_OBJECT:
return [] return []
# just return the DNs # just return the DNs
return [dn for dn, attributes in res] return [dn for dn, attributes in res]
@@ -526,7 +528,7 @@ class LDAPWrapper(object):
def find_objects(self, dn, query = None): def find_objects(self, dn, query = None):
try: try:
res = self.conn.search_s(dn, ldap.SCOPE_SUBTREE, query) res = self.conn.search_s(dn, ldap.SCOPE_SUBTREE, query)
except Exception: except ldap.NO_SUCH_OBJECT:
return [] return []
# just return the attributes # just return the attributes
return [attributes for dn, attributes in res] return [attributes for dn, attributes in res]
@@ -544,7 +546,7 @@ class LDAPWrapper(object):
return [self.__to_project(attr) for attr in attrs] return [self.__to_project(attr) for attr in attrs]
def find_roles(self, tree): def find_roles(self, tree):
attrs = self.find_objects(tree, '(&(objectclass=groupOfNames)(!(objectclass=NovaProject)))') attrs = self.find_objects(tree, '(&(objectclass=groupOfNames)(!(objectclass=novaProject)))')
return [self.__to_group(attr) for attr in attrs] return [self.__to_group(attr) for attr in attrs]
def find_group_dns_with_member(self, tree, uid): def find_group_dns_with_member(self, tree, uid):
@@ -693,11 +695,7 @@ class LDAPWrapper(object):
def remove_role(self, uid, role, project_id=None): def remove_role(self, uid, role, project_id=None):
role_dn = self.__role_to_dn(role, project_id) role_dn = self.__role_to_dn(role, project_id)
try: return self.remove_from_group(uid, role_dn)
return self.remove_from_group(uid, role_dn)
except Exception, ex:
print type(ex), ex
def is_in_group(self, uid, group_dn): def is_in_group(self, uid, group_dn):
if not self.user_exists(uid): if not self.user_exists(uid):
@@ -794,9 +792,8 @@ class LDAPWrapper(object):
def delete_roles(self, project_dn): def delete_roles(self, project_dn):
roles = self.find_roles(project_dn) roles = self.find_roles(project_dn)
if roles != None: for role in roles:
for role in roles: self.delete_group('cn=%s,%s' % (role.id, project_dn))
self.delete_group('cn=%s,%s' % (role.id, project_dn))
def delete_project(self, name): def delete_project(self, name):
project_dn = 'cn=%s,%s' % (name, FLAGS.project_ldap_subtree) project_dn = 'cn=%s,%s' % (name, FLAGS.project_ldap_subtree)