diff --git a/trove_dashboard/api/trove.py b/trove_dashboard/api/trove.py index 1fb7174..f877129 100644 --- a/trove_dashboard/api/trove.py +++ b/trove_dashboard/api/trove.py @@ -77,7 +77,7 @@ def cluster_create(request, name, volume, flavor, num_instances, if volume > 0: instance["volume"] = {'size': volume} if nics: - instance["nics"] = [{"net-id": nics}] + instance["nics"] = [{"network_id": nics}] instances.append(instance) # TODO(saurabhs): vertica needs root password on cluster create @@ -103,7 +103,7 @@ def cluster_grow(request, cluster_id, new_instances): if new_instance.related_to: instance["related_to"] = new_instance.related_to if new_instance.nics: - instance["nics"] = [{'net-id': new_instance.nics}] + instance["nics"] = [{'network_id': new_instance.nics}] instances.append(instance) return troveclient(request).clusters.grow(cluster_id, instances) diff --git a/trove_dashboard/content/databases/tests.py b/trove_dashboard/content/databases/tests.py index 21289a3..7cbeb03 100644 --- a/trove_dashboard/content/databases/tests.py +++ b/trove_dashboard/content/databases/tests.py @@ -241,7 +241,7 @@ class DatabaseTests(test.TestCase): self.mock_network_list_for_tenant.return_value = self.networks.list() - nics = [{"net-id": self.networks.first().id}] + nics = [{"network_id": self.networks.first().id}] datastore = 'mysql' datastore_version = '5.5' @@ -329,7 +329,7 @@ class DatabaseTests(test.TestCase): self.mock_network_list_for_tenant.return_value = self.networks.list() - nics = [{"net-id": self.networks.first().id}] + nics = [{"network_id": self.networks.first().id}] datastore = 'mysql' datastore_version = '5.5' @@ -1056,7 +1056,7 @@ class DatabaseTests(test.TestCase): self.mock_network_list_for_tenant.return_value = self.networks.list() - nics = [{"net-id": self.networks.first().id}] + nics = [{"network_id": self.networks.first().id}] self.mock_availability_zone_list.return_value = ( self.availability_zones.list()) diff --git a/trove_dashboard/content/databases/workflows/create_instance.py b/trove_dashboard/content/databases/workflows/create_instance.py index 86b0e20..2de0d19 100644 --- a/trove_dashboard/content/databases/workflows/create_instance.py +++ b/trove_dashboard/content/databases/workflows/create_instance.py @@ -626,9 +626,8 @@ class LaunchInstance(workflows.Workflow): def _get_nics(self, context): netids = context.get('network_id', None) if netids: - return [{"net-id": netid} for netid in netids] - else: - return None + return [{"network_id": netid} for netid in netids] + return None def _get_volume_type(self, context): volume_type = None