diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-18 12:54:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-18 12:54:33 +0000 |
| commit | a2cab97cc951adbafe10c26a8ebe4f7c8dfd68df (patch) | |
| tree | 0a5dc8a139a3c456a9a3ff482e9e40b24c0e9bb1 | |
| parent | 4d8e55c5fe0cddaa62008c105d37c5349323f366 (diff) | |
| parent | 9e518a5513927bd96ea8e8d6c6395282ea626848 (diff) | |
| download | trove-a2cab97cc951adbafe10c26a8ebe4f7c8dfd68df.tar.gz | |
Merge "Validates "network_id" param creating a cluster"
| -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( |