Juju Charms Collection
swift-proxy package

Merge lp://staging/~jjo/charms/trusty/swift-proxy/fix-multiple-devices-per-node_lp1479938 into lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next

  1. Trusty Tahr (14.04)
  2. fix-multiple-devices-per-node_lp1479938
  3. Merge into next
Proposed by JuanJo Ciarlante
Status: Merged
Merged at revision: 120
Proposed branch: lp://staging/~jjo/charms/trusty/swift-proxy/fix-multiple-devices-per-node_lp1479938
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target: 121 lines (+82/-6)
2 files modified
hooks/swift_utils.py (+11/-6)
unit_tests/test_swift_utils.py (+71/-0)
To merge this branch: bzr merge lp://staging/~jjo/charms/trusty/swift-proxy/fix-multiple-devices-per-node_lp1479938
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+266462@code.staging.launchpad.net

Commit message

[jjo, r=] also consider blockdev in exists_in_ring(), fixes lp#1479938

To post a comment you must log in.
Revision history for this message
JuanJo Ciarlante (jjo) wrote :

Sorry for not providing tests also, please use is as a reference
for a possible lp#1479938 fix.

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7295 swift-proxy-next for jjo mp266462
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7295/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6749 swift-proxy-next for jjo mp266462
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6749/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7296 swift-proxy-next for jjo mp266462
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7296/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6750 swift-proxy-next for jjo mp266462
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6750/

lp://staging/~jjo/charms/trusty/swift-proxy/fix-multiple-devices-per-node_lp1479938 updated
103. By JuanJo Ciarlante

add unittest: test_update_rings_multiple_devs()

Revision history for this message
JuanJo Ciarlante (jjo) wrote :

FYI, added unittests at r103.

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7297 swift-proxy-next for jjo mp266462
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7297/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6751 swift-proxy-next for jjo mp266462
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [unit_test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/11969573/
Build: http://10.245.162.77:8080/job/charm_unit_test/6751/

lp://staging/~jjo/charms/trusty/swift-proxy/fix-multiple-devices-per-node_lp1479938 updated
104. By JuanJo Ciarlante

improve test_update_rings_multiple_devs() by comparing added devices with requested ones

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7298 swift-proxy-next for jjo mp266462
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7298/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6752 swift-proxy-next for jjo mp266462
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [unit_test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/11969743/
Build: http://10.245.162.77:8080/job/charm_unit_test/6752/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5509 swift-proxy-next for jjo mp266462
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5509/

lp://staging/~jjo/charms/trusty/swift-proxy/fix-multiple-devices-per-node_lp1479938 updated
105. By JuanJo Ciarlante

add a basic-enough mock_ring class, to avoid the need for swift.common.ring library

Revision history for this message
JuanJo Ciarlante (jjo) wrote :

r105 should now pass both unittest, and amulet ones (already ok for the latter).

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7299 swift-proxy-next for jjo mp266462
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7299/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6753 swift-proxy-next for jjo mp266462
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6753/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5533 swift-proxy-next for jjo mp266462
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5533/

Revision history for this message
David Ames (thedac) wrote :

Juan Jo, I have superseded this MP with https://code.launchpad.net/~thedac/charms/trusty/swift-proxy/multiple-device-per-node/+merge/274192

I wanted to see a slightly different approach and it did not make sense to ask you to do it. I have merged your MP into mine so it is included for historical sake.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches