Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions nova/api/ec2/vpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -1780,8 +1780,13 @@ def vpc_disassociate_address(self, context, public_ip=None, kwargs=None):
def vpc_describe_addresses(self, context, kwargs):
neutron = neutronv2.get_client(context)
floatings = neutron.list_floatingips(tenant_id=context.project_id)
addresses = [self.vpc_format_address(
context, f, neutron) for f in floatings['floatingips']]
allocation_ids = kwargs.get('allocation_id')
addresses = []
for floatingip in floatings['floatingips']:
address = self.vpc_format_address(context, floatingip, neutron)
if allocation_ids and address['allocation_id'] not in allocation_ids:
continue
addresses.append(address)
return {'addressesSet': addresses}

def create_internet_gateway(self, context):
Expand Down