Fix KeyError on missing gw_port_host for L3 agent in DVR mode

The order of Mixin imports broke the MRO, which caused some methods
in the L3 hierarchy to be ignored. In particular, _build_routers_list
for DVR was no longer called, which led to the stacktrace observed on
the L3 agent side.

Closes-bug: 1369012

Change-Id: I23cd9813fb9b67e9029d222d5f72733ecec3febb

diff --git a/neutron/services/l3_router/l3_router_plugin.py b/neutron/services/l3_router/l3_router_plugin.py
index fb6cd034884416b772217e7e764057a400735556..630c6dae953bda6e63a532294ffb2d72478f4b65 100644 (file)
--- a/neutron/services/l3_router/l3_router_plugin.py
+++ b/neutron/services/l3_router/l3_router_plugin.py
@@ -34,9 +34,9 @@ from neutron.plugins.common import constants
 
 class L3RouterPlugin(common_db_mixin.CommonDbMixin,
                      extraroute_db.ExtraRoute_db_mixin,
+                     l3_hamode_db.L3_HA_NAT_db_mixin,
                      l3_gwmode_db.L3_NAT_db_mixin,
                      l3_dvrscheduler_db.L3_DVRsch_db_mixin,
-                     l3_hamode_db.L3_HA_NAT_db_mixin,
                      l3_hascheduler_db.L3_HA_scheduler_db_mixin):
 
     """Implementation of the Neutron L3 Router Service Plugin.