openstack/magnum
Code Issues Proposed changes

Merge "Add default for node_count and bay_create_timeout"

Browse Source
This commit is contained in:
Jenkins 2015-08-31 22:37:45 +00:00 committed by Gerrit Code Review
commit 1bf60bc94f
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
magnum/api/controllers/v1/bay.py
View File

@ -80,13 +80,13 @@ class Bay(base.APIBase):
_set_baymodel_id, mandatory=True)
"""The bay model UUID or id"""
node_count = wtypes.IntegerType(minimum=1)
"""The node count for this bay"""
node_count = wsme.wsattr(wtypes.IntegerType(minimum=1), default=1)
"""The node count for this bay. Set to 1 for no node_count"""
master_count = wsme.wsattr(wtypes.IntegerType(minimum=1), default=1)
"""The number of master nodes for this bay"""
"""The number of master nodes for this bay. Set to 1 for no master_count"""
bay_create_timeout = wtypes.IntegerType(minimum=0)
bay_create_timeout = wsme.wsattr(wtypes.IntegerType(minimum=0), default=0)
"""Timeout for creating the bay in minutes. Set to 0 for no timeout."""
links = wsme.wsattr([link.Link], readonly=True)
@ -276,8 +276,6 @@ class BaysController(rest.RestController):
bay_dict['node_count'] = 1
new_bay = objects.Bay(context, **bay_dict)
if isinstance(bay.bay_create_timeout, wsme.types.UnsetType):
bay.bay_create_timeout = 0
res_bay = pecan.request.rpcapi.bay_create(new_bay,
bay.bay_create_timeout)

7
magnum/tests/unit/api/controllers/v1/test_bay.py
View File

@ -17,7 +17,6 @@ from oslo_config import cfg
from oslo_policy import policy
from oslo_utils import timeutils
from six.moves.urllib import parse as urlparse
from wsme import types as wtypes
from magnum.api.controllers.v1 import bay as api_bay
from magnum.common import utils
@ -34,8 +33,12 @@ class TestBayObject(base.TestCase):
def test_bay_init(self):
bay_dict = apiutils.bay_post_data(baymodel_id=None)
del bay_dict['node_count']
del bay_dict['master_count']
del bay_dict['bay_create_timeout']
bay = api_bay.Bay(**bay_dict)
self.assertEqual(wtypes.Unset, bay.node_count)
self.assertEqual(bay.node_count, 1)
self.assertEqual(bay.master_count, 1)
self.assertEqual(bay.bay_create_timeout, 0)
class TestListBay(api_base.FunctionalTest):