Merge "OOP naming cleanup in l3_dvr_db"

diff --cc neutron/db/l3_dvr_db.py
index 241fa85a3700d4ba43aee34756d442427de94e67,4f8d50c47979c2a62243a950a683c29c04fd8940..9372b251e7e8712b9e3e460498f3961c4c2ee37b
--- 1/neutron/db/l3_dvr_db.py
--- 2/neutron/db/l3_dvr_db.py
+++ b/neutron/db/l3_dvr_db.py
@@@ -434,9 -436,11 +434,9 @@@ class L3_NAT_with_dvr_db_mixin(l3_db.L3
                     'device_owner': [DEVICE_OWNER_AGENT_GW]}
          interfaces = self._core_plugin.get_ports(context.elevated(), filters)
          LOG.debug("Return the FIP ports: %s ", interfaces)
 -        if interfaces:
 -            self._populate_subnets_for_ports(context, interfaces)
          return interfaces
  
-     def get_dvr_sync_data(self, context, host, agent, router_ids=None,
+     def _get_dvr_sync_data(self, context, host, agent, router_ids=None,
                            active=None):
          routers, interfaces, floating_ips = self._get_router_info_list(
              context, router_ids=router_ids, active=active,