openstack/neutron
Code Issues Proposed changes

Merge "Allow non-admins to define "external" extra-routes"

Browse Source
This commit is contained in:
Jenkins 2016-02-29 16:45:41 +00:00 committed by Gerrit Code Review
commit 64dc46b1ab
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/extraroute_db.py
View File

@ -104,7 +104,7 @@ class ExtraRoute_dbonly_mixin(l3_db.L3_NAT_dbonly_mixin):
quota=cfg.CONF.max_routes)
filters = {'device_id': [router_id]}
ports = self._core_plugin.get_ports(context, filters)
ports = self._core_plugin.get_ports(context.elevated(), filters)
cidrs = []
ips = []
for port in ports:

10
neutron/tests/unit/extensions/test_extraroute.py
View File

@ -81,6 +81,16 @@ class ExtraRouteDBTestCaseBase(object):
self._routes_update_cleanup(p['port']['id'],
None, r['router']['id'], [])
def test_route_update_with_external_route(self):
routes = [{'destination': '135.207.0.0/16', 'nexthop': '10.0.1.3'}]
with self.subnet(cidr='10.0.1.0/24') as ext_subnet:
self._set_net_external(ext_subnet['subnet']['network_id'])
ext_info = {'network_id': ext_subnet['subnet']['network_id']}
with self.router(external_gateway_info=ext_info) as r:
body = self._routes_update_prepare(
r['router']['id'], None, None, routes, skip_add=True)
self.assertEqual(routes, body['router']['routes'])
def test_route_clear_routes_with_None(self):
routes = [{'destination': '135.207.0.0/16',
'nexthop': '10.0.1.3'},

3
releasenotes/notes/allow-non-admins-to-define-external-extra-routes-0d541fc356a5c546.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Allow non-admin users to define "external" extra-routes.