openstack/trove-dashboard
Code Issues Proposed changes

Remove unsupported network param for creating instance

Browse Source 
Change-Id: I27593b7fd7f05efd8852799f214ce0ae14be78c4
This commit is contained in:
Lingxian Kong
2020-05-24 00:22:02 +12:00
parent 7ef7fe1ec5
commit cccbd65bc2
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,7 +233,7 @@ class DatabaseTests(test.TestCase):
self.mock_network_list.side_effect = [self.networks.list()[:1], self.mock_network_list.side_effect = [self.networks.list()[:1],
self.networks.list()[1:]] self.networks.list()[1:]]
nics = [{"net-id": self.networks.first().id, "v4-fixed-ip": ''}] nics = [{"net-id": self.networks.first().id}]
datastore = 'mysql' datastore = 'mysql'
datastore_version = '5.5' datastore_version = '5.5'
@@ -323,7 +323,7 @@ class DatabaseTests(test.TestCase):
self.mock_network_list.side_effect = [self.networks.list()[:1], self.mock_network_list.side_effect = [self.networks.list()[:1],
self.networks.list()[1:]] self.networks.list()[1:]]
nics = [{"net-id": self.networks.first().id, "v4-fixed-ip": ''}] nics = [{"net-id": self.networks.first().id}]
datastore = 'mysql' datastore = 'mysql'
datastore_version = '5.5' datastore_version = '5.5'
@@ -1052,7 +1052,7 @@ class DatabaseTests(test.TestCase):
self.mock_network_list.side_effect = [self.networks.list()[:1], self.mock_network_list.side_effect = [self.networks.list()[:1],
self.networks.list()[1:]] self.networks.list()[1:]]
nics = [{"net-id": self.networks.first().id, "v4-fixed-ip": ''}] nics = [{"net-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())

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

@@ -561,8 +561,7 @@ 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, "v4-fixed-ip": ""} return [{"net-id": netid} for netid in netids]
for netid in netids]
else: else:
return None return None