openstack/shade
Code Issues Proposed changes

Remove meta.get_server_public_ip() function

Browse Source 
This method is unused and outdated. There is a public method in the
OpenStackCloud class named get_server_public_ip() that calls the
correct function in meta.py.

Change-Id: I852844a003f9d09d1579ce3509caa04cbbffd270
This commit is contained in:
David Shrewsbury
2015-07-29 13:36:44 -04:00
parent 914d82a33a
commit 264fa42bfd
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shade/meta.py
View File

@@ -66,10 +66,6 @@ def get_server_private_ip(server):
return get_server_ip(server, ext_tag='fixed', key_name='private')
def get_server_public_ip(server):
return get_server_ip(server, ext_tag='floating', key_name='public')
def get_server_external_ipv4(cloud, server):
"""Find an externally routable IP for the server.

7
shade/tests/unit/test_meta.py
View File

@@ -104,9 +104,12 @@ class TestMeta(testtools.TestCase):
addrs, key_name='public', ext_tag='fixed', version=6))
def test_get_server_ip(self):
srv = FakeServer()
srv = meta.obj_to_dict(FakeServer())
self.assertEqual(PRIVATE_V4, meta.get_server_private_ip(srv))
self.assertEqual(PUBLIC_V4, meta.get_server_public_ip(srv))
self.assertEqual(PUBLIC_V4,
meta.get_server_external_ipv4(shade.openstack_cloud(),
srv)
)
@mock.patch.object(shade.OpenStackCloud, 'has_service')
@mock.patch.object(shade.OpenStackCloud, 'search_ports')