← Back to branch summary

~gandelman-a/ubuntu/precise/nova/891227

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-09-20 15:44:39 UTC
  • mfrom: (1.1.31 upstream)
  • Revision ID: package-import@ubuntu.com-20110920154439-fb1rlzl2lb4hew92
Tags: 2011.3~rc~20110920.r1192-0ubuntu2
* debian/nova_sudoers:
  + Fix typo in nova_sudoers. 
  + Tabs vs Spaces.
* debian/nova.conf:
  + Use force_dhcp_release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/api.py
675
675
def fixed_ip_associate(context, address, instance_id, network_id=None,
676
676
                       reserved=False):
677
677
    """Keyword arguments:
678
 
    reserved -- should be a boolean value(True or False), exact value will be 
 
678
    reserved -- should be a boolean value(True or False), exact value will be
679
679
    used to filter on the fixed ip address
680
680
    """
681
681
    session = get_session()
2827
2827
        result = session.query(models.SecurityGroupIngressRule).\
2828
2828
                         filter_by(deleted=can_read_deleted(context)).\
2829
2829
                         filter_by(parent_group_id=security_group_id).\
 
2830
                         options(joinedload_all('grantee_group')).\
2830
2831
                         all()
2831
2832
    else:
2832
2833
        # TODO(vish): Join to group and check for project_id
2833
2834
        result = session.query(models.SecurityGroupIngressRule).\
2834
2835
                         filter_by(deleted=False).\
2835
2836
                         filter_by(parent_group_id=security_group_id).\
 
2837
                         options(joinedload_all('grantee_group')).\
2836
2838
                         all()
2837
2839
    return result
2838
2840