From c1c19b11792e8e220b11466051739ea5b4279a7a Mon Sep 17 00:00:00 2001 From: gongysh Date: Wed, 31 Oct 2012 22:01:35 +0800 Subject: [PATCH] Put gw_port into router dict result. Bug #1069782 We put gw_port into router dict result so that client can get more information for the result router. Change-Id: I54cec8a71441a9370c7ba95767a92190bf1c9c21 --- quantum/db/l3_db.py | 3 ++- quantum/tests/unit/test_l3_plugin.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/quantum/db/l3_db.py b/quantum/db/l3_db.py index 8b78bf1e2..02763389b 100644 --- a/quantum/db/l3_db.py +++ b/quantum/db/l3_db.py @@ -129,7 +129,8 @@ class L3_NAT_db_mixin(l3.RouterPluginBase): 'external_gateway_info': None} if router['gw_port_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) def create_router(self, context, router): diff --git a/quantum/tests/unit/test_l3_plugin.py b/quantum/tests/unit/test_l3_plugin.py index c40499256..bd9e6d0a4 100644 --- a/quantum/tests/unit/test_l3_plugin.py +++ b/quantum/tests/unit/test_l3_plugin.py @@ -622,7 +622,10 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): s['subnet']['network_id']) body = self._show('routers', r['router']['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, port_netid) self._remove_external_gateway_from_router( r['router']['id'], s['subnet']['network_id']) -- 2.45.2