openstack/python-magnumclient
Code Issues Proposed changes

Merge "Rename swarm-token to discovery-url"

Browse Source
This commit is contained in:
Jenkins
2015-04-19 00:14:19 +00:00
committed by Gerrit Code Review
parent 700ffe8f6b 9eb9e5ecf1
commit 25af8c3028
4 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
magnumclient/tests/v1/test_bays.py
View File

@@ -48,14 +48,6 @@ del CREATE_BAY['stack_id']
del CREATE_BAY['api_address']
del CREATE_BAY['node_addresses']
CREATE_BAY_SWARM = copy.deepcopy(BAY1)
del CREATE_BAY_SWARM['id']
del CREATE_BAY_SWARM['uuid']
del CREATE_BAY_SWARM['stack_id']
del CREATE_BAY_SWARM['api_address']
del CREATE_BAY_SWARM['node_addresses']
CREATE_BAY_SWARM['swarm_token'] = 'c3d64efc6ccf3fdaa9915e5bf99059b5'
UPDATED_BAY = copy.deepcopy(BAY1)
NEW_NAME = 'newbay'
UPDATED_BAY['name'] = NEW_NAME
@@ -146,10 +138,13 @@ class BayManagerTest(testtools.TestCase):
self.assertEqual(expect, self.api.calls)
self.assertTrue(bay)
def test_bay_create_swarm(self):
bay = self.mgr.create(**CREATE_BAY_SWARM)
def test_bay_create_with_discovery_url(self):
bay_with_discovery = dict()
bay_with_discovery.update(CREATE_BAY)
bay_with_discovery['discovery_url'] = 'discovery_url'
bay = self.mgr.create(**bay_with_discovery)
expect = [
('POST', '/v1/bays', {}, CREATE_BAY_SWARM),
('POST', '/v1/bays', {}, bay_with_discovery),
]
self.assertEqual(expect, self.api.calls)
self.assertTrue(bay)

12
magnumclient/tests/v1/test_shell.py
View File

@@ -47,7 +47,7 @@ class ShellTest(base.TestCase):
args = mock.MagicMock()
node_count = 1
args.node_count = node_count
args.swarm_token = None
args.discovery_url = None
name = "test_bay"
args.name = name
baymodel_id_or_name = "test_baymodel_id"
@@ -56,9 +56,9 @@ class ShellTest(base.TestCase):
shell.do_bay_create(client_mock, args)
client_mock.bays.create.assert_called_once_with(
name=name, node_count=node_count, baymodel_id=baymodel.uuid,
swarm_token=None)
discovery_url=None)
def test_do_bay_create_swarm_token(self):
def test_do_bay_create_with_discovery_url(self):
client_mock = mock.MagicMock()
baymodel = mock.MagicMock()
baymodel.uuid = 'uuid'
@@ -67,8 +67,8 @@ class ShellTest(base.TestCase):
args = mock.MagicMock()
node_count = 1
args.node_count = node_count
swarm_token = 'c3d64efc6ccf3fdaa9915e5bf99059b5'
args.swarm_token = swarm_token
discovery_url = 'discovery_url'
args.discovery_url = discovery_url
name = "test_bay"
args.name = name
baymodel_id_or_name = "test_baymodel_id"
@@ -77,7 +77,7 @@ class ShellTest(base.TestCase):
shell.do_bay_create(client_mock, args)
client_mock.bays.create.assert_called_once_with(
name=name, node_count=node_count, baymodel_id=baymodel.uuid,
swarm_token=swarm_token)
discovery_url=discovery_url)
def test_do_bay_delete(self):
client_mock = mock.MagicMock()

2
magnumclient/v1/bays.py
View File

@@ -17,7 +17,7 @@ from magnumclient.common import utils
from magnumclient import exceptions
CREATION_ATTRIBUTES = ['name', 'baymodel_id', 'node_count', 'swarm_token']
CREATION_ATTRIBUTES = ['name', 'baymodel_id', 'node_count', 'discovery_url']
class Bay(base.Resource):

8
magnumclient/v1/shell.py
View File

@@ -74,9 +74,9 @@ def do_bay_list(cs, args):
@utils.arg('--node-count',
metavar='<node_count>',
help='The bay node count.')
@utils.arg('--swarm-token',
metavar='<swarm_token>',
help='Specify the swarm token to use.')
@utils.arg('--discovery-url',
metavar='<discovery_url>',
help='Specifies custom discovery url for node discovery.')
def do_bay_create(cs, args):
"""Create a bay."""
baymodel = cs.baymodels.get(args.baymodel)
@@ -85,7 +85,7 @@ def do_bay_create(cs, args):
opts['name'] = args.name
opts['baymodel_id'] = baymodel.uuid
opts['node_count'] = args.node_count
opts['swarm_token'] = args.swarm_token
opts['discovery_url'] = args.discovery_url
bay = cs.bays.create(**opts)
_show_baymodel(bay)