openstack/horizon
Code Issues Proposed changes

Merge "Incoming tenant id when creating a subnet on create network form"

Browse Source
This commit is contained in:
Zuul 2019-04-18 01:22:39 +00:00 committed by Gerrit Code Review
commit c99cabf19f
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/admin/networks/tests.py
View File

@ -588,7 +588,8 @@ class NetworkTests(test.BaseAdminViewTests):
'provider:network_type': 'local'} 'provider:network_type': 'local'}
self.mock_network_create.assert_called_once_with(test.IsHttpRequest(), self.mock_network_create.assert_called_once_with(test.IsHttpRequest(),
**params) **params)
subnet_params = {'name': subnet.name, subnet_params = {'tenant_id': tenant_id,
'name': subnet.name,
'network_id': subnet.network_id, 'network_id': subnet.network_id,
'cidr': subnet.cidr, 'cidr': subnet.cidr,
'enable_dhcp': subnet.enable_dhcp, 'enable_dhcp': subnet.enable_dhcp,

4
openstack_dashboard/dashboards/project/networks/tests.py
View File

@ -493,6 +493,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
'admin_state_up': network.admin_state_up, 'admin_state_up': network.admin_state_up,
'shared': False} 'shared': False}
subnet_params = {'network_id': network.id, subnet_params = {'network_id': network.id,
'tenant_id': network.tenant_id,
'name': subnet.name, 'name': subnet.name,
'cidr': subnet.cidr, 'cidr': subnet.cidr,
'ip_version': subnet.ip_version, 'ip_version': subnet.ip_version,
@ -629,6 +630,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
self.mock_subnet_create.assert_called_once_with( self.mock_subnet_create.assert_called_once_with(
test.IsHttpRequest(), test.IsHttpRequest(),
network_id=network.id, network_id=network.id,
tenant_id=network.tenant_id,
name=subnet.name, name=subnet.name,
cidr=subnet.cidr, cidr=subnet.cidr,
ip_version=subnet.ip_version, ip_version=subnet.ip_version,
@ -801,6 +803,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
'admin_state_up': network.admin_state_up, 'admin_state_up': network.admin_state_up,
'shared': False} 'shared': False}
subnet_params = {'network_id': network.id, subnet_params = {'network_id': network.id,
'tenant_id': network.tenant_id,
'name': subnet.name, 'name': subnet.name,
'cidr': cidr, 'cidr': cidr,
'ip_version': subnet.ip_version, 'ip_version': subnet.ip_version,
@ -930,6 +933,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
'shared': False, 'shared': False,
'with_subnet': True} 'with_subnet': True}
subnet_params = {'network_id': network.id, subnet_params = {'network_id': network.id,
'tenant_id': network.tenant_id,
'name': subnet.name, 'name': subnet.name,
'cidr': subnet.cidr, 'cidr': subnet.cidr,
'ip_version': subnet.ip_version, 'ip_version': subnet.ip_version,

3
openstack_dashboard/dashboards/project/networks/workflows.py
View File

@ -600,7 +600,8 @@ class CreateNetwork(workflows.Workflow):
# If we do not need to create a subnet, return here. # If we do not need to create a subnet, return here.
if not data['with_subnet']: if not data['with_subnet']:
return True return True
subnet = self._create_subnet(request, data, network, no_redirect=True) subnet = self._create_subnet(request, data, network, no_redirect=True,
tenant_id=network.tenant_id)
if subnet: if subnet:
return True return True
else: else: