fix discrepancies seen in domain and credential, v3 - bug 1109349

domains.py
added list method
added args private_project_names and private_user_names to create and update
credentials.py
added list method

Change-Id: I0d231e909742bb56b79c91d3d0f7dac3bd3ec552
This commit is contained in:
Steve Martinelli
2013-01-29 16:08:28 -06:00
parent 3573672596
commit 92bf8a7af9
3 changed files with 18 additions and 4 deletions

View File

@@ -44,6 +44,9 @@ class CredentialManager(base.CrudManager):
return super(CredentialManager, self).get(
credential_id=base.getid(credential))
def list(self):
return super(CredentialManager, self).list()
def update(self, credential, user, type=None, data=None, project=None):
return super(CredentialManager, self).update(
credential_id=base.getid(credential),

View File

@@ -33,22 +33,31 @@ class DomainManager(base.CrudManager):
collection_key = 'domains'
key = 'domain'
def create(self, name, description=None, enabled=True):
def create(self, name, description=None, enabled=True,
private_project_names=False, private_user_names=False):
return super(DomainManager, self).create(
name=name,
description=description,
enabled=enabled)
enabled=enabled,
private_project_names=private_project_names,
private_user_names=private_user_names)
def get(self, domain):
return super(DomainManager, self).get(
domain_id=base.getid(domain))
def update(self, domain, name=None, description=None, enabled=None):
def list(self):
return super(DomainManager, self).list()
def update(self, domain, name=None, description=None, enabled=True,
private_project_names=False, private_user_names=False):
return super(DomainManager, self).update(
domain_id=base.getid(domain),
name=name,
description=description,
enabled=enabled)
enabled=enabled,
private_project_names=private_project_names,
private_user_names=private_user_names)
def delete(self, domain):
return super(DomainManager, self).delete(

View File

@@ -17,4 +17,6 @@ class DomainTests(utils.TestCase, utils.CrudTests):
kwargs = super(DomainTests, self).new_ref(**kwargs)
kwargs.setdefault('enabled', True)
kwargs.setdefault('name', uuid.uuid4().hex)
kwargs.setdefault('private_project_names', False)
kwargs.setdefault('private_user_names', False)
return kwargs