← Back to branch summary

~elkirya/nova/floating-os-api

« back to all changes in this revision

Viewing changes to nova/db/sqlalchemy/api.py

  • Committer: Ilya Alekseyev
  • Date: 2011-06-27 12:33:01 UTC
  • Revision ID: ilyaalekseyev@acm.org-20110627123301-n4abe5ymw81th8mn
review issues fixed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/api.py
448
448
                         filter_by(deleted=False).\
449
449
                         first()
450
450
    if not result:
451
 
        raise exception.FloatingIpNotFound()
 
451
        raise exception.FloatingIpNotFoundForFixedAddress()
452
452
 
453
453
    return result
454
454
 
605
605
                     filter_by(deleted=can_read_deleted(context)).\
606
606
                     first()
607
607
    if not result:
608
 
        raise exception.FloatingIpNotFound(fixed_ip=address)
 
608
        raise exception.FloatingIpNotFoundForFixedAddress(fixed_ip=address)
609
609
 
610
610
    return result
611
611
 
621
621
                first()
622
622
 
623
623
    if not result:
624
 
        raise exception.FloatingIpNotDefined(floating_ip=ip)
 
624
        raise exception.FloatingIpNotFound(floating_ip=ip)
625
625
 
626
626
    return result
627
627
 
761
761
                     options(joinedload('instance')).\
762
762
                     first()
763
763
    if not result:
764
 
        raise exception.FloatingIpNotFound(fixed_ip=address)
 
764
        raise exception.FloatingIpNotFoundForFixedAddress(fixed_ip=address)
765
765
 
766
766
    if is_user_context(context):
767
767
        authorize_project_context(context, result.instance.project_id)