x/vmware-nsx
Code Issues Proposed changes

Put gw_port into router dict result.

Browse Source 
Bug #1069782

We put gw_port into router dict result so that client can get more
information for the result router.

Change-Id: I54cec8a71441a9370c7ba95767a92190bf1c9c21
This commit is contained in:
gongysh 2012-10-31 22:01:35 +08:00
parent 1b19ea7ed3
commit 579a692448
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quantum/db/l3_db.py
View File

@ -129,7 +129,8 @@ class L3_NAT_db_mixin(l3.RouterPluginBase):
'external_gateway_info': None} 'external_gateway_info': None}
if router['gw_port_id']: if router['gw_port_id']:
nw_id = router.gw_port['network_id'] nw_id = router.gw_port['network_id']
res['external_gateway_info'] = {'network_id': nw_id} res['external_gateway_info'] = {'network_id': nw_id,
'gw_port': router.gw_port}
return self._fields(res, fields) return self._fields(res, fields)
def create_router(self, context, router): def create_router(self, context, router):

3
quantum/tests/unit/test_l3_plugin.py
View File

@ -622,7 +622,10 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase):
s['subnet']['network_id']) s['subnet']['network_id'])
body = self._show('routers', r['router']['id']) body = self._show('routers', r['router']['id'])
net_id = body['router']['external_gateway_info']['network_id'] net_id = body['router']['external_gateway_info']['network_id']
gw_port = body['router']['external_gateway_info']['gw_port']
port_netid = gw_port['network_id']
self.assertEquals(net_id, s['subnet']['network_id']) self.assertEquals(net_id, s['subnet']['network_id'])
self.assertEquals(net_id, port_netid)
self._remove_external_gateway_from_router( self._remove_external_gateway_from_router(
r['router']['id'], r['router']['id'],
s['subnet']['network_id']) s['subnet']['network_id'])