openstack
/
nova
Code Issues Proposed changes

Merge "Pass project_id when create networks by os-tenant-networks"

This commit is contained in:
Jenkins 2015-06-22 17:18:06 +00:00 committed by Gerrit Code Review
parent 2b25a1a2e9 c352bab310
commit e71f4f913d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/contrib/os_tenant_networks.py
View File

@ -184,6 +184,8 @@ class NetworkController(object):
msg = _("Quota exceeded, too many networks.")
raise exc.HTTPBadRequest(explanation=msg)
kwargs['project_id'] = context.project_id
try:
networks = self.network_api.create(context,
label=label, **kwargs)

2
nova/api/openstack/compute/plugins/v3/tenant_networks.py
View File

@ -170,6 +170,8 @@ class TenantNetworkController(wsgi.Controller):
msg = _("Quota exceeded, too many networks.")
raise exc.HTTPBadRequest(explanation=msg)
kwargs['project_id'] = context.project_id
try:
networks = self.network_api.create(context,
label=label, **kwargs)

10
nova/tests/unit/api/openstack/compute/contrib/test_tenant_networks.py
View File

@ -59,10 +59,6 @@ def fake_network_api_get_all(context):
return NETWORKS
def fake_network_api_create(context, **kwargs):
return NETWORKS
class TenantNetworksTestV21(test.NoDBTestCase):
ctrlr = networks_v21.TenantNetworkController
validation_error = exception.ValidationError
@ -78,6 +74,10 @@ class TenantNetworksTestV21(test.NoDBTestCase):
super(TenantNetworksTestV21, self).tearDown()
CONF.set_override("use_neutron_default_nets", self.original_value)
def _fake_network_api_create(self, context, **kwargs):
self.assertEqual(context.project_id, kwargs['project_id'])
return NETWORKS
@mock.patch('nova.quota.QUOTAS.reserve')
@mock.patch('nova.quota.QUOTAS.rollback')
@mock.patch('nova.network.api.API.disassociate')
@ -181,7 +181,7 @@ class TenantNetworksTestV21(test.NoDBTestCase):
ctxt = self.req.environ['nova.context']
reserve_mock.return_value = 'rv'
create_mock.side_effect = fake_network_api_create
create_mock.side_effect = self._fake_network_api_create
body = copy.deepcopy(NETWORKS[0])
del body['id']