Merge lp://qastaging/~anso/nova/ec2-security-groups into lp://qastaging/~soren/nova/ec2-security-groups
Proposed by
Vish Ishaya
Status: | Merged |
---|---|
Merged at revision: | 312 |
Proposed branch: | lp://qastaging/~anso/nova/ec2-security-groups |
Merge into: | lp://qastaging/~soren/nova/ec2-security-groups |
Prerequisite: | lp://qastaging/~hudson-openstack/nova/trunk |
Diff against target: |
346 lines (+69/-58) 6 files modified
nova/api/ec2/cloud.py (+14/-16) nova/db/api.py (+1/-1) nova/db/sqlalchemy/api.py (+31/-23) nova/db/sqlalchemy/models.py (+18/-13) nova/tests/virt_unittest.py (+1/-1) nova/virt/libvirt_conn.py (+4/-4) |
To merge this branch: | bzr merge lp://qastaging/~anso/nova/ec2-security-groups |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Devin Carlen (community) | Approve | ||
Review via email:
|
This proposal supersedes a proposal from 2010-09-29.
Description of the change
Fixes deleted objects showing in relations and a few issues with too many rules getting revoked.
To post a comment you must log in.
Looks good except the syntax of the primaryjoins and secondaryjoins is strange. What's with the double quotes? It looks unnecessary based on the sqlalchemy docs, which gives this example of using primary join:
primaryjoin= and_(users_ table.c. user_id= =addresses_ table.c. user_id,
addresses_ table.c. city==' Boston' ))
Examples from patch:
219 + secondaryjoin= "and_(SecurityG roup.id == SecurityGroupIn stanceAssociati on.security_ group_id, " stanceAssociati on.instance_ id," deleted == False,"
220 + "Instance.id == SecurityGroupIn
221 + "SecurityGroup.
222 + "Instance.deleted == False)",
and
231 + primaryjoin= "and_(SecurityG roupIngressRule .parent_ group_id == SecurityGroup.id," ngressRule. deleted == False)")
232 + "SecurityGroupI