From: Gary Kotton <gkotton@vmware.com>
Date: Wed, 9 Dec 2015 10:01:24 +0000 (-0800)
Subject: L3 DB: set get_assoc_data to be an internal method
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=100490ae0847eb13d4948fa37b3e4e1a00f41dbc;p=openstack-build%2Fneutron-build.git

L3 DB: set get_assoc_data to be an internal method

Use an _ to indicate the method is only used internally.
This will help avoid confusion if this method is updated.

TrivailFix

Change-Id: I8a34ddddf0b4d445ec14438ef0044fdafc810268
---

diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py
index 798433024..c7a45ca66 100644
--- a/neutron/db/l3_db.py
+++ b/neutron/db/l3_db.py
@@ -893,7 +893,7 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase):
             internal_subnet_id = ipv4_fixed_ips[0]['subnet_id']
         return internal_port, internal_subnet_id, internal_ip_address
 
-    def get_assoc_data(self, context, fip, floating_network_id):
+    def _get_assoc_data(self, context, fip, floating_network_id):
         """Determine/extract data associated with the internal port.
 
         When a floating IP is associated with an internal port,
@@ -917,7 +917,7 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase):
             msg = _("fixed_ip_address cannot be specified without a port_id")
             raise n_exc.BadRequest(resource='floatingip', msg=msg)
         if fip.get('port_id'):
-            port_id, internal_ip_address, router_id = self.get_assoc_data(
+            port_id, internal_ip_address, router_id = self._get_assoc_data(
                 context,
                 fip,
                 floatingip_db['floating_network_id'])