openstack/shade
Code Issues Proposed changes

Merge "Rename _get_free_fixed_port to _nat_destination_port"

Browse Source
This commit is contained in:
Jenkins 2016-08-26 21:02:26 +00:00 committed by Gerrit Code Review
commit 18aa5d1e28
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shade/openstackcloud.py
View File

@ -3559,7 +3559,7 @@ class OpenStackCloud(object):
}
if not port:
if server:
(port_obj, fixed_ip_address) = self._get_free_fixed_port(
(port_obj, fixed_ip_address) = self._nat_destination_port(
server, fixed_address=fixed_address,
nat_destination=nat_destination)
if port_obj:
@ -3789,9 +3789,15 @@ class OpenStackCloud(object):
return server
return server
def _get_free_fixed_port(self, server, fixed_address=None,
nat_destination=None):
"""Returns server's port.
def _nat_destination_port(
self, server, fixed_address=None, nat_destination=None):
"""Returns server port that is on a nat_destination network
Find a port attached to the server which is on a network which
has a subnet which can be the destination of NAT. Such a network
is referred to in shade as a "nat_destination" network. So this
then is a function which returns a port on such a network that is
associated with the given server.
:param server: Server dict.
:param fixed_address: Fixed ip address of the port
@ -3892,7 +3898,7 @@ class OpenStackCloud(object):
"{0}".format(server['id'])):
# Find an available port
(port, fixed_address) = self._get_free_fixed_port(
(port, fixed_address) = self._nat_destination_port(
server, fixed_address=fixed_address)
if not port:
raise OpenStackCloudException(
@ -4184,7 +4190,7 @@ class OpenStackCloud(object):
if not networks:
return False
(port_obj, fixed_ip_address) = self._get_free_fixed_port(
(port_obj, fixed_ip_address) = self._nat_destination_port(
server, nat_destination=nat_destination)
if not port_obj or not fixed_ip_address:

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

@ -620,14 +620,14 @@ class TestFloatingIP(base.TestCase):
floatingip='61cea855-49cb-4846-997d-801b70c71bdd')
@patch.object(OpenStackCloud, '_submit_create_fip')
@patch.object(OpenStackCloud, '_get_free_fixed_port')
@patch.object(OpenStackCloud, '_nat_destination_port')
@patch.object(OpenStackCloud, 'get_external_networks')
def test_create_floating_ip_no_port(
self, mock_get_ext_nets, mock_get_free_fixed_port,
self, mock_get_ext_nets, mock_nat_destination_port,
mock_submit_create_fip):
fake_port = dict(id='port-id')
mock_get_ext_nets.return_value = [self.mock_get_network_rep]
mock_get_free_fixed_port.return_value = (fake_port, '10.0.0.2')
mock_nat_destination_port.return_value = (fake_port, '10.0.0.2')
mock_submit_create_fip.return_value = dict(port_id=None)
self.assertRaises(