fix enabled parameter of update doesn't default to None

Currently, enabled parameter of v3.domains.update and v3.regions.update
defaults to True. It is easy to make mistakes and difficult to use.

Closes-Bug: #1413071
Change-Id: I8b392ff228691b2735b06747dcfb802d4c191a54
This commit is contained in:
wanghong
2014-12-30 17:14:48 +08:00
parent eaab62aca5
commit acfbff0258
4 changed files with 13 additions and 3 deletions

View File

@@ -41,3 +41,8 @@ class DomainTests(utils.TestCase, utils.CrudTests):
expected_query = {'enabled': '0'}
super(DomainTests, self).test_list(expected_query=expected_query,
enabled=False)
def test_update_enabled_defaults_to_none(self):
req_ref = self.new_ref()
del req_ref['enabled']
super(DomainTests, self).test_update(req_ref=req_ref)

View File

@@ -31,3 +31,8 @@ class RegionTests(utils.TestCase, utils.CrudTests):
kwargs.setdefault('enabled', True)
kwargs.setdefault('id', uuid.uuid4().hex)
return kwargs
def test_update_enabled_defaults_to_none(self):
req_ref = self.new_ref()
del req_ref['enabled']
super(RegionTests, self).test_update(req_ref=req_ref)

View File

@@ -60,7 +60,7 @@ class DomainManager(base.CrudManager):
@utils.positional(enforcement=utils.positional.WARN)
def update(self, domain, name=None,
description=None, enabled=True, **kwargs):
description=None, enabled=None, **kwargs):
return super(DomainManager, self).update(
domain_id=base.getid(domain),
name=name,

View File

@@ -65,7 +65,7 @@ class RegionManager(base.CrudManager):
return super(RegionManager, self).list(
**kwargs)
def update(self, region, description=None, enabled=True,
def update(self, region, description=None, enabled=None,
parent_region=None, **kwargs):
"""Update a Catalog region.
@@ -75,7 +75,7 @@ class RegionManager(base.CrudManager):
pre-existing region in the backend. Allows for hierarchical
region organization.
:param enabled: determines whether the endpoint appears in the
catalog. Defaults to True
catalog.
"""
return super(RegionManager, self).update(