openstack
/
shade
Code Issues Proposed changes

Make a few IP methods private 

We're getting close to a 1.0 release, and these methods have terrible
interfaces. They're also not used anywhere. So let's make them private
for now, and if we find a time in the future where we need to expose
them, we can do that.

Change-Id: I357dbc0c2e61a5b9f62bfbd45595992d7eb21909
This commit is contained in:
Monty Taylor 2015-10-19 10:40:31 -04:00
parent 65fdaccb29
commit 862a71a6a3
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shade/__init__.py
View File

@ -2573,7 +2573,7 @@ class OpenStackCloud(object):
return True
def attach_ip_to_server(
def _attach_ip_to_server(
self, server, floating_ip,
fixed_address=None, wait=False,
timeout=60, skip_attach=False):
@ -2767,7 +2767,7 @@ class OpenStackCloud(object):
return True
def add_ip_from_pool(
def _add_ip_from_pool(
self, server, network, fixed_address=None, reuse=True):
"""Add a floating IP to a sever from a given pool
@ -2788,7 +2788,7 @@ class OpenStackCloud(object):
else:
f_ip = self.create_floating_ip(network=network)
self.attach_ip_to_server(
self._attach_ip_to_server(
server=server, floating_ip=f_ip, fixed_address=fixed_address)
return f_ip
@ -2810,7 +2810,7 @@ class OpenStackCloud(object):
for ip in ips:
f_ip = self.get_floating_ip(
id=None, filters={'floating_ip_address': ip})
self.attach_ip_to_server(
self._attach_ip_to_server(
server=server, floating_ip=f_ip)
def add_auto_ip(self, server, wait=False, timeout=60, reuse=True):
@ -2845,7 +2845,7 @@ class OpenStackCloud(object):
# but is only meaninful for the neutron logic branch
skip_attach = True
self.attach_ip_to_server(
self._attach_ip_to_server(
server=server, floating_ip=f_ip, wait=wait, timeout=timeout,
skip_attach=skip_attach)
@ -2855,7 +2855,7 @@ class OpenStackCloud(object):
self, server, auto_ip=True, ips=None, ip_pool=None,
wait=False, timeout=60, reuse=True):
if ip_pool:
self.add_ip_from_pool(server, ip_pool, reuse=reuse)
self._add_ip_from_pool(server, ip_pool, reuse=reuse)
elif ips:
self.add_ip_list(server, ips)
elif auto_ip:

4
shade/tests/unit/test_floating_ip_common.py
View File

@ -35,7 +35,7 @@ class TestFloatingIP(base.TestCase):
cloud_config=config.get_one_cloud(validate=False))
@patch.object(OpenStackCloud, 'get_floating_ip')
@patch.object(OpenStackCloud, 'attach_ip_to_server')
@patch.object(OpenStackCloud, '_attach_ip_to_server')
@patch.object(OpenStackCloud, 'available_floating_ip')
def test_add_auto_ip(
self, mock_available_floating_ip, mock_attach_ip_to_server,
@ -62,7 +62,7 @@ class TestFloatingIP(base.TestCase):
floating_ip=floating_ip_dict, skip_attach=False)
@patch.object(OpenStackCloud, 'nova_client')
@patch.object(OpenStackCloud, 'add_ip_from_pool')
@patch.object(OpenStackCloud, '_add_ip_from_pool')
def test_add_ips_to_server_pool(
self, mock_add_ip_from_pool, mock_nova_client):
server = FakeServer(

8
shade/tests/unit/test_floating_ip_neutron.py
View File

@ -237,7 +237,7 @@ class TestFloatingIP(base.TestCase):
@patch.object(OpenStackCloud, 'nova_client')
@patch.object(OpenStackCloud, 'keystone_session')
@patch.object(OpenStackCloud, '_neutron_create_floating_ip')
@patch.object(OpenStackCloud, 'attach_ip_to_server')
@patch.object(OpenStackCloud, '_attach_ip_to_server')
@patch.object(OpenStackCloud, 'has_service')
def test_auto_ip_pool_no_reuse(
self, mock_has_service,
@ -327,7 +327,7 @@ class TestFloatingIP(base.TestCase):
mock_neutron_client.list_floatingips.return_value = \
self.mock_floating_ip_list_rep
self.client.attach_ip_to_server(
self.client._attach_ip_to_server(
server=self.fake_server,
floating_ip=self.floating_ip)
@ -366,7 +366,7 @@ class TestFloatingIP(base.TestCase):
}
)
@patch.object(OpenStackCloud, 'attach_ip_to_server')
@patch.object(OpenStackCloud, '_attach_ip_to_server')
@patch.object(OpenStackCloud, 'available_floating_ip')
@patch.object(OpenStackCloud, 'has_service')
def test_add_ip_from_pool(
@ -378,7 +378,7 @@ class TestFloatingIP(base.TestCase):
self.mock_floating_ip_new_rep['floatingip']])[0]
mock_attach_ip_to_server.return_value = None
ip = self.client.add_ip_from_pool(
ip = self.client._add_ip_from_pool(
server=self.fake_server,
network='network-name',
fixed_address='192.0.2.129')

4
shade/tests/unit/test_floating_ip_nova.py
View File

@ -214,7 +214,7 @@ class TestFloatingIP(base.TestCase):
mock_has_service.side_effect = has_service_side_effect
mock_nova_client.floating_ips.list.return_value = self.floating_ips
self.client.attach_ip_to_server(
self.client._attach_ip_to_server(
server=self.fake_server, floating_ip=self.floating_ip,
fixed_address='192.0.2.129')
@ -242,7 +242,7 @@ class TestFloatingIP(base.TestCase):
mock_has_service.side_effect = has_service_side_effect
mock_nova_client.floating_ips.list.return_value = self.floating_ips
ip = self.client.add_ip_from_pool(
ip = self.client._add_ip_from_pool(
server=self.fake_server,
network='nova',
fixed_address='192.0.2.129')