diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-01 02:05:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-01 02:05:26 +0000 |
| commit | 3ce994a63e75118a38a99b5b6e4ec4bb6a7da98c (patch) | |
| tree | afebcfaf21ba3b92f4ae0339eac79fdc8c8ea97d | |
| parent | dcc9abe3d17af726b99db5a3ae100bd7f64b878a (diff) | |
| parent | 571b5cd3d0dca981355cb522f8a85c56f95adff1 (diff) | |
| download | python-saharaclient-3ce994a63e75118a38a99b5b6e4ec4bb6a7da98c.tar.gz | |
Merge "Fixing cluster creation with neutron network via CLI"0.13.0
| -rw-r--r-- | saharaclient/osc/v1/clusters.py | 4 | ||||
| -rw-r--r-- | saharaclient/tests/unit/osc/v1/test_clusters.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/saharaclient/osc/v1/clusters.py b/saharaclient/osc/v1/clusters.py index d61135b..0f1d8f1 100644 --- a/saharaclient/osc/v1/clusters.py +++ b/saharaclient/osc/v1/clusters.py @@ -176,8 +176,8 @@ class CreateCluster(show.ShowOne): image_id = utils.get_resource_id(client.images, parsed_args.image) - net_id = (network_client.api.find_attr( - 'networks', parsed_args.neutron_network)['id'] if + net_id = (network_client.find_network( + parsed_args.neutron_network, ignore_missing=False).id if parsed_args.neutron_network else None) data = client.clusters.create( diff --git a/saharaclient/tests/unit/osc/v1/test_clusters.py b/saharaclient/tests/unit/osc/v1/test_clusters.py index 1bc0dd3..46027d8 100644 --- a/saharaclient/tests/unit/osc/v1/test_clusters.py +++ b/saharaclient/tests/unit/osc/v1/test_clusters.py @@ -106,8 +106,8 @@ class TestCreateCluster(TestClusters): None, CT_INFO) self.img_mock.find_unique.return_value = api_img.Image( None, {'id': 'img_id'}) - self.net_mock = self.app.client_manager.network.api - self.net_mock.find_attr.return_value = {'id': 'net_id'} + self.net_mock = self.app.client_manager.network + self.net_mock.find_network.return_value = mock.Mock(id='net_id') self.net_mock.reset_mock() # Command to test |