Merge "Allow port_get to fail when listing all floating ips"
This commit is contained in:
commit
cf7e0a62c8
@ -682,13 +682,22 @@ class FloatingIpManager(object):
|
|||||||
return value
|
return value
|
||||||
return device_owner
|
return device_owner
|
||||||
|
|
||||||
def _set_instance_info(self, fip, port=None):
|
def _set_fip_details(self, fip, port):
|
||||||
if fip['port_id']:
|
try:
|
||||||
if not port:
|
if not port:
|
||||||
port = port_get(self.request, fip['port_id'])
|
port = port_get(self.request, fip['port_id'])
|
||||||
fip['instance_id'] = port.device_id
|
fip['instance_id'] = port.device_id
|
||||||
fip['instance_type'] = self._get_instance_type_from_device_owner(
|
fip['instance_type'] = self._get_instance_type_from_device_owner(
|
||||||
port.device_owner)
|
port.device_owner)
|
||||||
|
except neutronclient.common.exceptions.PortNotFoundClient:
|
||||||
|
LOG.debug("Failed to get port %s details for floating IP %s",
|
||||||
|
fip['port_id'], fip['ip'])
|
||||||
|
fip['instance_id'] = None
|
||||||
|
fip['instance_type'] = None
|
||||||
|
|
||||||
|
def _set_instance_info(self, fip, port=None):
|
||||||
|
if fip['port_id']:
|
||||||
|
self._set_fip_details(fip, port)
|
||||||
else:
|
else:
|
||||||
fip['instance_id'] = None
|
fip['instance_id'] = None
|
||||||
fip['instance_type'] = None
|
fip['instance_type'] = None
|
||||||
|
Loading…
x
Reference in New Issue
Block a user