OpenStack Compute (nova)

Merge lp://qastaging/~anso/nova/ec2-security-groups into lp://qastaging/~soren/nova/ec2-security-groups

ec2-security-groups
Merge into ec2-security-groups

Proposed by Vish Ishaya on 2010-09-29

Status:	Superseded
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:	302 lines (+63/-52) 5 files modified nova/api/ec2/cloud.py (+12/-14) 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)
To merge this branch:	bzr merge lp://qastaging/~anso/nova/ec2-security-groups
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Devin Carlen (community)		2010-09-29	Needs Information on 2010-09-29
Review via email: mp+36974@code.qastaging.launchpad.net

This proposal has been superseded by 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.

Revision history for this message

Devin Carlen (devcamcar) wrote on 2010-09-29:

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_(SecurityGroup.id == SecurityGroupInstanceAssociation.security_group_id,"
220 + "Instance.id == SecurityGroupInstanceAssociation.instance_id,"
221 + "SecurityGroup.deleted == False,"
222 + "Instance.deleted == False)",

and

231 + primaryjoin="and_(SecurityGroupIngressRule.parent_group_id == SecurityGroup.id,"
232 + "SecurityGroupIngressRule.deleted == False)")

review: Needs Information

Revision history for this message

Vish Ishaya (vishvananda) wrote on 2010-09-29:

the primary and secondary were wrong, the quotes is fine though. If you surround it in quotes, you can refer to tables that haven't been defined yet or are in the process of being defined. Reproposing.

lp://qastaging/~anso/nova/ec2-security-groups updated on 2010-10-02

318. By Vish Ishaya on 2010-09-29: fix ordering of rules to actually allow out and drop in
319. By Vish Ishaya on 2010-10-01: show project ids for groups instead of user ids
320. By Todd Willey on 2010-10-02: Merge to latest.