openstack
/
python-magnumclient
Code Issues Proposed changes

Merge "Add fixed_subnet attributes to baymodel"

This commit is contained in:
Jenkins 2016-07-09 22:22:34 +00:00 committed by Gerrit Code Review
parent f0c2a168c6 19c0dc5fd9
commit d24e1460b8
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnumclient/tests/v1/test_baymodels.py
View File

@ -30,6 +30,7 @@ BAYMODEL1 = {'id': 123,
'keypair_id': 'keypair1',
'external_network_id': 'd1f02cfb-d27f-4068-9332-84d907cb0e21',
'fixed_network': 'private',
'fixed_subnet': 'private-subnet',
'network_driver': 'libnetwork',
'volume_driver': 'rexray',
'dns_nameserver': '8.8.1.1',
@ -248,6 +249,7 @@ class BayModelManagerTest(testtools.TestCase):
self.assertEqual(BAYMODEL1['docker_storage_driver'],
baymodel.docker_storage_driver)
self.assertEqual(BAYMODEL1['fixed_network'], baymodel.fixed_network)
self.assertEqual(BAYMODEL1['fixed_subnet'], baymodel.fixed_subnet)
self.assertEqual(BAYMODEL1['coe'], baymodel.coe)
self.assertEqual(BAYMODEL1['http_proxy'], baymodel.http_proxy)
self.assertEqual(BAYMODEL1['https_proxy'], baymodel.https_proxy)
@ -275,6 +277,7 @@ class BayModelManagerTest(testtools.TestCase):
self.assertEqual(BAYMODEL1['docker_storage_driver'],
baymodel.docker_storage_driver)
self.assertEqual(BAYMODEL1['fixed_network'], baymodel.fixed_network)
self.assertEqual(BAYMODEL1['fixed_subnet'], baymodel.fixed_subnet)
self.assertEqual(BAYMODEL1['coe'], baymodel.coe)
self.assertEqual(BAYMODEL1['http_proxy'], baymodel.http_proxy)
self.assertEqual(BAYMODEL1['https_proxy'], baymodel.https_proxy)

3
magnumclient/tests/v1/test_baymodels_shell.py
View File

@ -46,7 +46,8 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
'--coe swarm '
'--dns-nameserver test_dns '
'--flavor-id test_flavor '
'--fixed-network public '
'--fixed-network private '
'--fixed-network private-subnet '
'--volume-driver test_volume '
'--network-driver test_driver '
'--labels key=val '

6
magnumclient/v1/baymodels.py
View File

@ -17,9 +17,9 @@ from magnumclient import exceptions
CREATION_ATTRIBUTES = ['name', 'image_id', 'flavor_id', 'master_flavor_id',
'keypair_id', 'external_network_id', 'fixed_network',
'dns_nameserver', 'docker_volume_size', 'labels',
'coe', 'http_proxy', 'https_proxy', 'no_proxy',
'network_driver', 'tls_disabled', 'public',
'fixed_subnet', 'dns_nameserver', 'docker_volume_size',
'labels', 'coe', 'http_proxy', 'https_proxy',
'no_proxy', 'network_driver', 'tls_disabled', 'public',
'registry_enabled', 'volume_driver', 'server_type',
'docker_storage_driver', 'master_lb_enabled']

4
magnumclient/v1/baymodels_shell.py
View File

@ -49,6 +49,9 @@ def _show_baymodel(baymodel):
metavar='<fixed-network>',
help='The private Neutron network name to connect to this bay'
' model.')
@utils.arg('--fixed-subnet',
metavar='<fixed-subnet>',
help='The private Neutron subnet name to connect to bay.')
@utils.arg('--network-driver',
metavar='<network-driver>',
help='The network driver name for instantiating container'
@ -122,6 +125,7 @@ def do_baymodel_create(cs, args):
opts['keypair_id'] = args.keypair_id
opts['external_network_id'] = args.external_network_id
opts['fixed_network'] = args.fixed_network
opts['fixed_subnet'] = args.fixed_subnet
opts['network_driver'] = args.network_driver
opts['volume_driver'] = args.volume_driver
opts['dns_nameserver'] = args.dns_nameserver