openstack/trove-dashboard
Code Issues Proposed changes

Merge "Uses network_id instead of net-id"

Browse Source
This commit is contained in:
Zuul 2022-11-11 05:45:11 +00:00 committed by Gerrit Code Review
commit 4c67c6db21
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trove_dashboard/api/trove.py
View File

@ -77,7 +77,7 @@ def cluster_create(request, name, volume, flavor, num_instances,
if volume > 0: if volume > 0:
instance["volume"] = {'size': volume} instance["volume"] = {'size': volume}
if nics: if nics:
instance["nics"] = [{"net-id": nics}] instance["nics"] = [{"network_id": nics}]
instances.append(instance) instances.append(instance)
# TODO(saurabhs): vertica needs root password on cluster create # 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: if new_instance.related_to:
instance["related_to"] = new_instance.related_to instance["related_to"] = new_instance.related_to
if new_instance.nics: if new_instance.nics:
instance["nics"] = [{'net-id': new_instance.nics}] instance["nics"] = [{'network_id': new_instance.nics}]
instances.append(instance) instances.append(instance)
return troveclient(request).clusters.grow(cluster_id, instances) return troveclient(request).clusters.grow(cluster_id, instances)

6
trove_dashboard/content/databases/tests.py
View File

@ -241,7 +241,7 @@ class DatabaseTests(test.TestCase):
self.mock_network_list_for_tenant.return_value = self.networks.list() 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 = 'mysql'
datastore_version = '5.5' datastore_version = '5.5'
@ -329,7 +329,7 @@ class DatabaseTests(test.TestCase):
self.mock_network_list_for_tenant.return_value = self.networks.list() 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 = 'mysql'
datastore_version = '5.5' datastore_version = '5.5'
@ -1056,7 +1056,7 @@ class DatabaseTests(test.TestCase):
self.mock_network_list_for_tenant.return_value = self.networks.list() 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.mock_availability_zone_list.return_value = (
self.availability_zones.list()) self.availability_zones.list())

5
trove_dashboard/content/databases/workflows/create_instance.py
View File

@ -626,9 +626,8 @@ class LaunchInstance(workflows.Workflow):
def _get_nics(self, context): def _get_nics(self, context):
netids = context.get('network_id', None) netids = context.get('network_id', None)
if netids: if netids:
return [{"net-id": netid} for netid in netids] return [{"network_id": netid} for netid in netids]
else: return None
return None
def _get_volume_type(self, context): def _get_volume_type(self, context):
volume_type = None volume_type = None