Make a couple of methods private

I was just going over this class trying to understand what methods
really are used outside of the class.  I found that these two are not.
I thought I'd submit a quick patch to mark them "private".

Change-Id: Id91907996631b670e23a506e0a1feae4518e42ba

diff --git a/neutron/agent/l3/dvr_edge_router.py b/neutron/agent/l3/dvr_edge_router.py
index be44ca998f235e8b308607169ad546c3b546c80a..a610bdb18a96196e49b3509225935610807c2ae2 100644 (file)
--- a/neutron/agent/l3/dvr_edge_router.py
+++ b/neutron/agent/l3/dvr_edge_router.py
@@ -85,7 +85,7 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter):
             return
 
         ns_name = dvr_snat_ns.SnatNamespace.get_snat_ns_name(self.router['id'])
-        interface_name = self.get_snat_int_device_name(sn_port['id'])
+        interface_name = self._get_snat_int_device_name(sn_port['id'])
         self._internal_network_added(
             ns_name,
             sn_port['network_id'],
@@ -110,7 +110,7 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter):
         if not is_this_snat_host:
             return
 
-        snat_interface = self.get_snat_int_device_name(sn_port['id'])
+        snat_interface = self._get_snat_int_device_name(sn_port['id'])
         ns_name = self.snat_namespace.name
         prefix = dvr_snat_ns.SNAT_INT_DEV_PREFIX
         if ip_lib.device_exists(snat_interface, namespace=ns_name):
@@ -119,11 +119,11 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter):
 
     def _create_dvr_gateway(self, ex_gw_port, gw_interface_name):
         """Create SNAT namespace."""
-        snat_ns = self.create_snat_namespace()
+        snat_ns = self._create_snat_namespace()
         # connect snat_ports to br_int from SNAT namespace
         for port in self.get_snat_interfaces():
             # create interface_name
-            interface_name = self.get_snat_int_device_name(port['id'])
+            interface_name = self._get_snat_int_device_name(port['id'])
             self._internal_network_added(
                 snat_ns.name, port['network_id'],
                 port['id'], port['fixed_ips'],
@@ -137,7 +137,7 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter):
         # kicks the FW Agent to add rules for the snat namespace
         self.agent.process_router_add(self)
 
-    def create_snat_namespace(self):
+    def _create_snat_namespace(self):
         # TODO(mlavalle): in the near future, this method should contain the
         # code in the L3 agent that creates a gateway for a dvr. The first step
         # is to move the creation of the snat namespace here
@@ -148,7 +148,7 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter):
         self.snat_namespace.create()
         return self.snat_namespace
 
-    def get_snat_int_device_name(self, port_id):
+    def _get_snat_int_device_name(self, port_id):
         long_name = dvr_snat_ns.SNAT_INT_DEV_PREFIX + port_id
         return long_name[:self.driver.DEV_NAME_LEN]
 

diff --git a/neutron/tests/unit/agent/l3/test_agent.py b/neutron/tests/unit/agent/l3/test_agent.py
index 92d4bba2e545639f3082ab2bf2ca4e980e3649c6..54721ae76b99d7133fc235976458bb0df27db59c 100644 (file)
--- a/neutron/tests/unit/agent/l3/test_agent.py
+++ b/neutron/tests/unit/agent/l3/test_agent.py
@@ -355,7 +355,7 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
                 sn_port['id'],
                 sn_port['fixed_ips'],
                 sn_port['mac_address'],
-                ri.get_snat_int_device_name(sn_port['id']),
+                ri._get_snat_int_device_name(sn_port['id']),
                 dvr_snat_ns.SNAT_INT_DEV_PREFIX)
         elif action == 'remove':
             self.device_exists.return_value = False
@@ -453,7 +453,7 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
                                           **self.ri_kwargs)
             ri._create_dvr_gateway = mock.Mock()
             ri.get_snat_interfaces = mock.Mock(return_value=self.snat_ports)
-            ri.create_snat_namespace()
+            ri._create_snat_namespace()
             ri.fip_ns = agent.get_fip_ns(ex_net_id)
             ri.internal_ports = self.snat_ports
         else:
@@ -597,7 +597,7 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
                                       router,
                                       **self.ri_kwargs)
         if snat_hosted_before:
-            ri.create_snat_namespace()
+            ri._create_snat_namespace()
             snat_ns_name = ri.snat_namespace.name
         else:
             self.assertIsNone(ri.snat_namespace)
@@ -2002,7 +2002,7 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
                        'network_id': _uuid(),
                        'mac_address': 'ca:fe:de:ad:be:ef'}
 
-        interface_name = ri.get_snat_int_device_name(port_id)
+        interface_name = ri._get_snat_int_device_name(port_id)
         self.device_exists.return_value = False
 
         with mock.patch.object(ri, 'get_snat_interfaces') as get_interfaces: