diff options
| author | Hirotaka Wakabayashi <hiwkby@yahoo.com> | 2022-04-07 02:05:18 +0900 |
|---|---|---|
| committer | Hirotaka Wakabayashi <hiwkby@yahoo.com> | 2022-04-09 18:08:31 +0000 |
| commit | 9e518a5513927bd96ea8e8d6c6395282ea626848 (patch) | |
| tree | 21de91dbccd6dd87c1756e430543d60362a5417e /trove | |
| parent | 92471bd4f39a0805bd1cbd732fa12d530e607c8f (diff) | |
| download | trove-9e518a5513927bd96ea8e8d6c6395282ea626848.tar.gz | |
Validates "network_id" param creating a cluster
This PR changes Clusters API validator to validate a request parameter
"network_id" instead of "net-id". When creating a cluster, Clusters
API internally calls Instaces API to create a instance. Instances API
has replaced the request parameter "net-id" with "network_id" by this
commit[1].
The original problem is instance creation error when creating a
instance that belongs to a cluster. Troves's Instances API has
changed a parameter name from "net-id" to "network_id", but Clusters
API and python-troveclient still uses the "net-id" parameter name.
We need to fix it.
[1]: https://opendev.org/openstack/trove/commit/535417240709694080255c064c9d84a5ab1d5372
Task: 44967
Story: 2009958
Change-Id: I7ee128afad80b92bdeabb45f719d19a99badd8a7
Diffstat (limited to 'trove')
| -rw-r--r-- | trove/cluster/models.py | 2 | ||||
| -rw-r--r-- | trove/tests/unittests/cluster/test_models.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/trove/cluster/models.py b/trove/cluster/models.py index 7c95b3fe..e248d528 100644 --- a/trove/cluster/models.py +++ b/trove/cluster/models.py @@ -661,7 +661,7 @@ def validate_instance_nics(context, instances): for instance in instances: nics = instance.get('nics') if nics: - instance_nics.append(nics[0].get('net-id')) + instance_nics.append(nics[0].get('network_id')) if len(set(instance_nics)) > 1: raise exception.ClusterNetworksNotEqual() if not instance_nics: diff --git a/trove/tests/unittests/cluster/test_models.py b/trove/tests/unittests/cluster/test_models.py index 13040b6a..bf9fca03 100644 --- a/trove/tests/unittests/cluster/test_models.py +++ b/trove/tests/unittests/cluster/test_models.py @@ -178,11 +178,11 @@ class TestModels(trove_testtools.TestCase): test_instances = [ {'volume_size': 1, 'flavor_id': '1234', - 'nics': [{"net-id": "surprise"}]}, + 'nics': [{"network_id": "surprise"}]}, {'volume_size': 1, 'flavor_id': '1234', - 'nics': [{"net-id": "foo-bar"}]}, + 'nics': [{"network_id": "foo-bar"}]}, {'volume_size': 1, 'flavor_id': '1234', - 'nics': [{"net-id": "foo-bar"}]}] + 'nics': [{"network_id": "foo-bar"}]}] self.assertRaises(exception.ClusterNetworksNotEqual, models.validate_instance_nics, @@ -191,11 +191,11 @@ class TestModels(trove_testtools.TestCase): test_instances = [ {'volume_size': 1, 'flavor_id': '1234', - 'nics': [{"net-id": "foo-bar"}]}, + 'nics': [{"network_id": "foo-bar"}]}, {'volume_size': 1, 'flavor_id': '1234', - 'nics': [{"net-id": "foo-bar"}]}, + 'nics': [{"network_id": "foo-bar"}]}, {'volume_size': 1, 'flavor_id': '1234', - 'nics': [{"net-id": "foo-bar"}]}] + 'nics': [{"network_id": "foo-bar"}]}] create_neutron_cli_mock.return_value.find_resource = Mock( side_effect=neutron_exceptions.NotFound( |