diff --git a/magnumclient/tests/v1/test_baymodels.py b/magnumclient/tests/v1/test_baymodels.py index efa0273..d105c48 100644 --- a/magnumclient/tests/v1/test_baymodels.py +++ b/magnumclient/tests/v1/test_baymodels.py @@ -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) diff --git a/magnumclient/tests/v1/test_baymodels_shell.py b/magnumclient/tests/v1/test_baymodels_shell.py index a4224e9..2ed1ca3 100644 --- a/magnumclient/tests/v1/test_baymodels_shell.py +++ b/magnumclient/tests/v1/test_baymodels_shell.py @@ -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 ' diff --git a/magnumclient/v1/baymodels.py b/magnumclient/v1/baymodels.py index 9f5fb60..fd6e7b9 100644 --- a/magnumclient/v1/baymodels.py +++ b/magnumclient/v1/baymodels.py @@ -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'] diff --git a/magnumclient/v1/baymodels_shell.py b/magnumclient/v1/baymodels_shell.py index 823a9f5..4424674 100644 --- a/magnumclient/v1/baymodels_shell.py +++ b/magnumclient/v1/baymodels_shell.py @@ -49,6 +49,9 @@ def _show_baymodel(baymodel): metavar='', help='The private Neutron network name to connect to this bay' ' model.') +@utils.arg('--fixed-subnet', + metavar='', + help='The private Neutron subnet name to connect to bay.') @utils.arg('--network-driver', metavar='', 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