Merge lp://qastaging/~xfactor973/charms/trusty/ceph/erasure_actions into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/next

charm_unit_test #14400 ceph-next for xfactor973 mp280579
    UNIT FAIL: unit-test failed

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

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

charm_lint_check #15436 ceph-next for xfactor973 mp280579
    LINT OK: passed

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

charm_unit_test #14404 ceph-next for xfactor973 mp280579
    UNIT FAIL: unit-test failed

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

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

Hi Chris

Working through this update now; however unit test failure:

======================================================================
FAIL: test_process_requests_invalid_api_version (unit_tests.test_ceph_broker.CephBrokerTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/jamespage/lib/os-charms/local/lib/python2.7/site-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
  File "/home/jamespage/src/charms/landing/ceph/unit_tests/test_ceph_broker.py", line 34, in test_process_requests_invalid_api_version
    'stderr': 'Missing or invalid api version (2)'})
AssertionError: {u'exit-code': 0} != {'exit-code': 1, 'stderr': 'Missing or invalid api version (2)'}
- {u'exit-code': 0}
+ {'exit-code': 1, 'stderr': 'Missing or invalid api version (2)'}

I think we also need some new unit tests to cover the v2 api for ceph_broker please.

actions.yaml:

Quite a bit of trailing whitespace - please tidy.

set-pool-max-bytes:
  description: Set pool quotas for the maximum number of bytes.
  params:
    max:
      type: integer
      description: The name of the pool

^^ needs correctiing

actions.yaml:

I'd suggest that you provide enums for strings where only a defined set of values is supported - see:

https://jujucharms.com/docs/1.25/authors-charm-actions

This is a feature missing from config options, but we should use them for actions.

providing functional tests for the actions is going to be hard due to the requirements for underlying storage devices, so that's not required for this merge.

However, it would be nice to have some unit tests for actions please!

You also need to add 'actions' to the list of lint targets in the Makefile:

actions/__init__.py:3:25: W292 no newline at end of file
actions/ceph_ops.py:7:1: F401 'Hooks' imported but unused
actions/ceph_ops.py:8:80: E501 line too long (113 > 79 characters)
actions/ceph_ops.py:11:1: E302 expected 2 blank lines, found 1
actions/ceph_ops.py:81:80: E501 line too long (90 > 79 characters)
actions/ceph_ops.py:97:1: F811 redefinition of unused 'snapshot_pool' from line 8
actions/ceph_ops.py:100:80: E501 line too long (83 > 79 characters)

(and to tox.ini as well)

Style comment on action parameters - I'd stick with either - or _ for keys - preferably '-' as I think this looks nicer.

sys.exit(1) is probably working, but please use action_fail to indicate some sort of action failure - this is propagated back in full via juju

charm_lint_check #17860 ceph-next for xfactor973 mp280579
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/14591583/
Build: http://10.245.162.77:8080/job/charm_lint_check/17860/

charm_unit_test #16691 ceph-next for xfactor973 mp280579
    UNIT FAIL: unit-test failed

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

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

@jamespage this is ready for another look. I've cleaned up the lint warnings and added a bunch more unit tests.

Tox output: https://gist.github.com/cholcombe973/c497eb09bc6b7dde0125

charm_lint_check #17871 ceph-next for xfactor973 mp280579
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/14593196/
Build: http://10.245.162.77:8080/job/charm_lint_check/17871/

charm_unit_test #16702 ceph-next for xfactor973 mp280579
    UNIT FAIL: unit-test failed

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

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

charm_amulet_test #8949 ceph-next for xfactor973 mp280579
    AMULET OK: passed

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

Hi Chris

Working through the review; however I have a number of merge conflicts - can you rebase/repush this branch pls.

These tests are not executed under tox:

======================================================================
ERROR: unit_tests.test_ceph_broker.test_process_requests_create_pool_exists
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/case.py", line 197, in runTest
    self.test(*self.arg)
  File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1297, in patched
    arg = patching.__enter__()
  File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1369, in __enter__
    original, local = self.get_original()
  File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1343, in get_original
    "%s does not have the attribute %r" % (target, name)
AttributeError: <module 'ceph_broker' from 'hooks/ceph_broker.pyc'> does not have the attribute 'create_pool'

======================================================================
ERROR: unit_tests.test_ceph_broker.test_process_requests_create_pool_rid
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/case.py", line 197, in runTest
    self.test(*self.arg)
  File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1297, in patched
    arg = patching.__enter__()
  File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1369, in __enter__
    original, local = self.get_original()
  File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1343, in get_original
    "%s does not have the attribute %r" % (target, name)
AttributeError: <module 'ceph_broker' from 'hooks/ceph_broker.pyc'> does not have the attribute 'create_pool'

======================================================================
ERROR: unit_tests.test_ceph_broker.test_process_requests_invalid_api_rid
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/case.py", line 197, in runTest
    self.test(*self.arg)
  File "/usr/lib/python2.7/dist-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
TypeError: test_process_requests_invalid_api_rid() takes exactly 2 arguments (1 given)

----------------------------------------------------------------------

charm_lint_check #17961 ceph-next for xfactor973 mp280579
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/14602150/
Build: http://10.245.162.77:8080/job/charm_lint_check/17961/

charm_unit_test #16783 ceph-next for xfactor973 mp280579
    UNIT OK: passed

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

charm_amulet_test #8984 ceph-next for xfactor973 mp280579
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/14602324/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8984/

charm_unit_test #16784 ceph-next for xfactor973 mp280579
    UNIT OK: passed

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

charm_lint_check #17962 ceph-next for xfactor973 mp280579
    LINT OK: passed

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

charm_amulet_test #8985 ceph-next for xfactor973 mp280579
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/14602585/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8985/

@jamespage I think this is ready for another look.

charm_lint_check #211 ceph-next for xfactor973 mp280579
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/211/

charm_unit_test #196 ceph-next for xfactor973 mp280579
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/196/

charm_amulet_test #97 ceph-next for xfactor973 mp280579
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/15016269/
Build: http://10.245.162.36:8080/job/charm_amulet_test/97/

charm_lint_check #394 ceph-next for xfactor973 mp280579
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/394/

charm_unit_test #314 ceph-next for xfactor973 mp280579
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/314/

charm_amulet_test #165 ceph-next for xfactor973 mp280579
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/165/

Only minor niggles now; sooo close....

One thing for follow-up after this lands - I think this would be good to cover with actions testing in the amulet tests - ChrisM added some for pause/resume so there is a fairly easy example to follow.

I then took a look at past /me's comments -

https://code.launchpad.net/~xfactor973/charms/trusty/ceph/erasure_actions/+merge/280579/comments/714167

I don't think this has been addressed; we should be using action_* to handle failures so that the action fetch command actually gets useful output.

charm_unit_test #810 ceph-next for xfactor973 mp280579
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/810/

charm_lint_check #910 ceph-next for xfactor973 mp280579
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/910/

charm_amulet_test #355 ceph-next for xfactor973 mp280579
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/355/

OK - action fails look ok

Two more things:

1) Please use /usr/bin/python for the action #!

2) there is a charmhelpers change in this branch that's not in charm-helpers - can you sort that out please :-)

charm_unit_test #821 ceph-next for xfactor973 mp280579
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/821/

charm_lint_check #921 ceph-next for xfactor973 mp280579
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/921/

I've added the charmhelpers change into this MP: https://code.launchpad.net/~xfactor973/charm-helpers/ceph-erasure-bug/+merge/286685

charm_amulet_test #365 ceph-next for xfactor973 mp280579
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/365/

charm helpers change landed - please resync!

charm_lint_check #1168 ceph-next for xfactor973 mp280579
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1168/

charm_unit_test #1004 ceph-next for xfactor973 mp280579
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1004/

charm_amulet_test #448 ceph-next for xfactor973 mp280579
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/15172006/
Build: http://10.245.162.36:8080/job/charm_amulet_test/448/

charm_amulet_test #463 ceph-next for xfactor973 mp280579
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/15175249/
Build: http://10.245.162.36:8080/job/charm_amulet_test/463/

Please rebase your branch and push it back to get updated tests. Thank you.

Done! Thanks :)

On 02/23/2016 07:31 AM, Ryan Beisner wrote:
> Please rebase your branch and push it back to get updated tests. Thank you.
>

charm_lint_check #1297 ceph-next for xfactor973 mp280579
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1297/

charm_unit_test #1074 ceph-next for xfactor973 mp280579
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1074/

charm_amulet_test #476 ceph-next for xfactor973 mp280579
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/476/