← Back to branch summary

~0x44/nova/extdoc

« back to all changes in this revision

Viewing changes to nova/db/api.py

  • Committer: Anne Gentle
  • Date: 2011-09-15 18:08:36 UTC
  • mfrom: (1570.1.2 nova)
  • Revision ID: anne@openstack.org-20110915180836-w0729omqlz0saaln
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/api.py
261
261
    return IMPL.floating_ip_disassociate(context, address)
262
262
 
263
263
 
264
 
def floating_ip_fixed_ip_associate(context, floating_address, fixed_address):
 
264
def floating_ip_fixed_ip_associate(context, floating_address,
 
265
                                   fixed_address, host):
265
266
    """Associate an floating ip to a fixed_ip by address."""
266
267
    return IMPL.floating_ip_fixed_ip_associate(context,
267
268
                                               floating_address,
268
 
                                               fixed_address)
 
269
                                               fixed_address,
 
270
                                               host)
269
271
 
270
272
 
271
273
def floating_ip_get_all(context):
367
369
 
368
370
def fixed_ip_get_all_by_instance_host(context, host):
369
371
    """Get all allocated fixed ips filtered by instance host."""
370
 
    return IMPL.fixed_ip_get_all_instance_by_host(context, host)
 
372
    return IMPL.fixed_ip_get_all_by_instance_host(context, host)
371
373
 
372
374
 
373
375
def fixed_ip_get_by_address(context, address):