From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 28 Apr 2015 07:18:23 +0000 (+0000)
Subject: Merge "OOP naming cleanup in l3_dvr_db"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8ae90af0868d58bbe283821007c8134e95b9f358;p=openstack-build%2Fneutron-build.git

Merge "OOP naming cleanup in l3_dvr_db"
---

8ae90af0868d58bbe283821007c8134e95b9f358
diff --cc neutron/db/l3_dvr_db.py
index 241fa85a3,4f8d50c47..9372b251e
--- a/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,