openstack/shade
Code Issues Proposed changes

Refactor the port search logic

Browse Source 
Trying to combine len(ports) and nat_network logic led to weird
debugging. Split the two so that we don't try to search for a network to
attach the fip to if there is only one port on the server.

Change-Id: I1bc83e34a6f66cc5a8eb7ffa66f0288919210d4d
This commit is contained in:
Monty Taylor 2016-04-12 17:17:47 -05:00
parent e734774d1c
commit af47ff174d
No known key found for this signature in database
GPG Key ID: 3390DB68041A12F0
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
shade/openstackcloud.py
View File

@ -3344,19 +3344,32 @@ class OpenStackCloud(object):
return (None, None)
port = None
if not fixed_address:
if nat_destination:
nat_network = self.get_network(nat_destination)
if not nat_network:
raise OpenStackCloudException(
'NAT Destination {nat_destination} was configured'
' but not found on the cloud. Please check your'
' config and your cloud and try again.'.format(
nat_destination=nat_destination))
else:
nat_network = self.get_nat_destination()
if len(ports) == 1 or not nat_network:
if len(ports) == 1:
port = ports[0]
if len(ports) > 1 and not nat_network:
else:
if nat_destination:
nat_network = self.get_network(nat_destination)
if not nat_network:
raise OpenStackCloudException(
'NAT Destination {nat_destination} was configured'
' but not found on the cloud. Please check your'
' config and your cloud and try again.'.format(
nat_destination=nat_destination))
else:
nat_network = self.get_nat_destination()
if nat_network:
for maybe_port in ports:
if maybe_port['network_id'] == nat_network['id']:
port = maybe_port
if not port:
raise OpenStackCloudException(
'No port on server {server} was found matching'
' the network configured as the NAT destination'
' {dest}. Please check your config'.format(
server=server['id'], dest=nat_network['name']))
else:
port = ports[0]
warnings.warn(
'During Floating IP creation, multiple private'
' networks were found. {net} is being selected at'
@ -3366,17 +3379,6 @@ class OpenStackCloud(object):
' your clouds.yaml file. If you do not have a'
' clouds.yaml file, please make one - your setup'
' is complicated.'.format(net=port['network_id']))
else:
for maybe_port in ports:
if maybe_port['network_id'] == nat_network['id']:
port = maybe_port
break
if not port:
raise OpenStackCloudException(
'No port on server {server} was found matching the'
' network configured as the NAT destination {dest}.'
' Please check your config'.format(
server=server['id'], dest=nat_network['name']))
# Select the first available IPv4 address
for address in port.get('fixed_ips', list()):