openstack/python-keystoneclient
Code Issues Proposed changes

Merge "update v3 domains - remove public/private namespace"

Browse Source
This commit is contained in:
Jenkins
2013-03-15 04:49:06 +00:00
committed by Gerrit Code Review
parent 3add1ff82f fb9cf68b39
commit bb716f1c4a
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
keystoneclient/v3/domains.py
View File

@@ -33,14 +33,11 @@ class DomainManager(base.CrudManager):
collection_key = 'domains' collection_key = 'domains'
key = 'domain' 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( return super(DomainManager, self).create(
name=name, name=name,
description=description, description=description,
enabled=enabled, enabled=enabled)
private_project_names=private_project_names,
private_user_names=private_user_names)
def get(self, domain): def get(self, domain):
return super(DomainManager, self).get( return super(DomainManager, self).get(
@@ -49,15 +46,12 @@ class DomainManager(base.CrudManager):
def list(self): def list(self):
return super(DomainManager, self).list() return super(DomainManager, self).list()
def update(self, domain, name=None, description=None, enabled=True, def update(self, domain, name=None, description=None, enabled=True):
private_project_names=False, private_user_names=False):
return super(DomainManager, self).update( return super(DomainManager, self).update(
domain_id=base.getid(domain), domain_id=base.getid(domain),
name=name, name=name,
description=description, description=description,
enabled=enabled, enabled=enabled)
private_project_names=private_project_names,
private_user_names=private_user_names)
def delete(self, domain): def delete(self, domain):
return super(DomainManager, self).delete( return super(DomainManager, self).delete(

2
tests/v3/test_domains.py
View File

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