pyjuju

Merge lp://staging/~hazmat/pyjuju/security-policy-rules-redux into lp://staging/pyjuju

security-policy-rules-redux
Merge into trunk

Proposed by Kapil Thangavelu on 2011-08-04

Status:

Superseded

Proposed branch:

lp://staging/~hazmat/pyjuju/security-policy-rules-redux

Merge into:

lp://staging/pyjuju

Diff against target:

2529 lines (+1884/-49)

21 files modified

Makefile (+1/-1)
ensemble/agents/tests/common.py (+2/-4)
ensemble/control/tests/test_status.py (+4/-0)
ensemble/hooks/tests/test_invoker.py (+4/-0)
ensemble/lib/testing.py (+18/-0)
ensemble/state/base.py (+4/-3)
ensemble/state/errors.py (+9/-0)
ensemble/state/machine.py (+12/-2)
ensemble/state/relation.py (+9/-0)
ensemble/state/security.py (+482/-7)
ensemble/state/securityrules.py (+196/-0)
ensemble/state/service.py (+39/-4)
ensemble/state/sshclient.py (+2/-1)
ensemble/state/tests/common.py (+53/-0)
ensemble/state/tests/test_base.py (+15/-1)
ensemble/state/tests/test_errors.py (+7/-1)
ensemble/state/tests/test_machine.py (+15/-3)
ensemble/state/tests/test_relation.py (+5/-1)
ensemble/state/tests/test_security.py (+713/-8)
ensemble/state/tests/test_securityrules.py (+223/-0)
ensemble/state/tests/test_service.py (+71/-13)

To merge this branch:

bzr merge lp://staging/~hazmat/pyjuju/security-policy-rules-redux

High

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2011-08-04	Pending
Review via email: mp+70500@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2011-08-04.

Description of the change

Redone with updated api and some simplifications.

Security ACL generator rules to match nodes based on path. The meat of the security ACL policy is embodied here, and this will likely some tweaking in the future.

lp://staging/~hazmat/pyjuju/security-policy-rules-redux updated on 2012-08-10

322. By Kapil Thangavelu on 2011-08-04: merge and resolve conflict.
323. By Kapil Thangavelu on 2011-08-05: Merged security-policy-with-topology into security-policy-rules-redux.
324. By Kapil Thangavelu on 2011-08-05: Merged security-policy-with-topology into security-policy-rules-redux.
325. By Kapil Thangavelu on 2011-08-05: resolve conflict from security-group merge
326. By Kapil Thangavelu on 2011-08-05: resolve conflict with security-groups merge
327. By Kapil Thangavelu on 2011-08-05: Merged security-policy-with-topology into security-policy-rules-redux.
328. By Kapil Thangavelu on 2011-08-08: Merged security-policy-with-topology into security-policy-rules-redux.
329. By Kapil Thangavelu on 2011-08-08: Merged security-policy-with-topology into security-policy-rules-redux.
330. By Kapil Thangavelu on 2011-08-08: resolve conflict from security-policy-with-topology merge
331. By Kapil Thangavelu on 2011-08-09: yank security group accessor from service state
332. By Kapil Thangavelu on 2011-08-10: resolve conflict from states-with-principals
333. By Kapil Thangavelu on 2011-08-10: update tests in aftermath of removing service state security group accessor.
334. By Kapil Thangavelu on 2011-08-17: Merged security-policy-with-topology into security-policy-rules-redux.
335. By Kapil Thangavelu on 2012-03-31: merge trunk
336. By Kapil Thangavelu on 2012-03-31: merge trunk
337. By Kapil Thangavelu on 2012-04-02: Merged security-policy-with-topology into security-policy-rules-redux.
338. By Kapil Thangavelu on 2012-08-10: merge pipeline states-with-principles

Unmerged revisions

338. By Kapil Thangavelu on 2012-08-10: merge pipeline states-with-principles
337. By Kapil Thangavelu on 2012-04-02: Merged security-policy-with-topology into security-policy-rules-redux.
336. By Kapil Thangavelu on 2012-03-31: merge trunk
335. By Kapil Thangavelu on 2012-03-31: merge trunk
334. By Kapil Thangavelu on 2011-08-17: Merged security-policy-with-topology into security-policy-rules-redux.
333. By Kapil Thangavelu on 2011-08-10: update tests in aftermath of removing service state security group accessor.
332. By Kapil Thangavelu on 2011-08-10: resolve conflict from states-with-principals
331. By Kapil Thangavelu on 2011-08-09: yank security group accessor from service state
330. By Kapil Thangavelu on 2011-08-08: resolve conflict from security-policy-with-topology merge
329. By Kapil Thangavelu on 2011-08-08: Merged security-policy-with-topology into security-policy-rules-redux.